resolve merge conflicts

src/index.tsx

@@ -122,16 +122,6 @@ export enum ClientUploadStatusEnum {
   UploadEnabled = "UPLOAD_ENABLED",
 }
 
-export type CommentGql = {
-  __typename?: "CommentGQL";
-  createdAt?: Maybe<Scalars["DateTime"]["output"]>;
-  id: Scalars["Int"]["output"];
-  message: Scalars["String"]["output"];
-  replies: Array<CommentGql>;
-  updatedAt?: Maybe<Scalars["DateTime"]["output"]>;
-  user: UserGql;
-};
-
 export type CountLeaderboardGql = {
   __typename?: "CountLeaderboardGQL";
   entries: Array<UserShotCountEntry>;
@@ -2236,13 +2226,10 @@ export type MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailed
 export type Mutation = {
   __typename?: "Mutation";
   addAnnotationToShot: AddShotAnnotationReturn;
-  commentOnVideo: Scalars["Boolean"]["output"];
   createBucketSet: BucketSetGql;
   createUploadStream: CreateUploadStreamReturn;
-  deleteComment: Scalars["Boolean"]["output"];
   deleteTags: Scalars["Boolean"]["output"];
   deleteVideo: Scalars["Boolean"]["output"];
-  editComment: Scalars["Boolean"]["output"];
   editProfileImageUri: UserGql;
   editShot: EditShotReturn;
   editUploadStream: Scalars["Boolean"]["output"];
@@ -2266,12 +2253,6 @@ export type MutationAddAnnotationToShotArgs = {
   shotId: Scalars["Int"]["input"];
 };
 
-export type MutationCommentOnVideoArgs = {
-  message: Scalars["String"]["input"];
-  parentCommentId?: InputMaybe<Scalars["Int"]["input"]>;
-  videoId: Scalars["Int"]["input"];
-};
-
 export type MutationCreateBucketSetArgs = {
   params: CreateBucketSetInput;
 };
@@ -2280,11 +2261,6 @@ export type MutationCreateUploadStreamArgs = {
   videoMetadata: VideoMetadataInput;
 };
 
-export type MutationDeleteCommentArgs = {
-  commentId: Scalars["Int"]["input"];
-  videoId: Scalars["Int"]["input"];
-};
-
 export type MutationDeleteTagsArgs = {
   tagsToDelete: Array<VideoTagInput>;
   videoId: Scalars["Int"]["input"];
@@ -2294,12 +2270,6 @@ export type MutationDeleteVideoArgs = {
   videoId: Scalars["Int"]["input"];
 };
 
-export type MutationEditCommentArgs = {
-  commentId: Scalars["Int"]["input"];
-  newMessage: Scalars["String"]["input"];
-  videoId: Scalars["Int"]["input"];
-};
-
 export type MutationEditProfileImageUriArgs = {
   profileImageUri: Scalars["String"]["input"];
 };
@@ -3038,7 +3008,6 @@ export type VideoGql = {
   __typename?: "VideoGQL";
   averageDifficulty?: Maybe<Scalars["Float"]["output"]>;
   averageTimeBetweenShots?: Maybe<Scalars["Float"]["output"]>;
-  comments: Array<CommentGql>;
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
   currentHomography?: Maybe<HomographyInfoGql>;
   currentProcessing?: Maybe<VideoProcessingGql>;
@@ -3245,12 +3214,7 @@ export type GetFeedQuery = {
         __typename?: "ReactionGQL";
         videoId: number;
         reaction: ReactionEnum;
-        user: {
+        user: { __typename?: "UserGQL"; id: number; username: string };
-          __typename?: "UserGQL";
-          id: number;
-          username: string;
-          profileImageUri?: string | null;
-        };
       }>;
     }>;
     pageInfo: {
@@ -3309,12 +3273,7 @@ export type VideoCardFieldsFragment = {
     __typename?: "ReactionGQL";
     videoId: number;
     reaction: ReactionEnum;
-    user: {
+    user: { __typename?: "UserGQL"; id: number; username: string };
-      __typename?: "UserGQL";
-      id: number;
-      username: string;
-      profileImageUri?: string | null;
-    };
   }>;
 };
 
@@ -3382,12 +3341,7 @@ export type GetVideoFeedQuery = {
         __typename?: "ReactionGQL";
         videoId: number;
         reaction: ReactionEnum;
-        user: {
+        user: { __typename?: "UserGQL"; id: number; username: string };
-          __typename?: "UserGQL";
-          id: number;
-          username: string;
-          profileImageUri?: string | null;
-        };
       }>;
     }>;
     pageInfo: {
@@ -4052,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"]>;
 }>;
@@ -5085,7 +5029,6 @@ export const VideoCardFieldsFragmentDoc = gql`
       user {
         id
         username
-        profileImageUri
       }
       reaction
     }
@@ -6918,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,7 +63,6 @@ fragment VideoCardFields on VideoGQL {
     user {
       id
       username
-      profileImageUri
     }
     reaction
   }

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)
-}

src/schema.gql

@@ -480,7 +480,6 @@ type VideoGQL {
   homographyHistory: [HomographyInfoGQL!]!
   currentProcessing: VideoProcessingGQL
   reactions: [ReactionGQL!]!
-  comments: [CommentGQL!]!
 }
 
 type UploadStreamGQL {
@@ -622,15 +621,6 @@ type ReactionGQL {
   updatedAt: DateTime
 }
 
-type CommentGQL {
-  id: Int!
-  user: UserGQL!
-  message: String!
-  replies: [CommentGQL!]!
-  createdAt: DateTime
-  updatedAt: DateTime
-}
-
 enum ReactionEnum {
   LIKE
   HEART
@@ -828,13 +818,6 @@ type Mutation {
   deleteVideo(videoId: Int!): Boolean!
   deleteTags(videoId: Int!, tagsToDelete: [VideoTagInput!]!): Boolean!
   reactToVideo(videoId: Int!, reaction: ReactionEnum): Boolean!
-  commentOnVideo(
-    videoId: Int!
-    message: String!
-    parentCommentId: Int
-  ): Boolean!
-  editComment(videoId: Int!, commentId: Int!, newMessage: String!): Boolean!
-  deleteComment(videoId: Int!, commentId: Int!): Boolean!
 }
 
 input CreateBucketSetInput {