Return userGQL in usernames and ids endpoint

pyproject.toml

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

src/index.tsx

@@ -1974,15 +1974,6 @@ 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"]>;
@@ -2163,13 +2154,11 @@ 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>;
@@ -2177,20 +2166,17 @@ 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;
+  getUsernamesAndFollowingOld: 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;
 };
@@ -2205,13 +2191,7 @@ export type QueryGetFeedVideosArgs = {
   limit?: Scalars["Int"]["input"];
 };
 
-export type QueryGetMedalsArgs = {
-  scope: MedalScope;
-  userId?: InputMaybe<Scalars["Int"]["input"]>;
-};
-
 export type QueryGetOrderedShotsArgs = {
-  countRespectsLimit?: Scalars["Boolean"]["input"];
   filterInput: FilterInput;
   ids?: InputMaybe<Array<Scalars["Int"]["input"]>>;
   limit?: Scalars["Int"]["input"];
@@ -2227,7 +2207,6 @@ export type QueryGetShotAnnotationTypesArgs = {
 };
 
 export type QueryGetShotsArgs = {
-  countRespectsLimit?: Scalars["Boolean"]["input"];
   filterInput: FilterInput;
   limit?: Scalars["Int"]["input"];
   shotsPagination?: InputMaybe<GetShotsPagination>;
@@ -2238,7 +2217,6 @@ export type QueryGetShotsByIdsArgs = {
 };
 
 export type QueryGetShotsWithMetadataArgs = {
-  countRespectsLimit?: Scalars["Boolean"]["input"];
   filterInput: FilterInput;
   ids?: InputMaybe<Array<Scalars["Int"]["input"]>>;
   limit?: Scalars["Int"]["input"];
@@ -2249,13 +2227,6 @@ 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>;
@@ -2269,6 +2240,20 @@ 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 QueryGetUsernamesAndFollowingOldArgs = {
+  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"];
@@ -2287,44 +2272,6 @@ 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"];
@@ -2570,8 +2517,8 @@ export type UserGql = {
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
   fargoRating?: Maybe<Scalars["Int"]["output"]>;
   firebaseUid?: Maybe<Scalars["String"]["output"]>;
-  followers?: Maybe<Array<UserGql>>;
+  followers?: Maybe<Array<Scalars["Int"]["output"]>>;
-  following?: Maybe<Array<UserGql>>;
+  following?: Maybe<Array<Scalars["Int"]["output"]>>;
   id: Scalars["Int"]["output"];
   isAdmin?: Maybe<Scalars["Boolean"]["output"]>;
   profileImageUri?: Maybe<Scalars["String"]["output"]>;
@@ -2584,17 +2531,11 @@ export type UserPlayTimeGql = {
   totalSeconds: Scalars["Float"]["output"];
 };
 
-export type UserRelationship = {
+export type UsernamesAndFollowingResponse = {
-  __typename?: "UserRelationship";
+  __typename?: "UsernamesAndFollowingResponse";
-  toUser: UserGql;
+  followers: Array<Scalars["Int"]["output"]>;
-  toUserFollows: Scalars["Boolean"]["output"];
+  following: Array<Scalars["Int"]["output"]>;
-  toUserIsFollowedBy: Scalars["Boolean"]["output"];
+  users: Array<UserGql>;
-};
-
-export type UserRelationshipsResult = {
-  __typename?: "UserRelationshipsResult";
-  inquiringUser: UserGql;
-  relationships: Array<UserRelationship>;
 };
 
 export type VideoFilterInput = {
@@ -2786,54 +2727,6 @@ export type GetFeedQuery = {
   };
 };
 
-export type GetVideoFeedQueryVariables = Exact<{
-  limit?: Scalars["Int"]["input"];
-  after?: InputMaybe<Scalars["String"]["input"]>;
-  filters?: InputMaybe<VideoFilterInput>;
-}>;
-
-export type GetVideoFeedQuery = {
-  __typename?: "Query";
-  getFeedVideos: {
-    __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;
-      elapsedTime?: number | null;
-      tableSize: number;
-      owner?: {
-        __typename?: "UserGQL";
-        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 }>;
-      }>;
-    }>;
-    pageInfo: {
-      __typename?: "PageInfoGQL";
-      hasNextPage: boolean;
-      endCursor?: string | null;
-    };
-  };
-};
-
 export type GetVideoMakePercentageIntervalsQueryVariables = Exact<{
   videoId: Scalars["ID"]["input"];
   intervalDuration: Scalars["Int"]["input"];
@@ -2913,14 +2806,14 @@ export type UpdateShotAnnotationsMutation = {
 
 export type GetShotsWithVideoGqlQueryVariables = Exact<{
   filterInput: FilterInput;
-  shotsOrdering?: InputMaybe<GetShotsOrdering>;
   limit?: InputMaybe<Scalars["Int"]["input"]>;
 }>;
 
 export type GetShotsWithVideoGqlQuery = {
   __typename?: "Query";
-  getOrderedShots: {
+  getShotsWithMetadata: {
     __typename?: "GetShotsResult";
+    ids: Array<number>;
     shots: Array<{
       __typename?: "ShotGQL";
       id: number;
@@ -2939,7 +2832,6 @@ export type GetShotsWithMetadataFilterResultQueryVariables = Exact<{
   shotsOrdering?: InputMaybe<GetShotsOrdering>;
   limit?: InputMaybe<Scalars["Int"]["input"]>;
   ids?: InputMaybe<Array<Scalars["Int"]["input"]> | Scalars["Int"]["input"]>;
-  countRespectsLimit?: InputMaybe<Scalars["Boolean"]["input"]>;
 }>;
 
 export type GetShotsWithMetadataFilterResultQuery = {
@@ -3224,7 +3116,6 @@ export type GetLoggedInUserQuery = {
     username: string;
     isAdmin?: boolean | null;
     profileImageUri?: string | null;
-    fargoRating?: number | null;
     activeVideoId?: number | null;
     createdAt?: any | null;
     updatedAt?: any | null;
@@ -3251,23 +3142,19 @@ export type GetUsernamesQuery = {
   getUsernames: Array<string>;
 };
 
-export type GetUserRelationshipsMatchingQueryVariables = Exact<{
+export type GetUsernamesAndFollowingQueryVariables = Exact<{
   userId: Scalars["Int"]["input"];
   matchString: Scalars["String"]["input"];
   limit?: InputMaybe<Scalars["Int"]["input"]>;
   after?: InputMaybe<Scalars["String"]["input"]>;
 }>;
 
-export type GetUserRelationshipsMatchingQuery = {
+export type GetUsernamesAndFollowingQuery = {
   __typename?: "Query";
-  getUserRelationshipsMatching: {
+  getUsernamesAndFollowing: {
-    __typename?: "UserRelationshipsResult";
+    __typename?: "UsernamesAndFollowingResponse";
-    relationships: Array<{
+    followers: Array<number>;
-      __typename?: "UserRelationship";
+    following: Array<number>;
-      toUserFollows: boolean;
-      toUserIsFollowedBy: boolean;
-      toUser: { __typename?: "UserGQL"; username: string; id: number };
-    }>;
   };
 };
 
@@ -3278,83 +3165,6 @@ 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;
-    id: number;
-    following?: Array<{
-      __typename?: "UserGQL";
-      id: number;
-      username: string;
-    }> | null;
-    followers?: Array<{
-      __typename?: "UserGQL";
-      id: number;
-      username: string;
-    }> | null;
-  };
-};
-
-export type UnfollowUserMutationVariables = Exact<{
-  followedUserId: Scalars["Int"]["input"];
-}>;
-
-export type UnfollowUserMutation = {
-  __typename?: "Mutation";
-  unfollowUser: {
-    __typename?: "UserGQL";
-    username: string;
-    id: number;
-    following?: Array<{
-      __typename?: "UserGQL";
-      id: number;
-      username: string;
-    }> | null;
-    followers?: Array<{
-      __typename?: "UserGQL";
-      id: number;
-      username: string;
-    }> | null;
-  };
-};
-
-export type GetUserFollowingFollowersQueryVariables = Exact<{
-  [key: string]: never;
-}>;
-
-export type GetUserFollowingFollowersQuery = {
-  __typename?: "Query";
-  getLoggedInUser?: {
-    __typename?: "UserGQL";
-    id: number;
-    following?: Array<{
-      __typename?: "UserGQL";
-      id: number;
-      username: string;
-    }> | null;
-    followers?: Array<{
-      __typename?: "UserGQL";
-      id: number;
-      username: string;
-    }> | null;
-  } | null;
-};
-
-export type DoesUsernameExistQueryVariables = Exact<{
-  candidateUsername: Scalars["String"]["input"];
-}>;
-
-export type DoesUsernameExistQuery = {
-  __typename?: "Query";
-  doesUsernameExist: boolean;
-};
-
 export type GetStreamMonitoringDetailsQueryVariables = Exact<{
   videoId: Scalars["Int"]["input"];
   debuggingJson?: InputMaybe<Scalars["JSON"]["input"]>;
@@ -4333,117 +4143,6 @@ export type GetFeedQueryResult = Apollo.QueryResult<
   GetFeedQuery,
   GetFeedQueryVariables
 >;
-export const GetVideoFeedDocument = gql`
-  query GetVideoFeed(
-    $limit: Int! = 5
-    $after: String = null
-    $filters: VideoFilterInput = null
-  ) {
-    getFeedVideos(limit: $limit, after: $after, filters: $filters) {
-      videos {
-        id
-        owner {
-          username
-          profileImageUri
-        }
-        name
-        screenshotUri
-        totalShotsMade
-        totalShots
-        makePercentage
-        createdAt
-        updatedAt
-        startTime
-        endTime
-        elapsedTime
-        screenshotUri
-        stream {
-          id
-          isCompleted
-        }
-        tableSize
-        tags {
-          tagClasses {
-            name
-          }
-          name
-        }
-      }
-      pageInfo {
-        hasNextPage
-        endCursor
-      }
-    }
-  }
-`;
-
-/**
- * __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'
- *   },
- * });
- */
-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!
@@ -4746,16 +4445,9 @@ export type UpdateShotAnnotationsMutationOptions = Apollo.BaseMutationOptions<
   UpdateShotAnnotationsMutationVariables
 >;
 export const GetShotsWithVideoGqlDocument = gql`
-  query GetShotsWithVideoGql(
+  query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
-    $filterInput: FilterInput!
+    getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
-    $shotsOrdering: GetShotsOrdering
+      ids
-    $limit: Int
-  ) {
-    getOrderedShots(
-      filterInput: $filterInput
-      shotsOrdering: $shotsOrdering
-      limit: $limit
-    ) {
       shots {
         id
         videoId
@@ -4781,7 +4473,6 @@ export const GetShotsWithVideoGqlDocument = gql`
  * const { data, loading, error } = useGetShotsWithVideoGqlQuery({
  *   variables: {
  *      filterInput: // value for 'filterInput'
- *      shotsOrdering: // value for 'shotsOrdering'
  *      limit: // value for 'limit'
  *   },
  * });
@@ -4841,14 +4532,12 @@ export const GetShotsWithMetadataFilterResultDocument = gql`
     $shotsOrdering: GetShotsOrdering
     $limit: Int
     $ids: [Int!]
-    $countRespectsLimit: Boolean
   ) {
     getOrderedShots(
       filterInput: $filterInput
       shotsOrdering: $shotsOrdering
       limit: $limit
       ids: $ids
-      countRespectsLimit: $countRespectsLimit
     ) {
       count
       shots {
@@ -4876,7 +4565,6 @@ export const GetShotsWithMetadataFilterResultDocument = gql`
  *      shotsOrdering: // value for 'shotsOrdering'
  *      limit: // value for 'limit'
  *      ids: // value for 'ids'
- *      countRespectsLimit: // value for 'countRespectsLimit'
  *   },
  * });
  */
@@ -5222,7 +4910,6 @@ export const GetLoggedInUserDocument = gql`
       username
       isAdmin
       profileImageUri
-      fargoRating
       activeVideoId
       createdAt
       updatedAt
@@ -5444,42 +5131,36 @@ export type GetUsernamesQueryResult = Apollo.QueryResult<
   GetUsernamesQuery,
   GetUsernamesQueryVariables
 >;
-export const GetUserRelationshipsMatchingDocument = gql`
+export const GetUsernamesAndFollowingDocument = gql`
-  query getUserRelationshipsMatching(
+  query getUsernamesAndFollowing(
     $userId: Int!
     $matchString: String!
     $limit: Int = null
     $after: String = null
   ) {
-    getUserRelationshipsMatching(
+    getUsernamesAndFollowing(
       userId: $userId
       matchString: $matchString
       limit: $limit
       after: $after
     ) {
-      relationships {
+      followers
-        toUser {
+      following
-          username
-          id
-        }
-        toUserFollows
-        toUserIsFollowedBy
-      }
     }
   }
 `;
 
 /**
- * __useGetUserRelationshipsMatchingQuery__
+ * __useGetUsernamesAndFollowingQuery__
  *
- * To run a query within a React component, call `useGetUserRelationshipsMatchingQuery` and pass it any options that fit your needs.
+ * To run a query within a React component, call `useGetUsernamesAndFollowingQuery` 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
+ * When your component renders, `useGetUsernamesAndFollowingQuery` 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({
+ * const { data, loading, error } = useGetUsernamesAndFollowingQuery({
  *   variables: {
  *      userId: // value for 'userId'
  *      matchString: // value for 'matchString'
@@ -5488,54 +5169,54 @@ export const GetUserRelationshipsMatchingDocument = gql`
  *   },
  * });
  */
-export function useGetUserRelationshipsMatchingQuery(
+export function useGetUsernamesAndFollowingQuery(
   baseOptions: Apollo.QueryHookOptions<
-    GetUserRelationshipsMatchingQuery,
+    GetUsernamesAndFollowingQuery,
-    GetUserRelationshipsMatchingQueryVariables
+    GetUsernamesAndFollowingQueryVariables
   >,
 ) {
   const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useQuery<
-    GetUserRelationshipsMatchingQuery,
+    GetUsernamesAndFollowingQuery,
-    GetUserRelationshipsMatchingQueryVariables
+    GetUsernamesAndFollowingQueryVariables
-  >(GetUserRelationshipsMatchingDocument, options);
+  >(GetUsernamesAndFollowingDocument, options);
 }
-export function useGetUserRelationshipsMatchingLazyQuery(
+export function useGetUsernamesAndFollowingLazyQuery(
   baseOptions?: Apollo.LazyQueryHookOptions<
-    GetUserRelationshipsMatchingQuery,
+    GetUsernamesAndFollowingQuery,
-    GetUserRelationshipsMatchingQueryVariables
+    GetUsernamesAndFollowingQueryVariables
   >,
 ) {
   const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useLazyQuery<
-    GetUserRelationshipsMatchingQuery,
+    GetUsernamesAndFollowingQuery,
-    GetUserRelationshipsMatchingQueryVariables
+    GetUsernamesAndFollowingQueryVariables
-  >(GetUserRelationshipsMatchingDocument, options);
+  >(GetUsernamesAndFollowingDocument, options);
 }
-export function useGetUserRelationshipsMatchingSuspenseQuery(
+export function useGetUsernamesAndFollowingSuspenseQuery(
   baseOptions?: Apollo.SuspenseQueryHookOptions<
-    GetUserRelationshipsMatchingQuery,
+    GetUsernamesAndFollowingQuery,
-    GetUserRelationshipsMatchingQueryVariables
+    GetUsernamesAndFollowingQueryVariables
   >,
 ) {
   const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
-    GetUserRelationshipsMatchingQuery,
+    GetUsernamesAndFollowingQuery,
-    GetUserRelationshipsMatchingQueryVariables
+    GetUsernamesAndFollowingQueryVariables
-  >(GetUserRelationshipsMatchingDocument, options);
+  >(GetUsernamesAndFollowingDocument, options);
 }
-export type GetUserRelationshipsMatchingQueryHookResult = ReturnType<
+export type GetUsernamesAndFollowingQueryHookResult = ReturnType<
-  typeof useGetUserRelationshipsMatchingQuery
+  typeof useGetUsernamesAndFollowingQuery
 >;
-export type GetUserRelationshipsMatchingLazyQueryHookResult = ReturnType<
+export type GetUsernamesAndFollowingLazyQueryHookResult = ReturnType<
-  typeof useGetUserRelationshipsMatchingLazyQuery
+  typeof useGetUsernamesAndFollowingLazyQuery
 >;
-export type GetUserRelationshipsMatchingSuspenseQueryHookResult = ReturnType<
+export type GetUsernamesAndFollowingSuspenseQueryHookResult = ReturnType<
-  typeof useGetUserRelationshipsMatchingSuspenseQuery
+  typeof useGetUsernamesAndFollowingSuspenseQuery
 >;
-export type GetUserRelationshipsMatchingQueryResult = Apollo.QueryResult<
+export type GetUsernamesAndFollowingQueryResult = Apollo.QueryResult<
-  GetUserRelationshipsMatchingQuery,
+  GetUsernamesAndFollowingQuery,
-  GetUserRelationshipsMatchingQueryVariables
+  GetUsernamesAndFollowingQueryVariables
 >;
 export const GetUserTagsDocument = gql`
   query GetUserTags {
@@ -5608,275 +5289,6 @@ export type GetUserTagsQueryResult = Apollo.QueryResult<
   GetUserTagsQuery,
   GetUserTagsQueryVariables
 >;
-export const FollowUserDocument = gql`
-  mutation followUser($followedUserId: Int!) {
-    followUser(followedUserId: $followedUserId) {
-      username
-      id
-      following {
-        id
-        username
-      }
-      followers {
-        id
-        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) {
-      username
-      id
-      following {
-        id
-        username
-      }
-      followers {
-        id
-        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 GetUserFollowingFollowersDocument = gql`
-  query getUserFollowingFollowers {
-    getLoggedInUser {
-      id
-      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 DoesUsernameExistDocument = gql`
-  query doesUsernameExist($candidateUsername: String!) {
-    doesUsernameExist(candidateUsername: $candidateUsername)
-  }
-`;
-
-/**
- * __useDoesUsernameExistQuery__
- *
- * To run a query within a React component, call `useDoesUsernameExistQuery` and pass it any options that fit your needs.
- * When your component renders, `useDoesUsernameExistQuery` 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 } = useDoesUsernameExistQuery({
- *   variables: {
- *      candidateUsername: // value for 'candidateUsername'
- *   },
- * });
- */
-export function useDoesUsernameExistQuery(
-  baseOptions: Apollo.QueryHookOptions<
-    DoesUsernameExistQuery,
-    DoesUsernameExistQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<
-    DoesUsernameExistQuery,
-    DoesUsernameExistQueryVariables
-  >(DoesUsernameExistDocument, options);
-}
-export function useDoesUsernameExistLazyQuery(
-  baseOptions?: Apollo.LazyQueryHookOptions<
-    DoesUsernameExistQuery,
-    DoesUsernameExistQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useLazyQuery<
-    DoesUsernameExistQuery,
-    DoesUsernameExistQueryVariables
-  >(DoesUsernameExistDocument, options);
-}
-export function useDoesUsernameExistSuspenseQuery(
-  baseOptions?: Apollo.SuspenseQueryHookOptions<
-    DoesUsernameExistQuery,
-    DoesUsernameExistQueryVariables
-  >,
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useSuspenseQuery<
-    DoesUsernameExistQuery,
-    DoesUsernameExistQueryVariables
-  >(DoesUsernameExistDocument, options);
-}
-export type DoesUsernameExistQueryHookResult = ReturnType<
-  typeof useDoesUsernameExistQuery
->;
-export type DoesUsernameExistLazyQueryHookResult = ReturnType<
-  typeof useDoesUsernameExistLazyQuery
->;
-export type DoesUsernameExistSuspenseQueryHookResult = ReturnType<
-  typeof useDoesUsernameExistSuspenseQuery
->;
-export type DoesUsernameExistQueryResult = Apollo.QueryResult<
-  DoesUsernameExistQuery,
-  DoesUsernameExistQueryVariables
->;
 export const GetStreamMonitoringDetailsDocument = gql`
   query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     getVideo(videoId: $videoId, debuggingJson: $debuggingJson) {

src/operations/feed.gql

@@ -38,45 +38,3 @@ query GetFeed(
     }
   }
 }
-
-query GetVideoFeed(
-  $limit: Int! = 5
-  $after: String = null
-  $filters: VideoFilterInput = null
-) {
-  getFeedVideos(limit: $limit, after: $after, filters: $filters) {
-    videos {
-      id
-      owner {
-        username
-        profileImageUri
-      }
-      name
-      screenshotUri
-      totalShotsMade
-      totalShots
-      makePercentage
-      createdAt
-      updatedAt
-      startTime
-      endTime
-      elapsedTime
-      screenshotUri
-      stream {
-        id
-        isCompleted
-      }
-      tableSize
-      tags {
-        tagClasses {
-          name
-        }
-        name
-      }
-    }
-    pageInfo {
-      hasNextPage
-      endCursor
-    }
-  }
-}

src/operations/shots.gql

@@ -40,16 +40,9 @@ mutation UpdateShotAnnotations(
   }
 }
 
-query GetShotsWithVideoGql(
+query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
-  $filterInput: FilterInput!
+  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
-  $shotsOrdering: GetShotsOrdering
+    ids
-  $limit: Int
-) {
-  getOrderedShots(
-    filterInput: $filterInput
-    shotsOrdering: $shotsOrdering
-    limit: $limit
-  ) {
     shots {
       id
       videoId
@@ -67,14 +60,12 @@ query GetShotsWithMetadataFilterResult(
   $shotsOrdering: GetShotsOrdering
   $limit: Int
   $ids: [Int!]
-  $countRespectsLimit: Boolean
 ) {
   getOrderedShots(
     filterInput: $filterInput
     shotsOrdering: $shotsOrdering
     limit: $limit
     ids: $ids
-    countRespectsLimit: $countRespectsLimit
   ) {
     count
     shots {

src/operations/user.gql

@@ -37,7 +37,6 @@ query getLoggedInUser {
     username
     isAdmin
     profileImageUri
-    fargoRating
     activeVideoId
     createdAt
     updatedAt
@@ -58,26 +57,20 @@ query getUsernames(
   getUsernames(matchString: $matchString, limit: $limit, after: $after)
 }
 
-query getUserRelationshipsMatching(
+query getUsernamesAndFollowing(
   $userId: Int!
   $matchString: String!
   $limit: Int = null
   $after: String = null
 ) {
-  getUserRelationshipsMatching(
+  getUsernamesAndFollowing(
     userId: $userId
     matchString: $matchString
     limit: $limit
     after: $after
   ) {
-    relationships {
+    followers
-      toUser {
+    following
-        username
-        id
-      }
-      toUserFollows
-      toUserIsFollowedBy
-    }
   }
 }
 
@@ -87,51 +80,3 @@ query GetUserTags {
     name
   }
 }
-
-mutation followUser($followedUserId: Int!) {
-  followUser(followedUserId: $followedUserId) {
-    username
-    id
-    following {
-      id
-      username
-    }
-    followers {
-      id
-      username
-    }
-  }
-}
-
-mutation unfollowUser($followedUserId: Int!) {
-  unfollowUser(followedUserId: $followedUserId) {
-    username
-    id
-    following {
-      id
-      username
-    }
-    followers {
-      id
-      username
-    }
-  }
-}
-
-query getUserFollowingFollowers {
-  getLoggedInUser {
-    id
-    following {
-      id
-      username
-    }
-    followers {
-      id
-      username
-    }
-  }
-}
-
-query doesUsernameExist($candidateUsername: String!) {
-  doesUsernameExist(candidateUsername: $candidateUsername)
-}

src/schema.gql

@@ -9,43 +9,44 @@ type Query {
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
-  getMedals(scope: MedalScope!, userId: Int = null): RequestedMedalsGQL!
   getOrderedShots(
     filterInput: FilterInput!
     ids: [Int!] = null
     shotsOrdering: GetShotsOrdering = null
     limit: Int! = 500
-    countRespectsLimit: Boolean! = false
   ): GetShotsResult!
   getShotsWithMetadata(
     filterInput: FilterInput!
     ids: [Int!] = null
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
-    countRespectsLimit: Boolean! = false
   ): GetShotsResult!
   getShots(
     filterInput: FilterInput!
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
-    countRespectsLimit: Boolean! = false
   ): [ShotGQL!]!
   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!]!
-  getUserRelationshipsMatching(
+  getUsernamesAndFollowing(
     userId: Int!
     matchString: String = null
     limit: Int = 100
     after: String = null
-  ): UserRelationshipsResult!
+  ): UsernamesAndFollowingResponse!
+  getUsernamesAndFollowingOld(
+    userId: Int!
+    matchString: String = null
+    limit: Int = 100
+    after: String = null
+  ): UsernamesAndFollowingResponse!
   getPlayTime(userId: Int!): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
@@ -271,52 +272,6 @@ 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
@@ -400,8 +355,8 @@ type UserGQL {
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
-  following: [UserGQL!]
+  following: [Int!]
-  followers: [UserGQL!]
+  followers: [Int!]
 }
 
 type ShotAnnotationGQL {
@@ -605,15 +560,10 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
-type UserRelationshipsResult {
+type UsernamesAndFollowingResponse {
-  inquiringUser: UserGQL!
+  users: [UserGQL!]!
-  relationships: [UserRelationship!]!
+  following: [Int!]!
-}
+  followers: [Int!]!
-
-type UserRelationship {
-  toUser: UserGQL!
-  toUserFollows: Boolean!
-  toUserIsFollowedBy: Boolean!
 }
 
 type UserPlayTimeGQL {