Merge branch 'master' into volodymyr/get-user-videos

Reviewed-on: #133

src/index.tsx

@@ -28,8 +28,6 @@ export type Scalars = {
   Boolean: { input: boolean; output: boolean };
   Int: { input: number; output: number };
   Float: { input: number; output: number };
-  /** Represents binary data as Base64-encoded strings, using the standard alphabet. */
-  Base64: { input: any; output: any };
   /** Date (isoformat) */
   Date: { input: any; output: any };
   /** Date with time (isoformat) */
@@ -186,6 +184,7 @@ export type DoesNotOwnShotErrOtherErrorNeedsNote =
 export type EditUserInputGql = {
   fargoRating?: InputMaybe<Scalars["Int"]["input"]>;
   username?: InputMaybe<Scalars["String"]["input"]>;
+  videosPrivateByDefault?: InputMaybe<Scalars["Boolean"]["input"]>;
 };
 
 export type EnumAggregation = {
@@ -2054,7 +2053,7 @@ export type MutationEditUserArgs = {
 };
 
 export type MutationFindPrerecordTableLayoutArgs = {
-  b64Image: Scalars["Base64"]["input"];
+  b64Image: Scalars["String"]["input"];
   videoId: Scalars["Int"]["input"];
 };
 
@@ -2211,6 +2210,7 @@ export type QueryGetBucketSetArgs = {
 export type QueryGetFeedVideosArgs = {
   after?: InputMaybe<Scalars["String"]["input"]>;
   filters?: InputMaybe<VideoFilterInput>;
+  includeCallersVideos?: InputMaybe<Scalars["Boolean"]["input"]>;
   limit?: Scalars["Int"]["input"];
 };
 
@@ -2228,6 +2228,7 @@ export type QueryGetOrderedShotsArgs = {
 };
 
 export type QueryGetPlayTimeArgs = {
+  filters?: InputMaybe<VideoFilterInput>;
   userId: Scalars["Int"]["input"];
 };
 
@@ -2586,6 +2587,7 @@ export type UserGql = {
   profileImageUri?: Maybe<Scalars["String"]["output"]>;
   updatedAt?: Maybe<Scalars["DateTime"]["output"]>;
   username: Scalars["String"]["output"];
+  videosPrivateByDefault?: Maybe<Scalars["Boolean"]["output"]>;
 };
 
 export type UserPlayTimeGql = {
@@ -2607,6 +2609,8 @@ export type UserRelationshipsResult = {
 };
 
 export type VideoFilterInput = {
+  createdAt?: InputMaybe<DateRangeFilter>;
+  excludeVideosWithNoShots?: InputMaybe<Scalars["Boolean"]["input"]>;
   isStreamCompleted?: InputMaybe<Scalars["Boolean"]["input"]>;
   requireCursorCompletion?: Scalars["Boolean"]["input"];
 };
@@ -2627,6 +2631,7 @@ export type VideoGql = {
   name?: Maybe<Scalars["String"]["output"]>;
   owner?: Maybe<UserGql>;
   playlist?: Maybe<HlsPlaylistGql>;
+  private: Scalars["Boolean"]["output"];
   screenshotUri?: Maybe<Scalars["String"]["output"]>;
   shots: Array<ShotGql>;
   startTime?: Maybe<Scalars["DateTime"]["output"]>;
@@ -2650,6 +2655,7 @@ export type VideoMetadataInput = {
   framesPerSecond?: InputMaybe<Scalars["Float"]["input"]>;
   gameType?: InputMaybe<Scalars["String"]["input"]>;
   lastIntendedSegmentBound?: InputMaybe<Scalars["Int"]["input"]>;
+  private?: InputMaybe<Scalars["Boolean"]["input"]>;
   resolution?: InputMaybe<VideoResolution>;
   startTime?: InputMaybe<Scalars["DateTime"]["input"]>;
   streamSegmentType?: InputMaybe<StreamSegmentTypeEnum>;
@@ -2774,9 +2780,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;
@@ -2787,6 +2799,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";
@@ -2808,6 +2833,7 @@ export type VideoCardFieldsFragment = {
   updatedAt?: any | null;
   startTime?: any | null;
   endTime?: any | null;
+  private: boolean;
   elapsedTime?: number | null;
   tableSize: number;
   owner?: {
@@ -2842,6 +2868,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 = {
@@ -2860,6 +2887,7 @@ export type GetVideoFeedQuery = {
       updatedAt?: any | null;
       startTime?: any | null;
       endTime?: any | null;
+      private: boolean;
       elapsedTime?: number | null;
       tableSize: number;
       owner?: {
@@ -3004,12 +3032,14 @@ export type GetShotsWithJustIdsQueryVariables = Exact<{
   filterInput: FilterInput;
   shotsOrdering?: InputMaybe<GetShotsOrdering>;
   limit?: InputMaybe<Scalars["Int"]["input"]>;
+  countRespectsLimit?: InputMaybe<Scalars["Boolean"]["input"]>;
 }>;
 
 export type GetShotsWithJustIdsQuery = {
   __typename?: "Query";
   getOrderedShots: {
     __typename?: "GetShotsResult";
+    count?: number | null;
     shots: Array<{ __typename?: "ShotGQL"; id: number; videoId: number }>;
   };
 };
@@ -3308,11 +3338,13 @@ export type GetLoggedInUserQuery = {
     activeVideoId?: number | null;
     createdAt?: any | null;
     updatedAt?: any | null;
+    videosPrivateByDefault?: boolean | null;
   } | null;
 };
 
 export type GetUserPlayTimeQueryVariables = Exact<{
   userId: Scalars["Int"]["input"];
+  filters?: InputMaybe<VideoFilterInput>;
 }>;
 
 export type GetUserPlayTimeQuery = {
@@ -3435,6 +3467,25 @@ export type DoesUsernameExistQuery = {
   doesUsernameExist: boolean;
 };
 
+export type EditUserMutationVariables = Exact<{
+  username?: InputMaybe<Scalars["String"]["input"]>;
+  fargoRating?: InputMaybe<Scalars["Int"]["input"]>;
+  videosPrivateByDefault?: InputMaybe<Scalars["Boolean"]["input"]>;
+}>;
+
+export type EditUserMutation = {
+  __typename?: "Mutation";
+  editUser: {
+    __typename?: "UserGQL";
+    id: number;
+    firebaseUid?: string | null;
+    username: string;
+    fargoRating?: number | null;
+    updatedAt?: any | null;
+    videosPrivateByDefault?: boolean | null;
+  };
+};
+
 export type GetStreamMonitoringDetailsQueryVariables = Exact<{
   videoId: Scalars["Int"]["input"];
   debuggingJson?: InputMaybe<Scalars["JSON"]["input"]>;
@@ -3450,7 +3501,6 @@ export type GetStreamMonitoringDetailsQuery = {
     elapsedTime?: number | null;
     currentHomography?: {
       __typename?: "HomographyInfoGQL";
-      id: number;
       frameIndex: number;
       crop: {
         __typename?: "BoundingBoxGQL";
@@ -3665,7 +3715,6 @@ export type GetVideoQuery = {
     } | null;
     homographyHistory: Array<{
       __typename?: "HomographyInfoGQL";
-      id: number;
       frameIndex: number;
       crop: {
         __typename?: "BoundingBoxGQL";
@@ -3868,7 +3917,7 @@ export type GetHeaderInfoByVideoIdQuery = {
 };
 
 export type FindPrerecordTableLayoutMutationVariables = Exact<{
-  b64Image: Scalars["Base64"]["input"];
+  b64Image: Scalars["String"]["input"];
   videoId: Scalars["Int"]["input"];
 }>;
 
@@ -3876,7 +3925,6 @@ export type FindPrerecordTableLayoutMutation = {
   __typename?: "Mutation";
   findPrerecordTableLayout?: {
     __typename?: "HomographyInfoGQL";
-    id: number;
     frameIndex: number;
     crop: {
       __typename?: "BoundingBoxGQL";
@@ -3906,7 +3954,6 @@ export type FindPrerecordTableLayoutMutation = {
 
 export type HomographyInfoFragment = {
   __typename?: "HomographyInfoGQL";
-  id: number;
   frameIndex: number;
   crop: {
     __typename?: "BoundingBoxGQL";
@@ -4122,6 +4169,7 @@ export const VideoCardFieldsFragmentDoc = gql`
     updatedAt
     startTime
     endTime
+    private
     elapsedTime
     screenshotUri
     stream {
@@ -4267,7 +4315,6 @@ export const VideoDurationDataFragmentDoc = gql`
 `;
 export const HomographyInfoFragmentDoc = gql`
   fragment HomographyInfo on HomographyInfoGQL {
-    id
     frameIndex
     crop {
       left
@@ -4473,32 +4520,7 @@ export const GetFeedDocument = gql`
   ) {
     getUserVideos(limit: $limit, after: $after, filters: $filters) {
       videos {
-        id
-        owner {
-          username
-        }
-        name
-        screenshotUri
-        totalShotsMade
-        totalShots
-        makePercentage
-        createdAt
-        updatedAt
-        startTime
-        endTime
-        elapsedTime
-        screenshotUri
-        stream {
-          id
-          isCompleted
-        }
-        tableSize
-        tags {
-          tagClasses {
-            name
-          }
-          name
-        }
+        ...VideoCardFields
       }
       pageInfo {
         hasNextPage
@@ -4506,6 +4528,7 @@ export const GetFeedDocument = gql`
       }
     }
   }
+  ${VideoCardFieldsFragmentDoc}
 `;
 
 /**
@@ -4573,8 +4596,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
       }
@@ -4602,6 +4631,7 @@ export const GetVideoFeedDocument = gql`
  *      limit: // value for 'limit'
  *      after: // value for 'after'
  *      filters: // value for 'filters'
+ *      includeCallersVideos: // value for 'includeCallersVideos'
  *   },
  * });
  */
@@ -5050,12 +5080,15 @@ export const GetShotsWithJustIdsDocument = gql`
     $filterInput: FilterInput!
     $shotsOrdering: GetShotsOrdering
     $limit: Int
+    $countRespectsLimit: Boolean
   ) {
     getOrderedShots(
       filterInput: $filterInput
       shotsOrdering: $shotsOrdering
       limit: $limit
+      countRespectsLimit: $countRespectsLimit
     ) {
+      count
       shots {
         id
         videoId
@@ -5079,6 +5112,7 @@ export const GetShotsWithJustIdsDocument = gql`
  *      filterInput: // value for 'filterInput'
  *      shotsOrdering: // value for 'shotsOrdering'
  *      limit: // value for 'limit'
+ *      countRespectsLimit: // value for 'countRespectsLimit'
  *   },
  * });
  */
@@ -5522,6 +5556,7 @@ export const GetLoggedInUserDocument = gql`
       activeVideoId
       createdAt
       updatedAt
+      videosPrivateByDefault
     }
   }
 `;
@@ -5591,8 +5626,8 @@ export type GetLoggedInUserQueryResult = Apollo.QueryResult<
   GetLoggedInUserQueryVariables
 >;
 export const GetUserPlayTimeDocument = gql`
-  query GetUserPlayTime($userId: Int!) {
-    getPlayTime(userId: $userId) {
+  query GetUserPlayTime($userId: Int!, $filters: VideoFilterInput) {
+    getPlayTime(userId: $userId, filters: $filters) {
       totalSeconds
     }
   }
@@ -5611,6 +5646,7 @@ export const GetUserPlayTimeDocument = gql`
  * const { data, loading, error } = useGetUserPlayTimeQuery({
  *   variables: {
  *      userId: // value for 'userId'
+ *      filters: // value for 'filters'
  *   },
  * });
  */
@@ -6173,6 +6209,70 @@ export type DoesUsernameExistQueryResult = Apollo.QueryResult<
   DoesUsernameExistQuery,
   DoesUsernameExistQueryVariables
 >;
+export const EditUserDocument = gql`
+  mutation editUser(
+    $username: String
+    $fargoRating: Int
+    $videosPrivateByDefault: Boolean
+  ) {
+    editUser(
+      input: {
+        username: $username
+        fargoRating: $fargoRating
+        videosPrivateByDefault: $videosPrivateByDefault
+      }
+    ) {
+      id
+      firebaseUid
+      username
+      fargoRating
+      updatedAt
+      videosPrivateByDefault
+    }
+  }
+`;
+export type EditUserMutationFn = Apollo.MutationFunction<
+  EditUserMutation,
+  EditUserMutationVariables
+>;
+
+/**
+ * __useEditUserMutation__
+ *
+ * To run a mutation, you first call `useEditUserMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useEditUserMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [editUserMutation, { data, loading, error }] = useEditUserMutation({
+ *   variables: {
+ *      username: // value for 'username'
+ *      fargoRating: // value for 'fargoRating'
+ *      videosPrivateByDefault: // value for 'videosPrivateByDefault'
+ *   },
+ * });
+ */
+export function useEditUserMutation(
+  baseOptions?: Apollo.MutationHookOptions<
+    EditUserMutation,
+    EditUserMutationVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useMutation<EditUserMutation, EditUserMutationVariables>(
+    EditUserDocument,
+    options,
+  );
+}
+export type EditUserMutationHookResult = ReturnType<typeof useEditUserMutation>;
+export type EditUserMutationResult = Apollo.MutationResult<EditUserMutation>;
+export type EditUserMutationOptions = Apollo.BaseMutationOptions<
+  EditUserMutation,
+  EditUserMutationVariables
+>;
 export const GetStreamMonitoringDetailsDocument = gql`
   query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     getVideo(videoId: $videoId, debuggingJson: $debuggingJson) {
@@ -7104,7 +7204,7 @@ export type GetHeaderInfoByVideoIdQueryResult = Apollo.QueryResult<
   GetHeaderInfoByVideoIdQueryVariables
 >;
 export const FindPrerecordTableLayoutDocument = gql`
-  mutation FindPrerecordTableLayout($b64Image: Base64!, $videoId: Int!) {
+  mutation FindPrerecordTableLayout($b64Image: String!, $videoId: Int!) {
     findPrerecordTableLayout(b64Image: $b64Image, videoId: $videoId) {
       ...HomographyInfo
     }

src/operations/feed.gql

@@ -6,32 +6,7 @@ query GetFeed(
 ) {
   getUserVideos(limit: $limit, after: $after, filters: $filters) {
     videos {
-      id
-      owner {
-        username
-      }
-      name
-      screenshotUri
-      totalShotsMade
-      totalShots
-      makePercentage
-      createdAt
-      updatedAt
-      startTime
-      endTime
-      elapsedTime
-      screenshotUri
-      stream {
-        id
-        isCompleted
-      }
-      tableSize
-      tags {
-        tagClasses {
-          name
-        }
-        name
-      }
+      ...VideoCardFields
     }
     pageInfo {
       hasNextPage
@@ -56,6 +31,7 @@ fragment VideoCardFields on VideoGQL {
   updatedAt
   startTime
   endTime
+  private
   elapsedTime
   screenshotUri
   stream {
@@ -85,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/shots.gql

@@ -66,12 +66,15 @@ query GetShotsWithJustIds(
   $filterInput: FilterInput!
   $shotsOrdering: GetShotsOrdering
   $limit: Int
+  $countRespectsLimit: Boolean
 ) {
   getOrderedShots(
     filterInput: $filterInput
     shotsOrdering: $shotsOrdering
     limit: $limit
+    countRespectsLimit: $countRespectsLimit
   ) {
+    count
     shots {
       id
       videoId

src/operations/user.gql

@@ -41,11 +41,12 @@ query getLoggedInUser {
     activeVideoId
     createdAt
     updatedAt
+    videosPrivateByDefault
   }
 }
 
-query GetUserPlayTime($userId: Int!) {
-  getPlayTime(userId: $userId) {
+query GetUserPlayTime($userId: Int!, $filters: VideoFilterInput) {
+  getPlayTime(userId: $userId, filters: $filters) {
     totalSeconds
   }
 }
@@ -135,3 +136,24 @@ query getUserFollowingFollowers {
 query doesUsernameExist($candidateUsername: String!) {
   doesUsernameExist(candidateUsername: $candidateUsername)
 }
+
+mutation editUser(
+  $username: String
+  $fargoRating: Int
+  $videosPrivateByDefault: Boolean
+) {
+  editUser(
+    input: {
+      username: $username
+      fargoRating: $fargoRating
+      videosPrivateByDefault: $videosPrivateByDefault
+    }
+  ) {
+    id
+    firebaseUid
+    username
+    fargoRating
+    updatedAt
+    videosPrivateByDefault
+  }
+}

src/operations/video.gql

@@ -214,14 +214,13 @@ query GetHeaderInfoByVideoId($videoId: Int!) {
   }
 }
 
-mutation FindPrerecordTableLayout($b64Image: Base64!, $videoId: Int!) {
+mutation FindPrerecordTableLayout($b64Image: String!, $videoId: Int!) {
   findPrerecordTableLayout(b64Image: $b64Image, videoId: $videoId) {
     ...HomographyInfo
   }
 }
 
 fragment HomographyInfo on HomographyInfoGQL {
-  id
   frameIndex
   crop {
     left

src/schema.gql

@@ -46,7 +46,7 @@ type Query {
     limit: Int = 100
     after: String = null
   ): UserRelationshipsResult!
-  getPlayTime(userId: Int!): UserPlayTimeGQL!
+  getPlayTime(userId: Int!, filters: VideoFilterInput = null): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
     limit: Int! = 5
@@ -59,6 +59,7 @@ type Query {
   getFeedVideos(
     limit: Int! = 5
     after: String = null
+    includeCallersVideos: Boolean = true
     filters: VideoFilterInput = null
   ): VideoHistoryGQL!
 }
@@ -400,6 +401,7 @@ type UserGQL {
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
+  videosPrivateByDefault: Boolean
   following: [UserGQL!]
   followers: [UserGQL!]
 }
@@ -437,6 +439,7 @@ type VideoGQL {
   elapsedTime: Float
   framesPerSecond: Float!
   tableSize: Float!
+  private: Boolean!
   stream: UploadStreamGQL
   playlist: HLSPlaylistGQL
   tags: [VideoTag!]!
@@ -622,6 +625,13 @@ type UserPlayTimeGQL {
   totalSeconds: Float!
 }
 
+input VideoFilterInput {
+  isStreamCompleted: Boolean = null
+  requireCursorCompletion: Boolean! = true
+  createdAt: DateRangeFilter = null
+  excludeVideosWithNoShots: Boolean = null
+}
+
 type VideoHistoryGQL {
   videos: [VideoGQL!]!
   pageInfo: PageInfoGQL!
@@ -632,11 +642,6 @@ type PageInfoGQL {
   endCursor: String
 }
 
-input VideoFilterInput {
-  isStreamCompleted: Boolean = null
-  requireCursorCompletion: Boolean! = true
-}
-
 type TagGQL {
   name: String!
   id: Int!
@@ -670,7 +675,7 @@ type Mutation {
   editUser(input: EditUserInputGQL!): UserGQL!
   followUser(followedUserId: Int!): UserGQL!
   unfollowUser(followedUserId: Int!): UserGQL!
-  findPrerecordTableLayout(b64Image: Base64!, videoId: Int!): HomographyInfoGQL
+  findPrerecordTableLayout(b64Image: String!, videoId: Int!): HomographyInfoGQL
   createUploadStream(
     videoMetadata: VideoMetadataInput!
   ): CreateUploadStreamReturn!
@@ -759,16 +764,9 @@ type TooManyProfileImageUploadsErr {
 input EditUserInputGQL {
   username: String = null
   fargoRating: Int = null
+  videosPrivateByDefault: Boolean = null
 }
 
-"""
-Represents binary data as Base64-encoded strings, using the standard alphabet.
-"""
-scalar Base64
-  @specifiedBy(
-    url: "https://datatracker.ietf.org/doc/html/rfc4648.html#section-4"
-  )
-
 type CreateUploadStreamReturn {
   videoId: Int!
 }
@@ -781,6 +779,7 @@ input VideoMetadataInput {
   tableSize: Float = null
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null
+  private: Boolean = null
   endStream: Boolean! = false
   resolution: VideoResolution = null
   framesPerSecond: Float = null