Follow, unfollow mutation

Reviewed-on: #94

src/index.tsx

@@ -2166,10 +2166,10 @@ export type Query = {
   getShotsByIds: Array<ShotGql>;
   getShotsWithMetadata: GetShotsResult;
   getUser?: Maybe<UserGql>;
+  getUserRelationshipsMatching: UserRelationshipsResult;
   getUserTags: Array<TagGql>;
   getUserVideos: VideoHistoryGql;
   getUsernames: Array<Scalars["String"]["output"]>;
-  getUsernamesAndFollowing: UsernamesAndFollowingResponse;
   getVideo: VideoGql;
   getVideoMakePercentageIntervals: Array<MakePercentageIntervalGql>;
   getVideos: Array<VideoGql>;
@@ -2226,6 +2226,13 @@ export type QueryGetUserArgs = {
   userId: Scalars["Int"]["input"];
 };
 
+export type QueryGetUserRelationshipsMatchingArgs = {
+  after?: InputMaybe<Scalars["String"]["input"]>;
+  limit?: InputMaybe<Scalars["Int"]["input"]>;
+  matchString?: InputMaybe<Scalars["String"]["input"]>;
+  userId: Scalars["Int"]["input"];
+};
+
 export type QueryGetUserVideosArgs = {
   after?: InputMaybe<Scalars["String"]["input"]>;
   filters?: InputMaybe<VideoFilterInput>;
@@ -2239,13 +2246,6 @@ export type QueryGetUsernamesArgs = {
   matchString?: InputMaybe<Scalars["String"]["input"]>;
 };
 
-export type QueryGetUsernamesAndFollowingArgs = {
-  after?: InputMaybe<Scalars["String"]["input"]>;
-  limit?: InputMaybe<Scalars["Int"]["input"]>;
-  matchString?: InputMaybe<Scalars["String"]["input"]>;
-  userId: Scalars["Int"]["input"];
-};
-
 export type QueryGetVideoArgs = {
   debuggingJson?: InputMaybe<Scalars["JSON"]["input"]>;
   videoId: Scalars["Int"]["input"];
@@ -2412,15 +2412,6 @@ export type SuccessfulAddAddShotAnnotationErrors =
   | AddShotAnnotationErrors
   | SuccessfulAdd;
 
-export type SuccessfulUpdate = {
-  __typename?: "SuccessfulUpdate";
-  value: Scalars["Boolean"]["output"];
-};
-
-export type SuccessfulUpdateUpdateShotAnnotationErrors =
-  | SuccessfulUpdate
-  | UpdateShotAnnotationErrors;
-
 export type TagGql = {
   __typename?: "TagGQL";
   group?: Maybe<Scalars["String"]["output"]>;
@@ -2463,14 +2454,10 @@ export type UpdateAnnotationInputGql = {
   notes?: InputMaybe<Scalars["String"]["input"]>;
 };
 
-export type UpdateShotAnnotationErrors = {
-  __typename?: "UpdateShotAnnotationErrors";
-  error?: Maybe<DoesNotOwnShotErr>;
-};
-
 export type UpdateShotAnnotationReturn = {
   __typename?: "UpdateShotAnnotationReturn";
-  value: SuccessfulUpdateUpdateShotAnnotationErrors;
+  error?: Maybe<DoesNotOwnShotErr>;
+  shot?: Maybe<ShotGql>;
 };
 
 export type UploadLink = {
@@ -2521,11 +2508,11 @@ export type UserGql = {
   activeVideoId?: Maybe<Scalars["Int"]["output"]>;
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
   fargoRating?: Maybe<Scalars["Int"]["output"]>;
-  firebaseUid: Scalars["String"]["output"];
+  firebaseUid?: Maybe<Scalars["String"]["output"]>;
-  followers?: Maybe<Array<Scalars["Int"]["output"]>>;
+  followers?: Maybe<Array<UserGql>>;
-  following?: Maybe<Array<Scalars["Int"]["output"]>>;
+  following?: Maybe<Array<UserGql>>;
   id: Scalars["Int"]["output"];
-  isAdmin: Scalars["Boolean"]["output"];
+  isAdmin?: Maybe<Scalars["Boolean"]["output"]>;
   profileImageUri?: Maybe<Scalars["String"]["output"]>;
   updatedAt?: Maybe<Scalars["DateTime"]["output"]>;
   username: Scalars["String"]["output"];
@@ -2536,11 +2523,17 @@ export type UserPlayTimeGql = {
   totalSeconds: Scalars["Float"]["output"];
 };
 
-export type UsernamesAndFollowingResponse = {
+export type UserRelationship = {
-  __typename?: "UsernamesAndFollowingResponse";
+  __typename?: "UserRelationship";
-  followers: Array<Scalars["Int"]["output"]>;
+  toUser: UserGql;
-  following: Array<Scalars["Int"]["output"]>;
+  toUserFollows: Scalars["Boolean"]["output"];
-  usernames: Array<Scalars["String"]["output"]>;
+  toUserIsFollowedBy: Scalars["Boolean"]["output"];
+};
+
+export type UserRelationshipsResult = {
+  __typename?: "UserRelationshipsResult";
+  inquiringUser: UserGql;
+  relationships: Array<UserRelationship>;
 };
 
 export type VideoFilterInput = {
@@ -2713,7 +2706,11 @@ export type GetFeedQuery = {
       elapsedTime?: number | null;
       tableSize: number;
       owner?: { __typename?: "UserGQL"; username: string } | null;
-      stream?: { __typename?: "UploadStreamGQL"; isCompleted: boolean } | null;
+      stream?: {
+        __typename?: "UploadStreamGQL";
+        id: string;
+        isCompleted: boolean;
+      } | null;
       tags: Array<{
         __typename?: "VideoTag";
         name: string;
@@ -2783,10 +2780,20 @@ export type UpdateShotAnnotationsMutation = {
   __typename?: "Mutation";
   updateShotAnnotations: {
     __typename?: "UpdateShotAnnotationReturn";
-    value:
+    shot?: {
-      | { __typename?: "SuccessfulUpdate"; value: boolean }
+      __typename?: "ShotGQL";
-      | {
+      id: number;
-          __typename?: "UpdateShotAnnotationErrors";
+      annotations: Array<{
+        __typename?: "ShotAnnotationGQL";
+        shotId: number;
+        notes: string;
+        type: {
+          __typename?: "ShotAnnotationTypeGQL";
+          id: number;
+          name: string;
+        };
+      }>;
+    } | null;
     error?: {
       __typename?: "DoesNotOwnShotErr";
       shotId: number;
@@ -2794,7 +2801,6 @@ export type UpdateShotAnnotationsMutation = {
     } | null;
   };
 };
-};
 
 export type GetShotsWithVideoGqlQueryVariables = Exact<{
   filterInput: FilterInput;
@@ -3089,7 +3095,7 @@ export type EditProfileImageUriMutation = {
   editProfileImageUri: {
     __typename?: "UserGQL";
     id: number;
-    firebaseUid: string;
+    firebaseUid?: string | null;
     username: string;
     profileImageUri?: string | null;
     createdAt?: any | null;
@@ -3104,9 +3110,9 @@ export type GetLoggedInUserQuery = {
   getLoggedInUser?: {
     __typename?: "UserGQL";
     id: number;
-    firebaseUid: string;
+    firebaseUid?: string | null;
     username: string;
-    isAdmin: boolean;
+    isAdmin?: boolean | null;
     profileImageUri?: string | null;
     activeVideoId?: number | null;
     createdAt?: any | null;
@@ -3134,6 +3140,26 @@ export type GetUsernamesQuery = {
   getUsernames: Array<string>;
 };
 
+export type GetUserRelationshipsMatchingQueryVariables = Exact<{
+  userId: Scalars["Int"]["input"];
+  matchString: Scalars["String"]["input"];
+  limit?: InputMaybe<Scalars["Int"]["input"]>;
+  after?: InputMaybe<Scalars["String"]["input"]>;
+}>;
+
+export type GetUserRelationshipsMatchingQuery = {
+  __typename?: "Query";
+  getUserRelationshipsMatching: {
+    __typename?: "UserRelationshipsResult";
+    relationships: Array<{
+      __typename?: "UserRelationship";
+      toUserFollows: boolean;
+      toUserIsFollowedBy: boolean;
+      toUser: { __typename?: "UserGQL"; username: string; id: number };
+    }>;
+  };
+};
+
 export type GetUserTagsQueryVariables = Exact<{ [key: string]: never }>;
 
 export type GetUserTagsQuery = {
@@ -3141,6 +3167,30 @@ export type GetUserTagsQuery = {
   getUserTags: Array<{ __typename?: "TagGQL"; id: number; name: string }>;
 };
 
+export type FollowUserMutationVariables = Exact<{
+  followedUserId: Scalars["Int"]["input"];
+}>;
+
+export type FollowUserMutation = {
+  __typename?: "Mutation";
+  followUser: {
+    __typename?: "UserGQL";
+    followers?: Array<{ __typename?: "UserGQL"; username: string }> | null;
+  };
+};
+
+export type UnfollowUserMutationVariables = Exact<{
+  followedUserId: Scalars["Int"]["input"];
+}>;
+
+export type UnfollowUserMutation = {
+  __typename?: "Mutation";
+  unfollowUser: {
+    __typename?: "UserGQL";
+    followers?: Array<{ __typename?: "UserGQL"; username: string }> | null;
+  };
+};
+
 export type GetStreamMonitoringDetailsQueryVariables = Exact<{
   videoId: Scalars["Int"]["input"];
   debuggingJson?: InputMaybe<Scalars["JSON"]["input"]>;
@@ -3182,6 +3232,7 @@ export type GetStreamMonitoringDetailsQuery = {
     } | null;
     stream?: {
       __typename?: "UploadStreamGQL";
+      id: string;
       linksRequested: number;
       uploadsCompleted: number;
       segmentProcessingCursor: number;
@@ -3258,7 +3309,7 @@ export type GetVideoDetailsQuery = {
     owner?: {
       __typename?: "UserGQL";
       id: number;
-      firebaseUid: string;
+      firebaseUid?: string | null;
       username: string;
       profileImageUri?: string | null;
     } | null;
@@ -3395,6 +3446,7 @@ export type GetVideoQuery = {
     }>;
     stream?: {
       __typename?: "UploadStreamGQL";
+      id: string;
       streamSegmentType: StreamSegmentTypeEnum;
       segments: Array<{
         __typename?: "UploadSegmentGQL";
@@ -4038,6 +4090,7 @@ export const GetFeedDocument = gql`
         elapsedTime
         screenshotUri
         stream {
+          id
           isCompleted
         }
         tableSize
@@ -4355,19 +4408,23 @@ export const UpdateShotAnnotationsDocument = gql`
     $annotations: [UpdateAnnotationInputGQL!]!
   ) {
     updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
-      value {
+      shot {
-        ... on SuccessfulUpdate {
+        id
-          value
+        annotations {
+          shotId
+          type {
+            id
+            name
+          }
+          notes
+        }
       }
-        ... on UpdateShotAnnotationErrors {
       error {
         shotId
         msg
       }
     }
   }
-    }
-  }
 `;
 export type UpdateShotAnnotationsMutationFn = Apollo.MutationFunction<
   UpdateShotAnnotationsMutation,
@@ -5100,6 +5157,99 @@ export type GetUsernamesQueryResult = Apollo.QueryResult<
   GetUsernamesQuery,
   GetUsernamesQueryVariables
 >;
+export const GetUserRelationshipsMatchingDocument = gql`
+  query getUserRelationshipsMatching(
+    $userId: Int!
+    $matchString: String!
+    $limit: Int = null
+    $after: String = null
+  ) {
+    getUserRelationshipsMatching(
+      userId: $userId
+      matchString: $matchString
+      limit: $limit
+      after: $after
+    ) {
+      relationships {
+        toUser {
+          username
+          id
+        }
+        toUserFollows
+        toUserIsFollowedBy
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetUserRelationshipsMatchingQuery__
+ *
+ * To run a query within a React component, call `useGetUserRelationshipsMatchingQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetUserRelationshipsMatchingQuery` 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 } = useGetUserRelationshipsMatchingQuery({
+ *   variables: {
+ *      userId: // value for 'userId'
+ *      matchString: // value for 'matchString'
+ *      limit: // value for 'limit'
+ *      after: // value for 'after'
+ *   },
+ * });
+ */
+export function useGetUserRelationshipsMatchingQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    GetUserRelationshipsMatchingQuery,
+    GetUserRelationshipsMatchingQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetUserRelationshipsMatchingQuery,
+    GetUserRelationshipsMatchingQueryVariables
+  >(GetUserRelationshipsMatchingDocument, options);
+}
+export function useGetUserRelationshipsMatchingLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetUserRelationshipsMatchingQuery,
+    GetUserRelationshipsMatchingQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetUserRelationshipsMatchingQuery,
+    GetUserRelationshipsMatchingQueryVariables
+  >(GetUserRelationshipsMatchingDocument, options);
+}
+export function useGetUserRelationshipsMatchingSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetUserRelationshipsMatchingQuery,
+    GetUserRelationshipsMatchingQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetUserRelationshipsMatchingQuery,
+    GetUserRelationshipsMatchingQueryVariables
+  >(GetUserRelationshipsMatchingDocument, options);
+}
+export type GetUserRelationshipsMatchingQueryHookResult = ReturnType<
+  typeof useGetUserRelationshipsMatchingQuery
+>;
+export type GetUserRelationshipsMatchingLazyQueryHookResult = ReturnType<
+  typeof useGetUserRelationshipsMatchingLazyQuery
+>;
+export type GetUserRelationshipsMatchingSuspenseQueryHookResult = ReturnType<
+  typeof useGetUserRelationshipsMatchingSuspenseQuery
+>;
+export type GetUserRelationshipsMatchingQueryResult = Apollo.QueryResult<
+  GetUserRelationshipsMatchingQuery,
+  GetUserRelationshipsMatchingQueryVariables
+>;
 export const GetUserTagsDocument = gql`
   query GetUserTags {
     getUserTags {
@@ -5171,6 +5321,110 @@ export type GetUserTagsQueryResult = Apollo.QueryResult<
   GetUserTagsQuery,
   GetUserTagsQueryVariables
 >;
+export const FollowUserDocument = gql`
+  mutation followUser($followedUserId: Int!) {
+    followUser(followedUserId: $followedUserId) {
+      followers {
+        username
+      }
+    }
+  }
+`;
+export type FollowUserMutationFn = Apollo.MutationFunction<
+  FollowUserMutation,
+  FollowUserMutationVariables
+>;
+
+/**
+ * __useFollowUserMutation__
+ *
+ * To run a mutation, you first call `useFollowUserMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useFollowUserMutation` 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 [followUserMutation, { data, loading, error }] = useFollowUserMutation({
+ *   variables: {
+ *      followedUserId: // value for 'followedUserId'
+ *   },
+ * });
+ */
+export function useFollowUserMutation(
+  baseOptions?: Apollo.MutationHookOptions<
+    FollowUserMutation,
+    FollowUserMutationVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useMutation<FollowUserMutation, FollowUserMutationVariables>(
+    FollowUserDocument,
+    options,
+  );
+}
+export type FollowUserMutationHookResult = ReturnType<
+  typeof useFollowUserMutation
+>;
+export type FollowUserMutationResult =
+  Apollo.MutationResult<FollowUserMutation>;
+export type FollowUserMutationOptions = Apollo.BaseMutationOptions<
+  FollowUserMutation,
+  FollowUserMutationVariables
+>;
+export const UnfollowUserDocument = gql`
+  mutation unfollowUser($followedUserId: Int!) {
+    unfollowUser(followedUserId: $followedUserId) {
+      followers {
+        username
+      }
+    }
+  }
+`;
+export type UnfollowUserMutationFn = Apollo.MutationFunction<
+  UnfollowUserMutation,
+  UnfollowUserMutationVariables
+>;
+
+/**
+ * __useUnfollowUserMutation__
+ *
+ * To run a mutation, you first call `useUnfollowUserMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useUnfollowUserMutation` 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 [unfollowUserMutation, { data, loading, error }] = useUnfollowUserMutation({
+ *   variables: {
+ *      followedUserId: // value for 'followedUserId'
+ *   },
+ * });
+ */
+export function useUnfollowUserMutation(
+  baseOptions?: Apollo.MutationHookOptions<
+    UnfollowUserMutation,
+    UnfollowUserMutationVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useMutation<
+    UnfollowUserMutation,
+    UnfollowUserMutationVariables
+  >(UnfollowUserDocument, options);
+}
+export type UnfollowUserMutationHookResult = ReturnType<
+  typeof useUnfollowUserMutation
+>;
+export type UnfollowUserMutationResult =
+  Apollo.MutationResult<UnfollowUserMutation>;
+export type UnfollowUserMutationOptions = Apollo.BaseMutationOptions<
+  UnfollowUserMutation,
+  UnfollowUserMutationVariables
+>;
 export const GetStreamMonitoringDetailsDocument = gql`
   query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     getVideo(videoId: $videoId, debuggingJson: $debuggingJson) {
@@ -5219,6 +5473,7 @@ export const GetStreamMonitoringDetailsDocument = gql`
         }
       }
       stream {
+        id
         linksRequested
         uploadsCompleted
         segmentProcessingCursor
@@ -5726,6 +5981,7 @@ export const GetVideoDocument = gql`
         }
       }
       stream {
+        id
         streamSegmentType
         segments {
           segmentIndex

src/operations/feed.gql

@@ -21,6 +21,7 @@ query GetFeed(
       elapsedTime
       screenshotUri
       stream {
+        id
         isCompleted
       }
       tableSize

src/operations/shots.gql

@@ -22,19 +22,23 @@ mutation UpdateShotAnnotations(
   $annotations: [UpdateAnnotationInputGQL!]!
 ) {
   updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
-    value {
+    shot {
-      ... on SuccessfulUpdate {
+      id
-        value
+      annotations {
+        shotId
+        type {
+          id
+          name
+        }
+        notes
+      }
     }
-      ... on UpdateShotAnnotationErrors {
     error {
       shotId
       msg
     }
   }
 }
-  }
-}
 
 query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
   getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {

src/operations/user.gql

@@ -57,9 +57,48 @@ query getUsernames(
   getUsernames(matchString: $matchString, limit: $limit, after: $after)
 }
 
+query getUserRelationshipsMatching(
+  $userId: Int!
+  $matchString: String!
+  $limit: Int = null
+  $after: String = null
+) {
+  getUserRelationshipsMatching(
+    userId: $userId
+    matchString: $matchString
+    limit: $limit
+    after: $after
+  ) {
+    relationships {
+      toUser {
+        username
+        id
+      }
+      toUserFollows
+      toUserIsFollowedBy
+    }
+  }
+}
+
 query GetUserTags {
   getUserTags {
     id
     name
   }
 }
+
+mutation followUser($followedUserId: Int!) {
+  followUser(followedUserId: $followedUserId) {
+    followers {
+      username
+    }
+  }
+}
+
+mutation unfollowUser($followedUserId: Int!) {
+  unfollowUser(followedUserId: $followedUserId) {
+    followers {
+      username
+    }
+  }
+}

src/operations/video.gql

@@ -45,6 +45,7 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
       }
     }
     stream {
+      id
       linksRequested
       uploadsCompleted
       segmentProcessingCursor
@@ -194,6 +195,7 @@ query GetVideo($videoId: Int!) {
       }
     }
     stream {
+      id
       streamSegmentType
       segments {
         segmentIndex

src/schema.gql

@@ -35,12 +35,12 @@ type Query {
     limit: Int = null
     after: String = null
   ): [String!]!
-  getUsernamesAndFollowing(
+  getUserRelationshipsMatching(
     userId: Int!
     matchString: String = null
     limit: Int = 100
     after: String = null
-  ): UsernamesAndFollowingResponse!
+  ): UserRelationshipsResult!
   getPlayTime(userId: Int!): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
@@ -341,16 +341,16 @@ type SerializedShotPathsGQL {
 
 type UserGQL {
   id: Int!
-  firebaseUid: String!
+  firebaseUid: String
   username: String!
-  isAdmin: Boolean!
+  isAdmin: Boolean
   fargoRating: Int
   activeVideoId: Int
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
-  following: [Int!]
+  following: [UserGQL!]
-  followers: [Int!]
+  followers: [UserGQL!]
 }
 
 type ShotAnnotationGQL {
@@ -554,10 +554,15 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
-type UsernamesAndFollowingResponse {
+type UserRelationshipsResult {
-  usernames: [String!]!
+  inquiringUser: UserGQL!
-  following: [Int!]!
+  relationships: [UserRelationship!]!
-  followers: [Int!]!
+}
+
+type UserRelationship {
+  toUser: UserGQL!
+  toUserFollows: Boolean!
+  toUserIsFollowedBy: Boolean!
 }
 
 type UserPlayTimeGQL {
@@ -662,18 +667,7 @@ type OtherErrorNeedsNote {
 }
 
 type UpdateShotAnnotationReturn {
-  value: SuccessfulUpdateUpdateShotAnnotationErrors!
+  shot: ShotGQL
-}
-
-union SuccessfulUpdateUpdateShotAnnotationErrors =
-    SuccessfulUpdate
-  | UpdateShotAnnotationErrors
-
-type SuccessfulUpdate {
-  value: Boolean!
-}
-
-type UpdateShotAnnotationErrors {
   error: DoesNotOwnShotErr
 }