Merge pull request 'Remove unimplemented dayStreak and add support for nickname' (#136) from mk/add-nickname-to-medals into master

Reviewed-on: #136

src/index.tsx

@@ -1979,6 +1979,7 @@ export type MakePercentageIntervalGql = {
 export type MedalGql = {
   __typename?: "MedalGQL";
   count: Scalars["Int"]["output"];
+  nickname?: Maybe<Scalars["String"]["output"]>;
 };
 
 export type MedalScope =
@@ -2210,6 +2211,7 @@ export type QueryGetBucketSetArgs = {
 export type QueryGetFeedVideosArgs = {
   after?: InputMaybe<Scalars["String"]["input"]>;
   filters?: InputMaybe<VideoFilterInput>;
+  includeCallersVideos?: InputMaybe<Scalars["Boolean"]["input"]>;
   limit?: Scalars["Int"]["input"];
 };
 
@@ -2298,17 +2300,6 @@ export type QueryWaitForArgs = {
 
 export type RequestedMedalsGql = {
   __typename?: "RequestedMedalsGQL";
-  dayStreak2?: Maybe<MedalGql>;
-  dayStreak3?: Maybe<MedalGql>;
-  dayStreak4?: Maybe<MedalGql>;
-  dayStreak5?: Maybe<MedalGql>;
-  dayStreak6?: Maybe<MedalGql>;
-  dayStreak7?: Maybe<MedalGql>;
-  dayStreak14?: Maybe<MedalGql>;
-  dayStreak21?: Maybe<MedalGql>;
-  dayStreak30?: Maybe<MedalGql>;
-  dayStreak60?: Maybe<MedalGql>;
-  dayStreak90?: Maybe<MedalGql>;
   distanceOver66?: Maybe<MedalGql>;
   distanceOver78?: Maybe<MedalGql>;
   distanceOver90?: Maybe<MedalGql>;
@@ -2609,6 +2600,7 @@ export type UserRelationshipsResult = {
 
 export type VideoFilterInput = {
   createdAt?: InputMaybe<DateRangeFilter>;
+  excludeVideosWithNoShots?: InputMaybe<Scalars["Boolean"]["input"]>;
   isStreamCompleted?: InputMaybe<Scalars["Boolean"]["input"]>;
   requireCursorCompletion?: Scalars["Boolean"]["input"];
 };
@@ -2778,9 +2770,15 @@ export type GetFeedQuery = {
       updatedAt?: any | null;
       startTime?: any | null;
       endTime?: any | null;
+      private: boolean;
       elapsedTime?: number | null;
       tableSize: number;
-      owner?: { __typename?: "UserGQL"; username: string } | null;
+      owner?: {
+        __typename?: "UserGQL";
+        id: number;
+        username: string;
+        profileImageUri?: string | null;
+      } | null;
       stream?: {
         __typename?: "UploadStreamGQL";
         id: string;
@@ -2791,6 +2789,19 @@ export type GetFeedQuery = {
         name: string;
         tagClasses: Array<{ __typename?: "VideoTagClass"; name: string }>;
       }>;
+      currentProcessing?: {
+        __typename?: "VideoProcessingGQL";
+        id: number;
+        status: ProcessingStatusEnum;
+        errors: Array<{
+          __typename?: "VideoProcessingErrorGQL";
+          message: string;
+        }>;
+        statuses: Array<{
+          __typename?: "VideoProcessingStatusGQL";
+          status: ProcessingStatusEnum;
+        }>;
+      } | null;
     }>;
     pageInfo: {
       __typename?: "PageInfoGQL";
@@ -2847,6 +2858,7 @@ export type GetVideoFeedQueryVariables = Exact<{
   limit?: Scalars["Int"]["input"];
   after?: InputMaybe<Scalars["String"]["input"]>;
   filters?: InputMaybe<VideoFilterInput>;
+  includeCallersVideos?: InputMaybe<Scalars["Boolean"]["input"]>;
 }>;
 
 export type GetVideoFeedQuery = {
@@ -3322,6 +3334,7 @@ export type GetLoggedInUserQuery = {
 
 export type GetUserPlayTimeQueryVariables = Exact<{
   userId: Scalars["Int"]["input"];
+  filters?: InputMaybe<VideoFilterInput>;
 }>;
 
 export type GetUserPlayTimeQuery = {
@@ -4498,32 +4511,7 @@ export const GetFeedDocument = gql`
   ) {
     getUserVideos(limit: $limit, after: $after, filters: $filters) {
       videos {
-        id
+        ...VideoCardFields
-        owner {
-          username
-        }
-        name
-        screenshotUri
-        totalShotsMade
-        totalShots
-        makePercentage
-        createdAt
-        updatedAt
-        startTime
-        endTime
-        elapsedTime
-        screenshotUri
-        stream {
-          id
-          isCompleted
-        }
-        tableSize
-        tags {
-          tagClasses {
-            name
-          }
-          name
-        }
       }
       pageInfo {
         hasNextPage
@@ -4531,6 +4519,7 @@ export const GetFeedDocument = gql`
       }
     }
   }
+  ${VideoCardFieldsFragmentDoc}
 `;
 
 /**
@@ -4598,8 +4587,14 @@ export const GetVideoFeedDocument = gql`
     $limit: Int! = 5
     $after: String = null
     $filters: VideoFilterInput = null
+    $includeCallersVideos: Boolean = null
+  ) {
+    getFeedVideos(
+      limit: $limit
+      after: $after
+      filters: $filters
+      includeCallersVideos: $includeCallersVideos
     ) {
-    getFeedVideos(limit: $limit, after: $after, filters: $filters) {
       videos {
         ...VideoCardFields
       }
@@ -4627,6 +4622,7 @@ export const GetVideoFeedDocument = gql`
  *      limit: // value for 'limit'
  *      after: // value for 'after'
  *      filters: // value for 'filters'
+ *      includeCallersVideos: // value for 'includeCallersVideos'
  *   },
  * });
  */
@@ -5621,8 +5617,8 @@ export type GetLoggedInUserQueryResult = Apollo.QueryResult<
   GetLoggedInUserQueryVariables
 >;
 export const GetUserPlayTimeDocument = gql`
-  query GetUserPlayTime($userId: Int!) {
+  query GetUserPlayTime($userId: Int!, $filters: VideoFilterInput) {
-    getPlayTime(userId: $userId) {
+    getPlayTime(userId: $userId, filters: $filters) {
       totalSeconds
     }
   }
@@ -5641,6 +5637,7 @@ export const GetUserPlayTimeDocument = gql`
  * const { data, loading, error } = useGetUserPlayTimeQuery({
  *   variables: {
  *      userId: // value for 'userId'
+ *      filters: // value for 'filters'
  *   },
  * });
  */

src/operations/feed.gql

@@ -6,32 +6,7 @@ query GetFeed(
 ) {
   getUserVideos(limit: $limit, after: $after, filters: $filters) {
     videos {
-      id
+      ...VideoCardFields
-      owner {
-        username
-      }
-      name
-      screenshotUri
-      totalShotsMade
-      totalShots
-      makePercentage
-      createdAt
-      updatedAt
-      startTime
-      endTime
-      elapsedTime
-      screenshotUri
-      stream {
-        id
-        isCompleted
-      }
-      tableSize
-      tags {
-        tagClasses {
-          name
-        }
-        name
-      }
     }
     pageInfo {
       hasNextPage
@@ -86,8 +61,14 @@ query GetVideoFeed(
   $limit: Int! = 5
   $after: String = null
   $filters: VideoFilterInput = null
+  $includeCallersVideos: Boolean = null
+) {
+  getFeedVideos(
+    limit: $limit
+    after: $after
+    filters: $filters
+    includeCallersVideos: $includeCallersVideos
   ) {
-  getFeedVideos(limit: $limit, after: $after, filters: $filters) {
     videos {
       ...VideoCardFields
     }

src/operations/user.gql

@@ -45,8 +45,8 @@ query getLoggedInUser {
   }
 }
 
-query GetUserPlayTime($userId: Int!) {
+query GetUserPlayTime($userId: Int!, $filters: VideoFilterInput) {
-  getPlayTime(userId: $userId) {
+  getPlayTime(userId: $userId, filters: $filters) {
     totalSeconds
   }
 }

src/schema.gql

@@ -59,6 +59,7 @@ type Query {
   getFeedVideos(
     limit: Int! = 5
     after: String = null
+    includeCallersVideos: Boolean = true
     filters: VideoFilterInput = null
   ): VideoHistoryGQL!
 }
@@ -295,21 +296,11 @@ type RequestedMedalsGQL {
   totalMakes500: MedalGQL
   totalMakes750: MedalGQL
   totalMakes1000: MedalGQL
-  dayStreak2: MedalGQL
-  dayStreak3: MedalGQL
-  dayStreak4: MedalGQL
-  dayStreak5: MedalGQL
-  dayStreak6: MedalGQL
-  dayStreak7: MedalGQL
-  dayStreak14: MedalGQL
-  dayStreak21: MedalGQL
-  dayStreak30: MedalGQL
-  dayStreak60: MedalGQL
-  dayStreak90: MedalGQL
 }
 
 type MedalGQL {
   count: Int!
+  nickname: String
 }
 
 input MedalScope @oneOf {
@@ -628,6 +619,7 @@ input VideoFilterInput {
   isStreamCompleted: Boolean = null
   requireCursorCompletion: Boolean! = true
   createdAt: DateRangeFilter = null
+  excludeVideosWithNoShots: Boolean = null
 }
 
 type VideoHistoryGQL {