Merge pull request 'Get user following followers' (#101) from kat/get-user-following-followers into master

Reviewed-on: #101

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

@@ -2166,11 +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;
-  getUsernamesAndFollowingOld: UsernamesAndFollowingResponse;
   getVideo: VideoGql;
   getVideoMakePercentageIntervals: Array<MakePercentageIntervalGql>;
   getVideos: Array<VideoGql>;
@@ -2227,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>;
@@ -2240,20 +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 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"];
@@ -2517,8 +2509,8 @@ export type UserGql = {
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
   fargoRating?: Maybe<Scalars["Int"]["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?: Maybe<Scalars["Boolean"]["output"]>;
   profileImageUri?: Maybe<Scalars["String"]["output"]>;
@@ -2531,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"];
-  users: Array<UserGql>;
+  toUserIsFollowedBy: Scalars["Boolean"]["output"];
+};
+
+export type UserRelationshipsResult = {
+  __typename?: "UserRelationshipsResult";
+  inquiringUser: UserGql;
+  relationships: Array<UserRelationship>;
 };
 
 export type VideoFilterInput = {
@@ -2806,14 +2804,14 @@ export type UpdateShotAnnotationsMutation = {
 
 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;
@@ -3116,6 +3114,7 @@ export type GetLoggedInUserQuery = {
     username: string;
     isAdmin?: boolean | null;
     profileImageUri?: string | null;
+    fargoRating?: number | null;
     activeVideoId?: number | null;
     createdAt?: any | null;
     updatedAt?: any | null;
@@ -3142,19 +3141,23 @@ export type GetUsernamesQuery = {
   getUsernames: Array<string>;
 };
 
-export type GetUsernamesAndFollowingQueryVariables = Exact<{
+export type GetUserRelationshipsMatchingQueryVariables = Exact<{
   userId: Scalars["Int"]["input"];
   matchString: Scalars["String"]["input"];
   limit?: InputMaybe<Scalars["Int"]["input"]>;
   after?: InputMaybe<Scalars["String"]["input"]>;
 }>;
 
-export type GetUsernamesAndFollowingQuery = {
+export type GetUserRelationshipsMatchingQuery = {
   __typename?: "Query";
-  getUsernamesAndFollowing: {
+  getUserRelationshipsMatching: {
-    __typename?: "UsernamesAndFollowingResponse";
+    __typename?: "UserRelationshipsResult";
-    followers: Array<number>;
+    relationships: Array<{
-    following: Array<number>;
+      __typename?: "UserRelationship";
+      toUserFollows: boolean;
+      toUserIsFollowedBy: boolean;
+      toUser: { __typename?: "UserGQL"; username: string; id: number };
+    }>;
   };
 };
 
@@ -3165,6 +3168,56 @@ 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";
+    id: number;
+    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"]>;
@@ -4445,9 +4498,16 @@ export type UpdateShotAnnotationsMutationOptions = Apollo.BaseMutationOptions<
   UpdateShotAnnotationsMutationVariables
 >;
 export const GetShotsWithVideoGqlDocument = gql`
-  query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
+  query GetShotsWithVideoGql(
-    getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
+    $filterInput: FilterInput!
-      ids
+    $shotsOrdering: GetShotsOrdering
+    $limit: Int
+  ) {
+    getOrderedShots(
+      filterInput: $filterInput
+      shotsOrdering: $shotsOrdering
+      limit: $limit
+    ) {
       shots {
         id
         videoId
@@ -4473,6 +4533,7 @@ export const GetShotsWithVideoGqlDocument = gql`
  * const { data, loading, error } = useGetShotsWithVideoGqlQuery({
  *   variables: {
  *      filterInput: // value for 'filterInput'
+ *      shotsOrdering: // value for 'shotsOrdering'
  *      limit: // value for 'limit'
  *   },
  * });
@@ -4910,6 +4971,7 @@ export const GetLoggedInUserDocument = gql`
       username
       isAdmin
       profileImageUri
+      fargoRating
       activeVideoId
       createdAt
       updatedAt
@@ -5131,36 +5193,42 @@ export type GetUsernamesQueryResult = Apollo.QueryResult<
   GetUsernamesQuery,
   GetUsernamesQueryVariables
 >;
-export const GetUsernamesAndFollowingDocument = gql`
+export const GetUserRelationshipsMatchingDocument = gql`
-  query getUsernamesAndFollowing(
+  query getUserRelationshipsMatching(
     $userId: Int!
     $matchString: String!
     $limit: Int = null
     $after: String = null
   ) {
-    getUsernamesAndFollowing(
+    getUserRelationshipsMatching(
       userId: $userId
       matchString: $matchString
       limit: $limit
       after: $after
     ) {
-      followers
+      relationships {
-      following
+        toUser {
+          username
+          id
+        }
+        toUserFollows
+        toUserIsFollowedBy
+      }
     }
   }
 `;
 
 /**
- * __useGetUsernamesAndFollowingQuery__
+ * __useGetUserRelationshipsMatchingQuery__
  *
- * To run a query within a React component, call `useGetUsernamesAndFollowingQuery` and pass it any options that fit your needs.
+ * To run a query within a React component, call `useGetUserRelationshipsMatchingQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetUsernamesAndFollowingQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * 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 } = useGetUsernamesAndFollowingQuery({
+ * const { data, loading, error } = useGetUserRelationshipsMatchingQuery({
  *   variables: {
  *      userId: // value for 'userId'
  *      matchString: // value for 'matchString'
@@ -5169,54 +5237,54 @@ export const GetUsernamesAndFollowingDocument = gql`
  *   },
  * });
  */
-export function useGetUsernamesAndFollowingQuery(
+export function useGetUserRelationshipsMatchingQuery(
   baseOptions: Apollo.QueryHookOptions<
-    GetUsernamesAndFollowingQuery,
+    GetUserRelationshipsMatchingQuery,
-    GetUsernamesAndFollowingQueryVariables
+    GetUserRelationshipsMatchingQueryVariables
   >,
 ) {
   const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useQuery<
-    GetUsernamesAndFollowingQuery,
+    GetUserRelationshipsMatchingQuery,
-    GetUsernamesAndFollowingQueryVariables
+    GetUserRelationshipsMatchingQueryVariables
-  >(GetUsernamesAndFollowingDocument, options);
+  >(GetUserRelationshipsMatchingDocument, options);
 }
-export function useGetUsernamesAndFollowingLazyQuery(
+export function useGetUserRelationshipsMatchingLazyQuery(
   baseOptions?: Apollo.LazyQueryHookOptions<
-    GetUsernamesAndFollowingQuery,
+    GetUserRelationshipsMatchingQuery,
-    GetUsernamesAndFollowingQueryVariables
+    GetUserRelationshipsMatchingQueryVariables
   >,
 ) {
   const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useLazyQuery<
-    GetUsernamesAndFollowingQuery,
+    GetUserRelationshipsMatchingQuery,
-    GetUsernamesAndFollowingQueryVariables
+    GetUserRelationshipsMatchingQueryVariables
-  >(GetUsernamesAndFollowingDocument, options);
+  >(GetUserRelationshipsMatchingDocument, options);
 }
-export function useGetUsernamesAndFollowingSuspenseQuery(
+export function useGetUserRelationshipsMatchingSuspenseQuery(
   baseOptions?: Apollo.SuspenseQueryHookOptions<
-    GetUsernamesAndFollowingQuery,
+    GetUserRelationshipsMatchingQuery,
-    GetUsernamesAndFollowingQueryVariables
+    GetUserRelationshipsMatchingQueryVariables
   >,
 ) {
   const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
-    GetUsernamesAndFollowingQuery,
+    GetUserRelationshipsMatchingQuery,
-    GetUsernamesAndFollowingQueryVariables
+    GetUserRelationshipsMatchingQueryVariables
-  >(GetUsernamesAndFollowingDocument, options);
+  >(GetUserRelationshipsMatchingDocument, options);
 }
-export type GetUsernamesAndFollowingQueryHookResult = ReturnType<
+export type GetUserRelationshipsMatchingQueryHookResult = ReturnType<
-  typeof useGetUsernamesAndFollowingQuery
+  typeof useGetUserRelationshipsMatchingQuery
 >;
-export type GetUsernamesAndFollowingLazyQueryHookResult = ReturnType<
+export type GetUserRelationshipsMatchingLazyQueryHookResult = ReturnType<
-  typeof useGetUsernamesAndFollowingLazyQuery
+  typeof useGetUserRelationshipsMatchingLazyQuery
 >;
-export type GetUsernamesAndFollowingSuspenseQueryHookResult = ReturnType<
+export type GetUserRelationshipsMatchingSuspenseQueryHookResult = ReturnType<
-  typeof useGetUsernamesAndFollowingSuspenseQuery
+  typeof useGetUserRelationshipsMatchingSuspenseQuery
 >;
-export type GetUsernamesAndFollowingQueryResult = Apollo.QueryResult<
+export type GetUserRelationshipsMatchingQueryResult = Apollo.QueryResult<
-  GetUsernamesAndFollowingQuery,
+  GetUserRelationshipsMatchingQuery,
-  GetUsernamesAndFollowingQueryVariables
+  GetUserRelationshipsMatchingQueryVariables
 >;
 export const GetUserTagsDocument = gql`
   query GetUserTags {
@@ -5289,6 +5357,198 @@ 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 {
+      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 GetStreamMonitoringDetailsDocument = gql`
   query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     getVideo(videoId: $videoId, debuggingJson: $debuggingJson) {

src/operations/shots.gql

@@ -40,9 +40,16 @@ mutation UpdateShotAnnotations(
   }
 }
 
-query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
+query GetShotsWithVideoGql(
-  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
+  $filterInput: FilterInput!
-    ids
+  $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,20 +58,26 @@ query getUsernames(
   getUsernames(matchString: $matchString, limit: $limit, after: $after)
 }
 
-query getUsernamesAndFollowing(
+query getUserRelationshipsMatching(
   $userId: Int!
   $matchString: String!
   $limit: Int = null
   $after: String = null
 ) {
-  getUsernamesAndFollowing(
+  getUserRelationshipsMatching(
     userId: $userId
     matchString: $matchString
     limit: $limit
     after: $after
   ) {
-    followers
+    relationships {
-    following
+      toUser {
+        username
+        id
+      }
+      toUserFollows
+      toUserIsFollowedBy
+    }
   }
 }
 
@@ -80,3 +87,41 @@ query GetUserTags {
     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 {
+    id
+    following {
+      id
+      username
+    }
+    followers {
+      id
+      username
+    }
+  }
+}

src/schema.gql

@@ -35,18 +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!
-  getUsernamesAndFollowingOld(
-    userId: Int!
-    matchString: String = null
-    limit: Int = 100
-    after: String = null
-  ): UsernamesAndFollowingResponse!
   getPlayTime(userId: Int!): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
@@ -355,8 +349,8 @@ type UserGQL {
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
-  following: [Int!]
+  following: [UserGQL!]
-  followers: [Int!]
+  followers: [UserGQL!]
 }
 
 type ShotAnnotationGQL {
@@ -560,10 +554,15 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
-type UsernamesAndFollowingResponse {
+type UserRelationshipsResult {
-  users: [UserGQL!]!
+  inquiringUser: UserGQL!
-  following: [Int!]!
+  relationships: [UserRelationship!]!
-  followers: [Int!]!
+}
+
+type UserRelationship {
+  toUser: UserGQL!
+  toUserFollows: Boolean!
+  toUserIsFollowedBy: Boolean!
 }
 
 type UserPlayTimeGQL {