resolve merge conflicts

src/index.tsx

@@ -3214,18 +3214,7 @@ export type GetFeedQuery = {
         __typename?: "ReactionGQL";
         videoId: number;
         reaction: ReactionEnum;
-        user: {
-          __typename?: "UserGQL";
-          id: number;
-          username: string;
-          profileImageUri?: string | null;
-          followers?: Array<{
-            __typename?: "UserGQL";
-            id: number;
-            username: string;
-            profileImageUri?: string | null;
-          }> | null;
-        };
+        user: { __typename?: "UserGQL"; id: number; username: string };
       }>;
     }>;
     pageInfo: {
@@ -3284,18 +3273,7 @@ export type VideoCardFieldsFragment = {
     __typename?: "ReactionGQL";
     videoId: number;
     reaction: ReactionEnum;
-    user: {
-      __typename?: "UserGQL";
-      id: number;
-      username: string;
-      profileImageUri?: string | null;
-      followers?: Array<{
-        __typename?: "UserGQL";
-        id: number;
-        username: string;
-        profileImageUri?: string | null;
-      }> | null;
-    };
+    user: { __typename?: "UserGQL"; id: number; username: string };
   }>;
 };
 
@@ -3363,18 +3341,7 @@ export type GetVideoFeedQuery = {
         __typename?: "ReactionGQL";
         videoId: number;
         reaction: ReactionEnum;
-        user: {
-          __typename?: "UserGQL";
-          id: number;
-          username: string;
-          profileImageUri?: string | null;
-          followers?: Array<{
-            __typename?: "UserGQL";
-            id: number;
-            username: string;
-            profileImageUri?: string | null;
-          }> | null;
-        };
+        user: { __typename?: "UserGQL"; id: number; username: string };
       }>;
     }>;
     pageInfo: {
@@ -3612,38 +3579,6 @@ export type GetRunsForHighlightsQuery = {
   };
 };
 
-export type GetRunsWithTimestampsQueryVariables = Exact<{
-  filterInput: RunFilterInput;
-  runIds?: InputMaybe<Array<Scalars["Int"]["input"]> | Scalars["Int"]["input"]>;
-  runsOrdering?: InputMaybe<GetRunsOrdering>;
-}>;
-
-export type GetRunsWithTimestampsQuery = {
-  __typename?: "Query";
-  getRuns: {
-    __typename?: "GetRunsResult";
-    count?: number | null;
-    runIds: Array<number>;
-    runs: Array<{
-      __typename?: "RunGQL";
-      id: number;
-      runLength: number;
-      userId: number;
-      videoId: number;
-      shots: Array<{
-        __typename?: "ShotGQL";
-        videoId: number;
-        id: number;
-        createdAt?: any | null;
-        shotDifficulty?: {
-          __typename?: "PocketingIntentionFeaturesGQL";
-          difficulty?: number | null;
-        } | null;
-      }>;
-    }>;
-  };
-};
-
 export type GetSerializedShotPathsQueryVariables = Exact<{
   filterInput: FilterInput;
 }>;
@@ -4071,16 +4006,6 @@ export type RetireTagsMutation = {
   retireTags: boolean;
 };
 
-export type DeleteTagsMutationVariables = Exact<{
-  videoId: Scalars["Int"]["input"];
-  tagsToDelete: Array<VideoTagInput> | VideoTagInput;
-}>;
-
-export type DeleteTagsMutation = {
-  __typename?: "Mutation";
-  deleteTags: boolean;
-};
-
 export type GetProfileImageUploadLinkMutationVariables = Exact<{
   fileExt?: InputMaybe<Scalars["String"]["input"]>;
 }>;
@@ -5104,12 +5029,6 @@ export const VideoCardFieldsFragmentDoc = gql`
       user {
         id
         username
-        profileImageUri
-        followers {
-          id
-          username
-          profileImageUri
-        }
       }
       reaction
     }
@@ -6181,104 +6100,6 @@ export type GetRunsForHighlightsQueryResult = Apollo.QueryResult<
   GetRunsForHighlightsQuery,
   GetRunsForHighlightsQueryVariables
 >;
-export const GetRunsWithTimestampsDocument = gql`
-  query GetRunsWithTimestamps(
-    $filterInput: RunFilterInput!
-    $runIds: [Int!] = null
-    $runsOrdering: GetRunsOrdering
-  ) {
-    getRuns(
-      filterInput: $filterInput
-      runIds: $runIds
-      runsOrdering: $runsOrdering
-    ) {
-      count
-      runs {
-        id
-        runLength
-        userId
-        videoId
-        shots {
-          videoId
-          id
-          createdAt
-          shotDifficulty: pocketingIntentionFeatures {
-            difficulty
-          }
-        }
-      }
-      runIds
-    }
-  }
-`;
-
-/**
- * __useGetRunsWithTimestampsQuery__
- *
- * To run a query within a React component, call `useGetRunsWithTimestampsQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetRunsWithTimestampsQuery` 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 } = useGetRunsWithTimestampsQuery({
- *   variables: {
- *      filterInput: // value for 'filterInput'
- *      runIds: // value for 'runIds'
- *      runsOrdering: // value for 'runsOrdering'
- *   },
- * });
- */
-export function useGetRunsWithTimestampsQuery(
-  baseOptions: Apollo.QueryHookOptions<
-    GetRunsWithTimestampsQuery,
-    GetRunsWithTimestampsQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<
-    GetRunsWithTimestampsQuery,
-    GetRunsWithTimestampsQueryVariables
-  >(GetRunsWithTimestampsDocument, options);
-}
-export function useGetRunsWithTimestampsLazyQuery(
-  baseOptions?: Apollo.LazyQueryHookOptions<
-    GetRunsWithTimestampsQuery,
-    GetRunsWithTimestampsQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useLazyQuery<
-    GetRunsWithTimestampsQuery,
-    GetRunsWithTimestampsQueryVariables
-  >(GetRunsWithTimestampsDocument, options);
-}
-export function useGetRunsWithTimestampsSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    GetRunsWithTimestampsQuery,
-    GetRunsWithTimestampsQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useSuspenseQuery<
-    GetRunsWithTimestampsQuery,
-    GetRunsWithTimestampsQueryVariables
-  >(GetRunsWithTimestampsDocument, options);
-}
-export type GetRunsWithTimestampsQueryHookResult = ReturnType<
-  typeof useGetRunsWithTimestampsQuery
->;
-export type GetRunsWithTimestampsLazyQueryHookResult = ReturnType<
-  typeof useGetRunsWithTimestampsLazyQuery
->;
-export type GetRunsWithTimestampsSuspenseQueryHookResult = ReturnType<
-  typeof useGetRunsWithTimestampsSuspenseQuery
->;
-export type GetRunsWithTimestampsQueryResult = Apollo.QueryResult<
-  GetRunsWithTimestampsQuery,
-  GetRunsWithTimestampsQueryVariables
->;
 export const GetSerializedShotPathsDocument = gql`
   query GetSerializedShotPaths($filterInput: FilterInput!) {
     getShots(filterInput: $filterInput) {
@@ -7040,55 +6861,6 @@ export type RetireTagsMutationOptions = Apollo.BaseMutationOptions<
   RetireTagsMutation,
   RetireTagsMutationVariables
 >;
-export const DeleteTagsDocument = gql`
-  mutation DeleteTags($videoId: Int!, $tagsToDelete: [VideoTagInput!]!) {
-    deleteTags(videoId: $videoId, tagsToDelete: $tagsToDelete)
-  }
-`;
-export type DeleteTagsMutationFn = Apollo.MutationFunction<
-  DeleteTagsMutation,
-  DeleteTagsMutationVariables
->;
-
-/**
- * __useDeleteTagsMutation__
- *
- * To run a mutation, you first call `useDeleteTagsMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useDeleteTagsMutation` 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 [deleteTagsMutation, { data, loading, error }] = useDeleteTagsMutation({
- *   variables: {
- *      videoId: // value for 'videoId'
- *      tagsToDelete: // value for 'tagsToDelete'
- *   },
- * });
- */
-export function useDeleteTagsMutation(
-  baseOptions?: Apollo.MutationHookOptions<
-    DeleteTagsMutation,
-    DeleteTagsMutationVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useMutation<DeleteTagsMutation, DeleteTagsMutationVariables>(
-    DeleteTagsDocument,
-    options,
-  );
-}
-export type DeleteTagsMutationHookResult = ReturnType<
-  typeof useDeleteTagsMutation
->;
-export type DeleteTagsMutationResult =
-  Apollo.MutationResult<DeleteTagsMutation>;
-export type DeleteTagsMutationOptions = Apollo.BaseMutationOptions<
-  DeleteTagsMutation,
-  DeleteTagsMutationVariables
->;
 export const GetProfileImageUploadLinkDocument = gql`
   mutation getProfileImageUploadLink($fileExt: String = ".png") {
     getProfileImageUploadLink(fileExt: $fileExt) {

src/operations/feed.gql

@@ -63,12 +63,6 @@ fragment VideoCardFields on VideoGQL {
     user {
       id
       username
-      profileImageUri
-      followers {
-        id
-        username
-        profileImageUri
-      }
     }
     reaction
   }

src/operations/runs.gql

@@ -22,32 +22,3 @@ query GetRunsForHighlights(
     runIds
   }
 }
-
-query GetRunsWithTimestamps(
-  $filterInput: RunFilterInput!
-  $runIds: [Int!] = null
-  $runsOrdering: GetRunsOrdering
-) {
-  getRuns(
-    filterInput: $filterInput
-    runIds: $runIds
-    runsOrdering: $runsOrdering
-  ) {
-    count
-    runs {
-      id
-      runLength
-      userId
-      videoId
-      shots {
-        videoId
-        id
-        createdAt
-        shotDifficulty: pocketingIntentionFeatures {
-          difficulty
-        }
-      }
-    }
-    runIds
-  }
-}

src/operations/tags.gql

@@ -1,7 +1,3 @@
 mutation RetireTags($tagIds: [Int!]!) {
   retireTags(tagIds: $tagIds)
 }
-
-mutation DeleteTags($videoId: Int!, $tagsToDelete: [VideoTagInput!]!) {
-  deleteTags(videoId: $videoId, tagsToDelete: $tagsToDelete)
-}