Use get feed videos

2024-11-04 14:59:39 -07:00
6 changed files with 218 additions and 819 deletions
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -184,7 +184,6 @@ export type DoesNotOwnShotErrOtherErrorNeedsNote =
 export type EditUserInputGql = {
  fargoRating?: InputMaybe<Scalars["Int"]["input"]>;
  username?: InputMaybe<Scalars["String"]["input"]>;
-  videosPrivateByDefault?: InputMaybe<Scalars["Boolean"]["input"]>;
 };

 export type EnumAggregation = {
@@ -1943,7 +1942,6 @@ export type HomographyInfoGql = {
  crop: BoundingBoxGql;
  destPoints: PocketPointsGql;
  frameIndex: Scalars["Int"]["output"];
-  id: Scalars["Int"]["output"];
  pockets: Array<BoundingBoxGql>;
  sourcePoints: PocketPointsGql;
 };
@@ -2010,7 +2008,6 @@ export type Mutation = {
  editProfileImageUri: UserGql;
  editUploadStream: Scalars["Boolean"]["output"];
  editUser: UserGql;
-  findPrerecordTableLayout?: Maybe<HomographyInfoGql>;
  followUser: UserGql;
  getHlsInitUploadLink: GetUploadLinkReturn;
  getProfileImageUploadLink: GetProfileUploadLinkReturn;
@@ -2052,11 +2049,6 @@ export type MutationEditUserArgs = {
  input: EditUserInputGql;
 };

-export type MutationFindPrerecordTableLayoutArgs = {
-  b64Image: Scalars["String"]["input"];
-  videoId: Scalars["Int"]["input"];
-};
-
 export type MutationFollowUserArgs = {
  followedUserId: Scalars["Int"]["input"];
 };
@@ -2210,7 +2202,6 @@ export type QueryGetBucketSetArgs = {
 export type QueryGetFeedVideosArgs = {
  after?: InputMaybe<Scalars["String"]["input"]>;
  filters?: InputMaybe<VideoFilterInput>;
-  includeCallersVideos?: InputMaybe<Scalars["Boolean"]["input"]>;
  limit?: Scalars["Int"]["input"];
 };

@@ -2228,7 +2219,6 @@ export type QueryGetOrderedShotsArgs = {
 };

 export type QueryGetPlayTimeArgs = {
-  filters?: InputMaybe<VideoFilterInput>;
  userId: Scalars["Int"]["input"];
 };

@@ -2587,7 +2577,6 @@ 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 = {
@@ -2609,8 +2598,6 @@ export type UserRelationshipsResult = {
 };

 export type VideoFilterInput = {
-  createdAt?: InputMaybe<DateRangeFilter>;
-  excludeVideosWithNoShots?: InputMaybe<Scalars["Boolean"]["input"]>;
  isStreamCompleted?: InputMaybe<Scalars["Boolean"]["input"]>;
  requireCursorCompletion?: Scalars["Boolean"]["input"];
 };
@@ -2631,7 +2618,6 @@ 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"]>;
@@ -2655,7 +2641,6 @@ 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>;
@@ -2673,7 +2658,6 @@ export type VideoProcessingErrorGql = {
 export type VideoProcessingGql = {
  __typename?: "VideoProcessingGQL";
  errors: Array<VideoProcessingErrorGql>;
-  id: Scalars["Int"]["output"];
  status: ProcessingStatusEnum;
  statuses: Array<VideoProcessingStatusGql>;
 };
@@ -2765,113 +2749,6 @@ export type GetFeedQueryVariables = Exact<{
 }>;

 export type GetFeedQuery = {
-  __typename?: "Query";
-  getUserVideos: {
-    __typename?: "VideoHistoryGQL";
-    videos: Array<{
-      __typename?: "VideoGQL";
-      id: number;
-      name?: string | null;
-      screenshotUri?: string | null;
-      totalShotsMade: number;
-      totalShots: number;
-      makePercentage: number;
-      createdAt?: any | null;
-      updatedAt?: any | null;
-      startTime?: any | null;
-      endTime?: any | null;
-      private: boolean;
-      elapsedTime?: number | null;
-      tableSize: number;
-      owner?: {
-        __typename?: "UserGQL";
-        id: number;
-        username: string;
-        profileImageUri?: string | null;
-      } | null;
-      stream?: {
-        __typename?: "UploadStreamGQL";
-        id: string;
-        isCompleted: boolean;
-      } | null;
-      tags: Array<{
-        __typename?: "VideoTag";
-        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";
-      hasNextPage: boolean;
-      endCursor?: string | null;
-    };
-  };
-};
-
-export type VideoCardFieldsFragment = {
-  __typename?: "VideoGQL";
-  id: number;
-  name?: string | null;
-  screenshotUri?: string | null;
-  totalShotsMade: number;
-  totalShots: number;
-  makePercentage: number;
-  createdAt?: any | null;
-  updatedAt?: any | null;
-  startTime?: any | null;
-  endTime?: any | null;
-  private: boolean;
-  elapsedTime?: number | null;
-  tableSize: number;
-  owner?: {
-    __typename?: "UserGQL";
-    id: number;
-    username: string;
-    profileImageUri?: string | null;
-  } | null;
-  stream?: {
-    __typename?: "UploadStreamGQL";
-    id: string;
-    isCompleted: boolean;
-  } | null;
-  tags: Array<{
-    __typename?: "VideoTag";
-    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;
-};
-
-export type GetVideoFeedQueryVariables = Exact<{
-  limit?: Scalars["Int"]["input"];
-  after?: InputMaybe<Scalars["String"]["input"]>;
-  filters?: InputMaybe<VideoFilterInput>;
-  includeCallersVideos?: InputMaybe<Scalars["Boolean"]["input"]>;
-}>;
-
-export type GetVideoFeedQuery = {
  __typename?: "Query";
  getFeedVideos: {
    __typename?: "VideoHistoryGQL";
@@ -2887,15 +2764,9 @@ export type GetVideoFeedQuery = {
      updatedAt?: any | null;
      startTime?: any | null;
      endTime?: any | null;
-      private: boolean;
      elapsedTime?: number | null;
      tableSize: number;
-      owner?: {
-        __typename?: "UserGQL";
-        id: number;
-        username: string;
-        profileImageUri?: string | null;
-      } | null;
+      owner?: { __typename?: "UserGQL"; username: string } | null;
      stream?: {
        __typename?: "UploadStreamGQL";
        id: string;
@@ -2906,19 +2777,6 @@ export type GetVideoFeedQuery = {
        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";
@@ -3028,22 +2886,6 @@ export type GetShotsWithVideoGqlQuery = {
  };
 };

-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 }>;
-  };
-};
-
 export type GetShotsWithMetadataFilterResultQueryVariables = Exact<{
  filterInput: FilterInput;
  shotsOrdering?: InputMaybe<GetShotsOrdering>;
@@ -3338,13 +3180,11 @@ 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 = {
@@ -3467,25 +3307,6 @@ 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"]>;
@@ -3501,7 +3322,6 @@ export type GetStreamMonitoringDetailsQuery = {
    elapsedTime?: number | null;
    currentHomography?: {
      __typename?: "HomographyInfoGQL";
-      frameIndex: number;
      crop: {
        __typename?: "BoundingBoxGQL";
        left: number;
@@ -3916,70 +3736,6 @@ export type GetHeaderInfoByVideoIdQuery = {
  };
 };

-export type FindPrerecordTableLayoutMutationVariables = Exact<{
-  b64Image: Scalars["String"]["input"];
-  videoId: Scalars["Int"]["input"];
-}>;
-
-export type FindPrerecordTableLayoutMutation = {
-  __typename?: "Mutation";
-  findPrerecordTableLayout?: {
-    __typename?: "HomographyInfoGQL";
-    frameIndex: number;
-    crop: {
-      __typename?: "BoundingBoxGQL";
-      left: number;
-      top: number;
-      width: number;
-      height: number;
-    };
-    pockets: Array<{
-      __typename?: "BoundingBoxGQL";
-      left: number;
-      top: number;
-      width: number;
-      height: number;
-    }>;
-    sourcePoints: {
-      __typename?: "PocketPointsGQL";
-      topLeft: { __typename?: "IntPoint2D"; x: number; y: number };
-      topSide: { __typename?: "IntPoint2D"; x: number; y: number };
-      topRight: { __typename?: "IntPoint2D"; x: number; y: number };
-      bottomLeft: { __typename?: "IntPoint2D"; x: number; y: number };
-      bottomSide: { __typename?: "IntPoint2D"; x: number; y: number };
-      bottomRight: { __typename?: "IntPoint2D"; x: number; y: number };
-    };
-  } | null;
-};
-
-export type HomographyInfoFragment = {
-  __typename?: "HomographyInfoGQL";
-  frameIndex: number;
-  crop: {
-    __typename?: "BoundingBoxGQL";
-    left: number;
-    top: number;
-    width: number;
-    height: number;
-  };
-  pockets: Array<{
-    __typename?: "BoundingBoxGQL";
-    left: number;
-    top: number;
-    width: number;
-    height: number;
-  }>;
-  sourcePoints: {
-    __typename?: "PocketPointsGQL";
-    topLeft: { __typename?: "IntPoint2D"; x: number; y: number };
-    topSide: { __typename?: "IntPoint2D"; x: number; y: number };
-    topRight: { __typename?: "IntPoint2D"; x: number; y: number };
-    bottomLeft: { __typename?: "IntPoint2D"; x: number; y: number };
-    bottomSide: { __typename?: "IntPoint2D"; x: number; y: number };
-    bottomRight: { __typename?: "IntPoint2D"; x: number; y: number };
-  };
-};
-
 export type CreateUploadStreamMutationVariables = Exact<{
  videoMetadataInput: VideoMetadataInput;
 }>;
@@ -4152,49 +3908,6 @@ export type GetUploadStreamsWithDetailsQuery = {
  };
 };

-export const VideoCardFieldsFragmentDoc = gql`
-  fragment VideoCardFields on VideoGQL {
-    id
-    owner {
-      id
-      username
-      profileImageUri
-    }
-    name
-    screenshotUri
-    totalShotsMade
-    totalShots
-    makePercentage
-    createdAt
-    updatedAt
-    startTime
-    endTime
-    private
-    elapsedTime
-    screenshotUri
-    stream {
-      id
-      isCompleted
-    }
-    tableSize
-    tags {
-      tagClasses {
-        name
-      }
-      name
-    }
-    currentProcessing {
-      id
-      errors {
-        message
-      }
-      status
-      statuses {
-        status
-      }
-    }
-  }
-`;
 export const ShotWithAllFeaturesFragmentDoc = gql`
  fragment ShotWithAllFeatures on ShotGQL {
    id
@@ -4313,49 +4026,6 @@ export const VideoDurationDataFragmentDoc = gql`
  ${PlaylistWithSegmentStartTimesFragmentDoc}
  ${StreamWithEndFramesFragmentDoc}
 `;
-export const HomographyInfoFragmentDoc = gql`
-  fragment HomographyInfo on HomographyInfoGQL {
-    frameIndex
-    crop {
-      left
-      top
-      width
-      height
-    }
-    pockets {
-      left
-      top
-      width
-      height
-    }
-    sourcePoints {
-      topLeft {
-        x
-        y
-      }
-      topSide {
-        x
-        y
-      }
-      topRight {
-        x
-        y
-      }
-      bottomLeft {
-        x
-        y
-      }
-      bottomSide {
-        x
-        y
-      }
-      bottomRight {
-        x
-        y
-      }
-    }
-  }
-`;
 export const GetAggregatedShotMetricsDocument = gql`
  query GetAggregatedShotMetrics($aggregateInput: AggregateInputGQL!) {
    getAggregatedShotMetrics(aggregateInput: $aggregateInput) {
@@ -4518,9 +4188,34 @@ export const GetFeedDocument = gql`
    $after: String = null
    $filters: VideoFilterInput = null
  ) {
-    getUserVideos(limit: $limit, after: $after, filters: $filters) {
+    getFeedVideos(limit: $limit, after: $after, filters: $filters) {
      videos {
-        ...VideoCardFields
+        id
+        owner {
+          username
+        }
+        name
+        screenshotUri
+        totalShotsMade
+        totalShots
+        makePercentage
+        createdAt
+        updatedAt
+        startTime
+        endTime
+        elapsedTime
+        screenshotUri
+        stream {
+          id
+          isCompleted
+        }
+        tableSize
+        tags {
+          tagClasses {
+            name
+          }
+          name
+        }
      }
      pageInfo {
        hasNextPage
@@ -4528,7 +4223,6 @@ export const GetFeedDocument = gql`
      }
    }
  }
-  ${VideoCardFieldsFragmentDoc}
 `;

 /**
@@ -4591,99 +4285,6 @@ export type GetFeedQueryResult = Apollo.QueryResult<
  GetFeedQuery,
  GetFeedQueryVariables
 >;
-export const GetVideoFeedDocument = gql`
-  query GetVideoFeed(
-    $limit: Int! = 5
-    $after: String = null
-    $filters: VideoFilterInput = null
-    $includeCallersVideos: Boolean = null
-  ) {
-    getFeedVideos(
-      limit: $limit
-      after: $after
-      filters: $filters
-      includeCallersVideos: $includeCallersVideos
-    ) {
-      videos {
-        ...VideoCardFields
-      }
-      pageInfo {
-        hasNextPage
-        endCursor
-      }
-    }
-  }
-  ${VideoCardFieldsFragmentDoc}
-`;
-
-/**
- * __useGetVideoFeedQuery__
- *
- * To run a query within a React component, call `useGetVideoFeedQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetVideoFeedQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetVideoFeedQuery({
- *   variables: {
- *      limit: // value for 'limit'
- *      after: // value for 'after'
- *      filters: // value for 'filters'
- *      includeCallersVideos: // value for 'includeCallersVideos'
- *   },
- * });
- */
-export function useGetVideoFeedQuery(
-  baseOptions?: Apollo.QueryHookOptions<
-    GetVideoFeedQuery,
-    GetVideoFeedQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<GetVideoFeedQuery, GetVideoFeedQueryVariables>(
-    GetVideoFeedDocument,
-    options,
-  );
-}
-export function useGetVideoFeedLazyQuery(
-  baseOptions?: Apollo.LazyQueryHookOptions<
-    GetVideoFeedQuery,
-    GetVideoFeedQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useLazyQuery<GetVideoFeedQuery, GetVideoFeedQueryVariables>(
-    GetVideoFeedDocument,
-    options,
-  );
-}
-export function useGetVideoFeedSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    GetVideoFeedQuery,
-    GetVideoFeedQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useSuspenseQuery<GetVideoFeedQuery, GetVideoFeedQueryVariables>(
-    GetVideoFeedDocument,
-    options,
-  );
-}
-export type GetVideoFeedQueryHookResult = ReturnType<
-  typeof useGetVideoFeedQuery
->;
-export type GetVideoFeedLazyQueryHookResult = ReturnType<
-  typeof useGetVideoFeedLazyQuery
->;
-export type GetVideoFeedSuspenseQueryHookResult = ReturnType<
-  typeof useGetVideoFeedSuspenseQuery
->;
-export type GetVideoFeedQueryResult = Apollo.QueryResult<
-  GetVideoFeedQuery,
-  GetVideoFeedQueryVariables
->;
 export const GetVideoMakePercentageIntervalsDocument = gql`
  query GetVideoMakePercentageIntervals(
    $videoId: ID!
@@ -5075,96 +4676,6 @@ export type GetShotsWithVideoGqlQueryResult = Apollo.QueryResult<
  GetShotsWithVideoGqlQuery,
  GetShotsWithVideoGqlQueryVariables
 >;
-export const GetShotsWithJustIdsDocument = gql`
-  query GetShotsWithJustIds(
-    $filterInput: FilterInput!
-    $shotsOrdering: GetShotsOrdering
-    $limit: Int
-    $countRespectsLimit: Boolean
-  ) {
-    getOrderedShots(
-      filterInput: $filterInput
-      shotsOrdering: $shotsOrdering
-      limit: $limit
-      countRespectsLimit: $countRespectsLimit
-    ) {
-      count
-      shots {
-        id
-        videoId
-      }
-    }
-  }
-`;
-
-/**
- * __useGetShotsWithJustIdsQuery__
- *
- * To run a query within a React component, call `useGetShotsWithJustIdsQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetShotsWithJustIdsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetShotsWithJustIdsQuery({
- *   variables: {
- *      filterInput: // value for 'filterInput'
- *      shotsOrdering: // value for 'shotsOrdering'
- *      limit: // value for 'limit'
- *      countRespectsLimit: // value for 'countRespectsLimit'
- *   },
- * });
- */
-export function useGetShotsWithJustIdsQuery(
-  baseOptions: Apollo.QueryHookOptions<
-    GetShotsWithJustIdsQuery,
-    GetShotsWithJustIdsQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<
-    GetShotsWithJustIdsQuery,
-    GetShotsWithJustIdsQueryVariables
-  >(GetShotsWithJustIdsDocument, options);
-}
-export function useGetShotsWithJustIdsLazyQuery(
-  baseOptions?: Apollo.LazyQueryHookOptions<
-    GetShotsWithJustIdsQuery,
-    GetShotsWithJustIdsQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useLazyQuery<
-    GetShotsWithJustIdsQuery,
-    GetShotsWithJustIdsQueryVariables
-  >(GetShotsWithJustIdsDocument, options);
-}
-export function useGetShotsWithJustIdsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    GetShotsWithJustIdsQuery,
-    GetShotsWithJustIdsQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useSuspenseQuery<
-    GetShotsWithJustIdsQuery,
-    GetShotsWithJustIdsQueryVariables
-  >(GetShotsWithJustIdsDocument, options);
-}
-export type GetShotsWithJustIdsQueryHookResult = ReturnType<
-  typeof useGetShotsWithJustIdsQuery
->;
-export type GetShotsWithJustIdsLazyQueryHookResult = ReturnType<
-  typeof useGetShotsWithJustIdsLazyQuery
->;
-export type GetShotsWithJustIdsSuspenseQueryHookResult = ReturnType<
-  typeof useGetShotsWithJustIdsSuspenseQuery
->;
-export type GetShotsWithJustIdsQueryResult = Apollo.QueryResult<
-  GetShotsWithJustIdsQuery,
-  GetShotsWithJustIdsQueryVariables
->;
 export const GetShotsWithMetadataFilterResultDocument = gql`
  query GetShotsWithMetadataFilterResult(
    $filterInput: FilterInput!
@@ -5556,7 +5067,6 @@ export const GetLoggedInUserDocument = gql`
      activeVideoId
      createdAt
      updatedAt
-      videosPrivateByDefault
    }
  }
 `;
@@ -5626,8 +5136,8 @@ export type GetLoggedInUserQueryResult = Apollo.QueryResult<
  GetLoggedInUserQueryVariables
 >;
 export const GetUserPlayTimeDocument = gql`
-  query GetUserPlayTime($userId: Int!, $filters: VideoFilterInput) {
-    getPlayTime(userId: $userId, filters: $filters) {
+  query GetUserPlayTime($userId: Int!) {
+    getPlayTime(userId: $userId) {
      totalSeconds
    }
  }
@@ -5646,7 +5156,6 @@ export const GetUserPlayTimeDocument = gql`
 * const { data, loading, error } = useGetUserPlayTimeQuery({
 *   variables: {
 *      userId: // value for 'userId'
- *      filters: // value for 'filters'
 *   },
 * });
 */
@@ -6209,70 +5718,6 @@ 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) {
@@ -6281,7 +5726,44 @@ export const GetStreamMonitoringDetailsDocument = gql`
      makePercentage
      elapsedTime
      currentHomography {
-        ...HomographyInfo
+        crop {
+          left
+          top
+          width
+          height
+        }
+        pockets {
+          left
+          top
+          width
+          height
+        }
+        sourcePoints {
+          topLeft {
+            x
+            y
+          }
+          topSide {
+            x
+            y
+          }
+          topRight {
+            x
+            y
+          }
+          bottomLeft {
+            x
+            y
+          }
+          bottomSide {
+            x
+            y
+          }
+          bottomRight {
+            x
+            y
+          }
+        }
      }
      stream {
        id
@@ -6302,7 +5784,6 @@ export const GetStreamMonitoringDetailsDocument = gql`
      }
    }
  }
-  ${HomographyInfoFragmentDoc}
 `;

 /**
@@ -6752,7 +6233,45 @@ export const GetVideoDocument = gql`
        segmentDurations
      }
      homographyHistory {
-        ...HomographyInfo
+        frameIndex
+        crop {
+          left
+          top
+          width
+          height
+        }
+        pockets {
+          left
+          top
+          width
+          height
+        }
+        sourcePoints {
+          topLeft {
+            x
+            y
+          }
+          topSide {
+            x
+            y
+          }
+          topRight {
+            x
+            y
+          }
+          bottomLeft {
+            x
+            y
+          }
+          bottomSide {
+            x
+            y
+          }
+          bottomRight {
+            x
+            y
+          }
+        }
      }
      stream {
        id
@@ -6769,7 +6288,6 @@ export const GetVideoDocument = gql`
      }
    }
  }
-  ${HomographyInfoFragmentDoc}
 `;

 /**
@@ -7203,59 +6721,6 @@ export type GetHeaderInfoByVideoIdQueryResult = Apollo.QueryResult<
  GetHeaderInfoByVideoIdQuery,
  GetHeaderInfoByVideoIdQueryVariables
 >;
-export const FindPrerecordTableLayoutDocument = gql`
-  mutation FindPrerecordTableLayout($b64Image: String!, $videoId: Int!) {
-    findPrerecordTableLayout(b64Image: $b64Image, videoId: $videoId) {
-      ...HomographyInfo
-    }
-  }
-  ${HomographyInfoFragmentDoc}
-`;
-export type FindPrerecordTableLayoutMutationFn = Apollo.MutationFunction<
-  FindPrerecordTableLayoutMutation,
-  FindPrerecordTableLayoutMutationVariables
->;
-
-/**
- * __useFindPrerecordTableLayoutMutation__
- *
- * To run a mutation, you first call `useFindPrerecordTableLayoutMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useFindPrerecordTableLayoutMutation` 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 [findPrerecordTableLayoutMutation, { data, loading, error }] = useFindPrerecordTableLayoutMutation({
- *   variables: {
- *      b64Image: // value for 'b64Image'
- *      videoId: // value for 'videoId'
- *   },
- * });
- */
-export function useFindPrerecordTableLayoutMutation(
-  baseOptions?: Apollo.MutationHookOptions<
-    FindPrerecordTableLayoutMutation,
-    FindPrerecordTableLayoutMutationVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useMutation<
-    FindPrerecordTableLayoutMutation,
-    FindPrerecordTableLayoutMutationVariables
-  >(FindPrerecordTableLayoutDocument, options);
-}
-export type FindPrerecordTableLayoutMutationHookResult = ReturnType<
-  typeof useFindPrerecordTableLayoutMutation
->;
-export type FindPrerecordTableLayoutMutationResult =
-  Apollo.MutationResult<FindPrerecordTableLayoutMutation>;
-export type FindPrerecordTableLayoutMutationOptions =
-  Apollo.BaseMutationOptions<
-    FindPrerecordTableLayoutMutation,
-    FindPrerecordTableLayoutMutationVariables
-  >;
 export const CreateUploadStreamDocument = gql`
  mutation CreateUploadStream($videoMetadataInput: VideoMetadataInput!) {
    createUploadStream(videoMetadata: $videoMetadataInput) {
--- a/src/operations/feed.gql
+++ b/src/operations/feed.gql
@@ -1,76 +1,36 @@
-# DO NOT USE: use getVideoFeed instead
 query GetFeed(
  $limit: Int! = 5
  $after: String = null
  $filters: VideoFilterInput = null
 ) {
-  getUserVideos(limit: $limit, after: $after, filters: $filters) {
+  getFeedVideos(limit: $limit, after: $after, filters: $filters) {
    videos {
-      ...VideoCardFields
-    }
-    pageInfo {
-      hasNextPage
-      endCursor
-    }
-  }
-}
-
-fragment VideoCardFields on VideoGQL {
-  id
-  owner {
-    id
-    username
-    profileImageUri
-  }
-  name
-  screenshotUri
-  totalShotsMade
-  totalShots
-  makePercentage
-  createdAt
-  updatedAt
-  startTime
-  endTime
-  private
-  elapsedTime
-  screenshotUri
-  stream {
-    id
-    isCompleted
-  }
-  tableSize
-  tags {
-    tagClasses {
+      id
+      owner {
+        username
+      }
      name
-    }
-    name
-  }
-  currentProcessing {
-    id
-    errors {
-      message
-    }
-    status
-    statuses {
-      status
-    }
-  }
-}
-
-query GetVideoFeed(
-  $limit: Int! = 5
-  $after: String = null
-  $filters: VideoFilterInput = null
-  $includeCallersVideos: Boolean = null
-) {
-  getFeedVideos(
-    limit: $limit
-    after: $after
-    filters: $filters
-    includeCallersVideos: $includeCallersVideos
-  ) {
-    videos {
-      ...VideoCardFields
+      screenshotUri
+      totalShotsMade
+      totalShots
+      makePercentage
+      createdAt
+      updatedAt
+      startTime
+      endTime
+      elapsedTime
+      screenshotUri
+      stream {
+        id
+        isCompleted
+      }
+      tableSize
+      tags {
+        tagClasses {
+          name
+        }
+        name
+      }
    }
    pageInfo {
      hasNextPage
--- a/src/operations/shots.gql
+++ b/src/operations/shots.gql
@@ -40,7 +40,6 @@ mutation UpdateShotAnnotations(
  }
 }

-## Should be deprecated
 query GetShotsWithVideoGql(
  $filterInput: FilterInput!
  $shotsOrdering: GetShotsOrdering
@@ -62,26 +61,6 @@ query GetShotsWithVideoGql(
  }
 }

-query GetShotsWithJustIds(
-  $filterInput: FilterInput!
-  $shotsOrdering: GetShotsOrdering
-  $limit: Int
-  $countRespectsLimit: Boolean
-) {
-  getOrderedShots(
-    filterInput: $filterInput
-    shotsOrdering: $shotsOrdering
-    limit: $limit
-    countRespectsLimit: $countRespectsLimit
-  ) {
-    count
-    shots {
-      id
-      videoId
-    }
-  }
-}
-
 ## Reserved for playlists (which are created from a filter)
 query GetShotsWithMetadataFilterResult(
  $filterInput: FilterInput!
--- a/src/operations/user.gql
+++ b/src/operations/user.gql
@@ -41,12 +41,11 @@ query getLoggedInUser {
    activeVideoId
    createdAt
    updatedAt
-    videosPrivateByDefault
  }
 }

-query GetUserPlayTime($userId: Int!, $filters: VideoFilterInput) {
-  getPlayTime(userId: $userId, filters: $filters) {
+query GetUserPlayTime($userId: Int!) {
+  getPlayTime(userId: $userId) {
    totalSeconds
  }
 }
@@ -136,24 +135,3 @@ 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
-  }
-}
--- a/src/operations/video.gql
+++ b/src/operations/video.gql
@@ -5,7 +5,44 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
    makePercentage
    elapsedTime
    currentHomography {
-      ...HomographyInfo
+      crop {
+        left
+        top
+        width
+        height
+      }
+      pockets {
+        left
+        top
+        width
+        height
+      }
+      sourcePoints {
+        topLeft {
+          x
+          y
+        }
+        topSide {
+          x
+          y
+        }
+        topRight {
+          x
+          y
+        }
+        bottomLeft {
+          x
+          y
+        }
+        bottomSide {
+          x
+          y
+        }
+        bottomRight {
+          x
+          y
+        }
+      }
    }
    stream {
      id
@@ -117,7 +154,45 @@ query GetVideo($videoId: Int!) {
      segmentDurations
    }
    homographyHistory {
-      ...HomographyInfo
+      frameIndex
+      crop {
+        left
+        top
+        width
+        height
+      }
+      pockets {
+        left
+        top
+        width
+        height
+      }
+      sourcePoints {
+        topLeft {
+          x
+          y
+        }
+        topSide {
+          x
+          y
+        }
+        topRight {
+          x
+          y
+        }
+        bottomLeft {
+          x
+          y
+        }
+        bottomSide {
+          x
+          y
+        }
+        bottomRight {
+          x
+          y
+        }
+      }
    }
    stream {
      id
@@ -213,51 +288,3 @@ query GetHeaderInfoByVideoId($videoId: Int!) {
    startTime
  }
 }
-
-mutation FindPrerecordTableLayout($b64Image: String!, $videoId: Int!) {
-  findPrerecordTableLayout(b64Image: $b64Image, videoId: $videoId) {
-    ...HomographyInfo
-  }
-}
-
-fragment HomographyInfo on HomographyInfoGQL {
-  frameIndex
-  crop {
-    left
-    top
-    width
-    height
-  }
-  pockets {
-    left
-    top
-    width
-    height
-  }
-  sourcePoints {
-    topLeft {
-      x
-      y
-    }
-    topSide {
-      x
-      y
-    }
-    topRight {
-      x
-      y
-    }
-    bottomLeft {
-      x
-      y
-    }
-    bottomSide {
-      x
-      y
-    }
-    bottomRight {
-      x
-      y
-    }
-  }
-}
--- a/src/schema.gql
+++ b/src/schema.gql
@@ -46,7 +46,7 @@ type Query {
    limit: Int = 100
    after: String = null
  ): UserRelationshipsResult!
-  getPlayTime(userId: Int!, filters: VideoFilterInput = null): UserPlayTimeGQL!
+  getPlayTime(userId: Int!): UserPlayTimeGQL!
  getUserVideos(
    userId: Int = null
    limit: Int! = 5
@@ -59,7 +59,6 @@ type Query {
  getFeedVideos(
    limit: Int! = 5
    after: String = null
-    includeCallersVideos: Boolean = true
    filters: VideoFilterInput = null
  ): VideoHistoryGQL!
 }
@@ -401,7 +400,6 @@ type UserGQL {
  profileImageUri: String
  createdAt: DateTime
  updatedAt: DateTime
-  videosPrivateByDefault: Boolean
  following: [UserGQL!]
  followers: [UserGQL!]
 }
@@ -439,7 +437,6 @@ type VideoGQL {
  elapsedTime: Float
  framesPerSecond: Float!
  tableSize: Float!
-  private: Boolean!
  stream: UploadStreamGQL
  playlist: HLSPlaylistGQL
  tags: [VideoTag!]!
@@ -512,7 +509,6 @@ type VideoTagClass {
 }

 type HomographyInfoGQL {
-  id: Int!
  frameIndex: Int!
  crop: BoundingBoxGQL!
  pockets: [BoundingBoxGQL!]!
@@ -542,7 +538,6 @@ type IntPoint2D {
 }

 type VideoProcessingGQL {
-  id: Int!
  errors: [VideoProcessingErrorGQL!]!
  status: ProcessingStatusEnum!
  statuses: [VideoProcessingStatusGQL!]!
@@ -625,13 +620,6 @@ type UserPlayTimeGQL {
  totalSeconds: Float!
 }

-input VideoFilterInput {
-  isStreamCompleted: Boolean = null
-  requireCursorCompletion: Boolean! = true
-  createdAt: DateRangeFilter = null
-  excludeVideosWithNoShots: Boolean = null
-}
-
 type VideoHistoryGQL {
  videos: [VideoGQL!]!
  pageInfo: PageInfoGQL!
@@ -642,6 +630,11 @@ type PageInfoGQL {
  endCursor: String
 }

+input VideoFilterInput {
+  isStreamCompleted: Boolean = null
+  requireCursorCompletion: Boolean! = true
+}
+
 type TagGQL {
  name: String!
  id: Int!
@@ -675,7 +668,6 @@ type Mutation {
  editUser(input: EditUserInputGQL!): UserGQL!
  followUser(followedUserId: Int!): UserGQL!
  unfollowUser(followedUserId: Int!): UserGQL!
-  findPrerecordTableLayout(b64Image: String!, videoId: Int!): HomographyInfoGQL
  createUploadStream(
    videoMetadata: VideoMetadataInput!
  ): CreateUploadStreamReturn!
@@ -764,7 +756,6 @@ type TooManyProfileImageUploadsErr {
 input EditUserInputGQL {
  username: String = null
  fargoRating: Int = null
-  videosPrivateByDefault: Boolean = null
 }

 type CreateUploadStreamReturn {
@@ -779,7 +770,6 @@ input VideoMetadataInput {
  tableSize: Float = null
  lastIntendedSegmentBound: Int = null
  streamSegmentType: StreamSegmentTypeEnum = null
-  private: Boolean = null
  endStream: Boolean! = false
  resolution: VideoResolution = null
  framesPerSecond: Float = null