Return userGQL in usernames and ids endpoint

Reviewed-on: #92

src/index.tsx

@@ -2170,6 +2170,7 @@ export type Query = {
   getUserVideos: VideoHistoryGql;
   getUsernames: Array<Scalars["String"]["output"]>;
   getUsernamesAndFollowing: UsernamesAndFollowingResponse;
+  getUsernamesAndFollowingOld: UsernamesAndFollowingResponse;
   getVideo: VideoGql;
   getVideoMakePercentageIntervals: Array<MakePercentageIntervalGql>;
   getVideos: Array<VideoGql>;
@@ -2246,6 +2247,13 @@ export type QueryGetUsernamesAndFollowingArgs = {
   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"];
@@ -2508,11 +2516,11 @@ export type UserGql = {
   activeVideoId?: Maybe<Scalars["Int"]["output"]>;
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
   fargoRating?: Maybe<Scalars["Int"]["output"]>;
-  firebaseUid: Scalars["String"]["output"];
+  firebaseUid?: Maybe<Scalars["String"]["output"]>;
   followers?: Maybe<Array<Scalars["Int"]["output"]>>;
   following?: Maybe<Array<Scalars["Int"]["output"]>>;
   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"];
@@ -2527,7 +2535,7 @@ export type UsernamesAndFollowingResponse = {
   __typename?: "UsernamesAndFollowingResponse";
   followers: Array<Scalars["Int"]["output"]>;
   following: Array<Scalars["Int"]["output"]>;
-  usernames: Array<Scalars["String"]["output"]>;
+  users: Array<UserGql>;
 };
 
 export type VideoFilterInput = {
@@ -3089,7 +3097,7 @@ export type EditProfileImageUriMutation = {
   editProfileImageUri: {
     __typename?: "UserGQL";
     id: number;
-    firebaseUid: string;
+    firebaseUid?: string | null;
     username: string;
     profileImageUri?: string | null;
     createdAt?: any | null;
@@ -3104,9 +3112,9 @@ export type GetLoggedInUserQuery = {
   getLoggedInUser?: {
     __typename?: "UserGQL";
     id: number;
-    firebaseUid: string;
+    firebaseUid?: string | null;
     username: string;
-    isAdmin: boolean;
+    isAdmin?: boolean | null;
     profileImageUri?: string | null;
     activeVideoId?: number | null;
     createdAt?: any | null;
@@ -3147,7 +3155,6 @@ export type GetUsernamesAndFollowingQuery = {
     __typename?: "UsernamesAndFollowingResponse";
     followers: Array<number>;
     following: Array<number>;
-    usernames: Array<string>;
   };
 };
 
@@ -3276,7 +3283,7 @@ export type GetVideoDetailsQuery = {
     owner?: {
       __typename?: "UserGQL";
       id: number;
-      firebaseUid: string;
+      firebaseUid?: string | null;
       username: string;
       profileImageUri?: string | null;
     } | null;
@@ -5139,7 +5146,6 @@ export const GetUsernamesAndFollowingDocument = gql`
     ) {
       followers
       following
-      usernames
     }
   }
 `;

src/operations/user.gql

@@ -71,7 +71,6 @@ query getUsernamesAndFollowing(
   ) {
     followers
     following
-    usernamesAndIds
   }
 }
 

src/schema.gql

@@ -41,6 +41,12 @@ type Query {
     limit: Int = 100
     after: String = null
   ): UsernamesAndFollowingResponse!
+  getUsernamesAndFollowingOld(
+    userId: Int!
+    matchString: String = null
+    limit: Int = 100
+    after: String = null
+  ): UsernamesAndFollowingResponse!
   getPlayTime(userId: Int!): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
@@ -341,9 +347,9 @@ type SerializedShotPathsGQL {
 
 type UserGQL {
   id: Int!
-  firebaseUid: String!
+  firebaseUid: String
   username: String!
-  isAdmin: Boolean!
+  isAdmin: Boolean
   fargoRating: Int
   activeVideoId: Int
   profileImageUri: String
@@ -555,7 +561,7 @@ input CreatedAfter @oneOf {
 }
 
 type UsernamesAndFollowingResponse {
-  usernames: [String!]!
+  users: [UserGQL!]!
   following: [Int!]!
   followers: [Int!]!
 }