Merge pull request 'Use logged in user for followers' (#106) from kat/use-logged-in-user into master

Reviewed-on: #106

pyproject.toml

@@ -7,7 +7,7 @@ readme = "README.md"
 packages = [{include = "rbproto"}]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.12"
+python = ">=3.10,<=3.13"
 protobuf = "^4.25.3"
 
 

src/index.tsx

@@ -1974,6 +1974,15 @@ export type MakePercentageIntervalGql = {
   makePercentage: Scalars["Float"]["output"];
 };
 
+export type MedalGql = {
+  __typename?: "MedalGQL";
+  count: Scalars["Int"]["output"];
+};
+
+export type MedalScope =
+  | { interval: TimeInterval; videoId?: never }
+  | { interval?: never; videoId: Scalars["Int"]["input"] };
+
 export type MustHaveSetForUploadLinkErr = {
   __typename?: "MustHaveSetForUploadLinkErr";
   framesPerSecond?: Maybe<Scalars["Boolean"]["output"]>;
@@ -2154,11 +2163,13 @@ export enum ProcessingStatusEnum {
 
 export type Query = {
   __typename?: "Query";
+  doesUsernameExist: Scalars["Boolean"]["output"];
   getAggregatedShotMetrics: Array<AggregateResultGql>;
   getBucketSet?: Maybe<BucketSetGql>;
   getDeployedConfig: DeployedConfigGql;
   getFeedVideos: VideoHistoryGql;
   getLoggedInUser?: Maybe<UserGql>;
+  getMedals: RequestedMedalsGql;
   getOrderedShots: GetShotsResult;
   getPlayTime: UserPlayTimeGql;
   getShotAnnotationTypes: Array<ShotAnnotationTypeGql>;
@@ -2166,16 +2177,20 @@ 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>;
   waitFor: Scalars["Float"]["output"];
 };
 
+export type QueryDoesUsernameExistArgs = {
+  candidateUsername: Scalars["String"]["input"];
+};
+
 export type QueryGetAggregatedShotMetricsArgs = {
   aggregateInput: AggregateInputGql;
 };
@@ -2190,6 +2205,11 @@ export type QueryGetFeedVideosArgs = {
   limit?: Scalars["Int"]["input"];
 };
 
+export type QueryGetMedalsArgs = {
+  scope: MedalScope;
+  userId?: InputMaybe<Scalars["Int"]["input"]>;
+};
+
 export type QueryGetOrderedShotsArgs = {
   filterInput: FilterInput;
   ids?: InputMaybe<Array<Scalars["Int"]["input"]>>;
@@ -2226,6 +2246,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 +2266,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"];
@@ -2264,6 +2284,44 @@ export type QueryWaitForArgs = {
   duration: Scalars["Float"]["input"];
 };
 
+export type RequestedMedalsGql = {
+  __typename?: "RequestedMedalsGQL";
+  dayStreak2?: Maybe<MedalGql>;
+  dayStreak3?: Maybe<MedalGql>;
+  dayStreak4?: Maybe<MedalGql>;
+  dayStreak5?: Maybe<MedalGql>;
+  dayStreak6?: Maybe<MedalGql>;
+  dayStreak7?: Maybe<MedalGql>;
+  dayStreak14?: Maybe<MedalGql>;
+  dayStreak21?: Maybe<MedalGql>;
+  dayStreak30?: Maybe<MedalGql>;
+  dayStreak60?: Maybe<MedalGql>;
+  dayStreak90?: Maybe<MedalGql>;
+  distanceOver66?: Maybe<MedalGql>;
+  distanceOver78?: Maybe<MedalGql>;
+  distanceOver90?: Maybe<MedalGql>;
+  runLength3?: Maybe<MedalGql>;
+  runLength5?: Maybe<MedalGql>;
+  runLength8?: Maybe<MedalGql>;
+  runLength10?: Maybe<MedalGql>;
+  runLength15?: Maybe<MedalGql>;
+  runLength20?: Maybe<MedalGql>;
+  runLength25?: Maybe<MedalGql>;
+  runLength30?: Maybe<MedalGql>;
+  runLength40?: Maybe<MedalGql>;
+  runLength50?: Maybe<MedalGql>;
+  totalMakes25?: Maybe<MedalGql>;
+  totalMakes50?: Maybe<MedalGql>;
+  totalMakes75?: Maybe<MedalGql>;
+  totalMakes100?: Maybe<MedalGql>;
+  totalMakes200?: Maybe<MedalGql>;
+  totalMakes300?: Maybe<MedalGql>;
+  totalMakes400?: Maybe<MedalGql>;
+  totalMakes500?: Maybe<MedalGql>;
+  totalMakes750?: Maybe<MedalGql>;
+  totalMakes1000?: Maybe<MedalGql>;
+};
+
 export type SegmentAlreadyUploadedErr = {
   __typename?: "SegmentAlreadyUploadedErr";
   segmentId: Scalars["Int"]["output"];
@@ -2412,15 +2470,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 +2512,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 +2566,11 @@ export type UserGql = {
   activeVideoId?: Maybe<Scalars["Int"]["output"]>;
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
   fargoRating?: Maybe<Scalars["Int"]["output"]>;
-  firebaseUid: Scalars["String"]["output"];
-  followers?: Maybe<Array<Scalars["Int"]["output"]>>;
-  following?: Maybe<Array<Scalars["Int"]["output"]>>;
+  firebaseUid?: Maybe<Scalars["String"]["output"]>;
+  followers?: Maybe<Array<UserGql>>;
+  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 +2581,17 @@ export type UserPlayTimeGql = {
   totalSeconds: Scalars["Float"]["output"];
 };
 
-export type UsernamesAndFollowingResponse = {
-  __typename?: "UsernamesAndFollowingResponse";
-  followers: Array<Scalars["Int"]["output"]>;
-  following: Array<Scalars["Int"]["output"]>;
-  usernames: Array<Scalars["String"]["output"]>;
+export type UserRelationship = {
+  __typename?: "UserRelationship";
+  toUser: UserGql;
+  toUserFollows: Scalars["Boolean"]["output"];
+  toUserIsFollowedBy: Scalars["Boolean"]["output"];
+};
+
+export type UserRelationshipsResult = {
+  __typename?: "UserRelationshipsResult";
+  inquiringUser: UserGql;
+  relationships: Array<UserRelationship>;
 };
 
 export type VideoFilterInput = {
@@ -2713,7 +2764,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,29 +2838,38 @@ export type UpdateShotAnnotationsMutation = {
   __typename?: "Mutation";
   updateShotAnnotations: {
     __typename?: "UpdateShotAnnotationReturn";
-    value:
-      | { __typename?: "SuccessfulUpdate"; value: boolean }
-      | {
-          __typename?: "UpdateShotAnnotationErrors";
-          error?: {
-            __typename?: "DoesNotOwnShotErr";
-            shotId: number;
-            msg?: string | null;
-          } | null;
+    shot?: {
+      __typename?: "ShotGQL";
+      id: number;
+      annotations: Array<{
+        __typename?: "ShotAnnotationGQL";
+        shotId: number;
+        notes: string;
+        type: {
+          __typename?: "ShotAnnotationTypeGQL";
+          id: number;
+          name: string;
         };
+      }>;
+    } | null;
+    error?: {
+      __typename?: "DoesNotOwnShotErr";
+      shotId: number;
+      msg?: string | null;
+    } | null;
   };
 };
 
 export type GetShotsWithVideoGqlQueryVariables = Exact<{
   filterInput: FilterInput;
+  shotsOrdering?: InputMaybe<GetShotsOrdering>;
   limit?: InputMaybe<Scalars["Int"]["input"]>;
 }>;
 
 export type GetShotsWithVideoGqlQuery = {
   __typename?: "Query";
-  getShotsWithMetadata: {
+  getOrderedShots: {
     __typename?: "GetShotsResult";
-    ids: Array<number>;
     shots: Array<{
       __typename?: "ShotGQL";
       id: number;
@@ -3089,7 +3153,7 @@ export type EditProfileImageUriMutation = {
   editProfileImageUri: {
     __typename?: "UserGQL";
     id: number;
-    firebaseUid: string;
+    firebaseUid?: string | null;
     username: string;
     profileImageUri?: string | null;
     createdAt?: any | null;
@@ -3104,10 +3168,11 @@ export type GetLoggedInUserQuery = {
   getLoggedInUser?: {
     __typename?: "UserGQL";
     id: number;
-    firebaseUid: string;
+    firebaseUid?: string | null;
     username: string;
-    isAdmin: boolean;
+    isAdmin?: boolean | null;
     profileImageUri?: string | null;
+    fargoRating?: number | null;
     activeVideoId?: number | null;
     createdAt?: any | null;
     updatedAt?: any | null;
@@ -3134,6 +3199,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 +3226,55 @@ 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";
+    username: string;
+    following?: Array<{ __typename?: "UserGQL"; id: number }> | null;
+    followers?: Array<{ __typename?: "UserGQL"; id: number }> | null;
+  };
+};
+
+export type UnfollowUserMutationVariables = Exact<{
+  followedUserId: Scalars["Int"]["input"];
+}>;
+
+export type UnfollowUserMutation = {
+  __typename?: "Mutation";
+  unfollowUser: {
+    __typename?: "UserGQL";
+    username: string;
+    following?: Array<{ __typename?: "UserGQL"; id: number }> | null;
+    followers?: Array<{ __typename?: "UserGQL"; id: number }> | null;
+  };
+};
+
+export type GetUserFollowingFollowersQueryVariables = Exact<{
+  [key: string]: never;
+}>;
+
+export type GetUserFollowingFollowersQuery = {
+  __typename?: "Query";
+  getLoggedInUser?: {
+    __typename?: "UserGQL";
+    following?: Array<{
+      __typename?: "UserGQL";
+      id: number;
+      username: string;
+    }> | null;
+    followers?: Array<{
+      __typename?: "UserGQL";
+      id: number;
+      username: string;
+    }> | null;
+  } | null;
+};
+
 export type GetStreamMonitoringDetailsQueryVariables = Exact<{
   videoId: Scalars["Int"]["input"];
   debuggingJson?: InputMaybe<Scalars["JSON"]["input"]>;
@@ -3182,6 +3316,7 @@ export type GetStreamMonitoringDetailsQuery = {
     } | null;
     stream?: {
       __typename?: "UploadStreamGQL";
+      id: string;
       linksRequested: number;
       uploadsCompleted: number;
       segmentProcessingCursor: number;
@@ -3258,7 +3393,7 @@ export type GetVideoDetailsQuery = {
     owner?: {
       __typename?: "UserGQL";
       id: number;
-      firebaseUid: string;
+      firebaseUid?: string | null;
       username: string;
       profileImageUri?: string | null;
     } | null;
@@ -3395,6 +3530,7 @@ export type GetVideoQuery = {
     }>;
     stream?: {
       __typename?: "UploadStreamGQL";
+      id: string;
       streamSegmentType: StreamSegmentTypeEnum;
       segments: Array<{
         __typename?: "UploadSegmentGQL";
@@ -4038,6 +4174,7 @@ export const GetFeedDocument = gql`
         elapsedTime
         screenshotUri
         stream {
+          id
           isCompleted
         }
         tableSize
@@ -4355,17 +4492,21 @@ export const UpdateShotAnnotationsDocument = gql`
     $annotations: [UpdateAnnotationInputGQL!]!
   ) {
     updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
-      value {
-        ... on SuccessfulUpdate {
-          value
-        }
-        ... on UpdateShotAnnotationErrors {
-          error {
-            shotId
-            msg
+      shot {
+        id
+        annotations {
+          shotId
+          type {
+            id
+            name
           }
+          notes
         }
       }
+      error {
+        shotId
+        msg
+      }
     }
   }
 `;
@@ -4414,9 +4555,16 @@ export type UpdateShotAnnotationsMutationOptions = Apollo.BaseMutationOptions<
   UpdateShotAnnotationsMutationVariables
 >;
 export const GetShotsWithVideoGqlDocument = gql`
-  query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
-    getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
-      ids
+  query GetShotsWithVideoGql(
+    $filterInput: FilterInput!
+    $shotsOrdering: GetShotsOrdering
+    $limit: Int
+  ) {
+    getOrderedShots(
+      filterInput: $filterInput
+      shotsOrdering: $shotsOrdering
+      limit: $limit
+    ) {
       shots {
         id
         videoId
@@ -4442,6 +4590,7 @@ export const GetShotsWithVideoGqlDocument = gql`
  * const { data, loading, error } = useGetShotsWithVideoGqlQuery({
  *   variables: {
  *      filterInput: // value for 'filterInput'
+ *      shotsOrdering: // value for 'shotsOrdering'
  *      limit: // value for 'limit'
  *   },
  * });
@@ -4879,6 +5028,7 @@ export const GetLoggedInUserDocument = gql`
       username
       isAdmin
       profileImageUri
+      fargoRating
       activeVideoId
       createdAt
       updatedAt
@@ -5100,6 +5250,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 +5414,197 @@ export type GetUserTagsQueryResult = Apollo.QueryResult<
   GetUserTagsQuery,
   GetUserTagsQueryVariables
 >;
+export const FollowUserDocument = gql`
+  mutation followUser($followedUserId: Int!) {
+    followUser(followedUserId: $followedUserId) {
+      username
+      following {
+        id
+      }
+      followers {
+        id
+      }
+    }
+  }
+`;
+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) {
+      username
+      following {
+        id
+      }
+      followers {
+        id
+      }
+    }
+  }
+`;
+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 GetUserFollowingFollowersDocument = gql`
+  query getUserFollowingFollowers {
+    getLoggedInUser {
+      following {
+        id
+        username
+      }
+      followers {
+        id
+        username
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetUserFollowingFollowersQuery__
+ *
+ * To run a query within a React component, call `useGetUserFollowingFollowersQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetUserFollowingFollowersQuery` 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 } = useGetUserFollowingFollowersQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useGetUserFollowingFollowersQuery(
+  baseOptions?: Apollo.QueryHookOptions<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >(GetUserFollowingFollowersDocument, options);
+}
+export function useGetUserFollowingFollowersLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >(GetUserFollowingFollowersDocument, options);
+}
+export function useGetUserFollowingFollowersSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >(GetUserFollowingFollowersDocument, options);
+}
+export type GetUserFollowingFollowersQueryHookResult = ReturnType<
+  typeof useGetUserFollowingFollowersQuery
+>;
+export type GetUserFollowingFollowersLazyQueryHookResult = ReturnType<
+  typeof useGetUserFollowingFollowersLazyQuery
+>;
+export type GetUserFollowingFollowersSuspenseQueryHookResult = ReturnType<
+  typeof useGetUserFollowingFollowersSuspenseQuery
+>;
+export type GetUserFollowingFollowersQueryResult = Apollo.QueryResult<
+  GetUserFollowingFollowersQuery,
+  GetUserFollowingFollowersQueryVariables
+>;
 export const GetStreamMonitoringDetailsDocument = gql`
   query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     getVideo(videoId: $videoId, debuggingJson: $debuggingJson) {
@@ -5219,6 +5653,7 @@ export const GetStreamMonitoringDetailsDocument = gql`
         }
       }
       stream {
+        id
         linksRequested
         uploadsCompleted
         segmentProcessingCursor
@@ -5726,6 +6161,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,23 +22,34 @@ mutation UpdateShotAnnotations(
   $annotations: [UpdateAnnotationInputGQL!]!
 ) {
   updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
-    value {
-      ... on SuccessfulUpdate {
-        value
-      }
-      ... on UpdateShotAnnotationErrors {
-        error {
-          shotId
-          msg
+    shot {
+      id
+      annotations {
+        shotId
+        type {
+          id
+          name
         }
+        notes
       }
     }
+    error {
+      shotId
+      msg
+    }
   }
 }
 
-query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
-  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
-    ids
+query GetShotsWithVideoGql(
+  $filterInput: FilterInput!
+  $shotsOrdering: GetShotsOrdering
+  $limit: Int
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+  ) {
     shots {
       id
       videoId

src/operations/user.gql

@@ -37,6 +37,7 @@ query getLoggedInUser {
     username
     isAdmin
     profileImageUri
+    fargoRating
     activeVideoId
     createdAt
     updatedAt
@@ -57,9 +58,69 @@ 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) {
+    username
+    following {
+      id
+    }
+    followers {
+      id
+    }
+  }
+}
+
+mutation unfollowUser($followedUserId: Int!) {
+  unfollowUser(followedUserId: $followedUserId) {
+    username
+    following {
+      id
+    }
+    followers {
+      id
+    }
+  }
+}
+
+query getUserFollowingFollowers {
+  getLoggedInUser {
+    following {
+      id
+      username
+    }
+    followers {
+      id
+      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

@@ -9,6 +9,7 @@ type Query {
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
+  getMedals(scope: MedalScope!, userId: Int = null): RequestedMedalsGQL!
   getOrderedShots(
     filterInput: FilterInput!
     ids: [Int!] = null
@@ -29,18 +30,19 @@ type Query {
   getShotsByIds(ids: [Int!]!): [ShotGQL!]!
   getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
   getUser(userId: Int!): UserGQL
+  doesUsernameExist(candidateUsername: String!): Boolean!
   getLoggedInUser: UserGQL
   getUsernames(
     matchString: String = null
     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
@@ -266,6 +268,52 @@ type MakePercentageIntervalGQL {
   elapsedTime: Float!
 }
 
+type RequestedMedalsGQL {
+  distanceOver66: MedalGQL
+  distanceOver78: MedalGQL
+  distanceOver90: MedalGQL
+  runLength3: MedalGQL
+  runLength5: MedalGQL
+  runLength8: MedalGQL
+  runLength10: MedalGQL
+  runLength15: MedalGQL
+  runLength20: MedalGQL
+  runLength25: MedalGQL
+  runLength30: MedalGQL
+  runLength40: MedalGQL
+  runLength50: MedalGQL
+  totalMakes25: MedalGQL
+  totalMakes50: MedalGQL
+  totalMakes75: MedalGQL
+  totalMakes100: MedalGQL
+  totalMakes200: MedalGQL
+  totalMakes300: MedalGQL
+  totalMakes400: MedalGQL
+  totalMakes500: MedalGQL
+  totalMakes750: MedalGQL
+  totalMakes1000: MedalGQL
+  dayStreak2: MedalGQL
+  dayStreak3: MedalGQL
+  dayStreak4: MedalGQL
+  dayStreak5: MedalGQL
+  dayStreak6: MedalGQL
+  dayStreak7: MedalGQL
+  dayStreak14: MedalGQL
+  dayStreak21: MedalGQL
+  dayStreak30: MedalGQL
+  dayStreak60: MedalGQL
+  dayStreak90: MedalGQL
+}
+
+type MedalGQL {
+  count: Int!
+}
+
+input MedalScope @oneOf {
+  videoId: Int
+  interval: TimeInterval
+}
+
 type GetShotsResult {
   shots: [ShotGQL!]!
   count: Int
@@ -341,16 +389,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!]
-  followers: [Int!]
+  following: [UserGQL!]
+  followers: [UserGQL!]
 }
 
 type ShotAnnotationGQL {
@@ -554,10 +602,15 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
-type UsernamesAndFollowingResponse {
-  usernames: [String!]!
-  following: [Int!]!
-  followers: [Int!]!
+type UserRelationshipsResult {
+  inquiringUser: UserGQL!
+  relationships: [UserRelationship!]!
+}
+
+type UserRelationship {
+  toUser: UserGQL!
+  toUserFollows: Boolean!
+  toUserIsFollowedBy: Boolean!
 }
 
 type UserPlayTimeGQL {
@@ -662,18 +715,7 @@ type OtherErrorNeedsNote {
 }
 
 type UpdateShotAnnotationReturn {
-  value: SuccessfulUpdateUpdateShotAnnotationErrors!
-}
-
-union SuccessfulUpdateUpdateShotAnnotationErrors =
-    SuccessfulUpdate
-  | UpdateShotAnnotationErrors
-
-type SuccessfulUpdate {
-  value: Boolean!
-}
-
-type UpdateShotAnnotationErrors {
+  shot: ShotGQL
   error: DoesNotOwnShotErr
 }