Update get user and following response

Reviewed-on: #92

src/index.tsx

@@ -1886,12 +1886,6 @@ export type FloatShotOrdering = {
   startingAt?: InputMaybe<Scalars["Float"]["input"]>;
 };
 
-export type FollowingUser = {
-  __typename?: "FollowingUser";
-  id: Scalars["Int"]["output"];
-  username: Scalars["String"]["output"];
-};
-
 export type GetProfileUploadLinkErrors = {
   __typename?: "GetProfileUploadLinkErrors";
   error: TooManyProfileImageUploadsErr;
@@ -2514,11 +2508,11 @@ export type UserGql = {
   activeVideoId?: Maybe<Scalars["Int"]["output"]>;
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
   fargoRating?: Maybe<Scalars["Int"]["output"]>;
-  firebaseUid: Scalars["String"]["output"];
+  firebaseUid?: Maybe<Scalars["String"]["output"]>;
   followers?: Maybe<Array<Scalars["Int"]["output"]>>;
   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"];
@@ -2533,7 +2527,7 @@ export type UsernamesAndFollowingResponse = {
   __typename?: "UsernamesAndFollowingResponse";
   followers: Array<Scalars["Int"]["output"]>;
   following: Array<Scalars["Int"]["output"]>;
-  usernamesAndIds: Array<FollowingUser>;
+  users: Array<UserGql>;
 };
 
 export type VideoFilterInput = {
@@ -3095,7 +3089,7 @@ export type EditProfileImageUriMutation = {
   editProfileImageUri: {
     __typename?: "UserGQL";
     id: number;
-    firebaseUid: string;
+    firebaseUid?: string | null;
     username: string;
     profileImageUri?: string | null;
     createdAt?: any | null;
@@ -3110,9 +3104,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;
@@ -3153,11 +3147,6 @@ export type GetUsernamesAndFollowingQuery = {
     __typename?: "UsernamesAndFollowingResponse";
     followers: Array<number>;
     following: Array<number>;
-    usernamesAndIds: Array<{
-      __typename?: "FollowingUser";
-      username: string;
-      id: number;
-    }>;
   };
 };
 
@@ -3286,7 +3275,7 @@ export type GetVideoDetailsQuery = {
     owner?: {
       __typename?: "UserGQL";
       id: number;
-      firebaseUid: string;
+      firebaseUid?: string | null;
       username: string;
       profileImageUri?: string | null;
     } | null;
@@ -5149,10 +5138,6 @@ export const GetUsernamesAndFollowingDocument = gql`
     ) {
       followers
       following
-      usernamesAndIds {
-        username
-        id
-      }
     }
   }
 `;

src/operations/user.gql

@@ -71,10 +71,6 @@ query getUsernamesAndFollowing(
   ) {
     followers
     following
-    usernamesAndIds {
-      username
-      id
-    }
   }
 }
 

src/schema.gql

@@ -341,9 +341,9 @@ type SerializedShotPathsGQL {
 
 type UserGQL {
   id: Int!
-  firebaseUid: String!
+  firebaseUid: String
   username: String!
-  isAdmin: Boolean!
+  isAdmin: Boolean
   fargoRating: Int
   activeVideoId: Int
   profileImageUri: String
@@ -555,16 +555,11 @@ input CreatedAfter @oneOf {
 }
 
 type UsernamesAndFollowingResponse {
-  usernamesAndIds: [FollowingUser!]!
+  users: [UserGQL!]!
   following: [Int!]!
   followers: [Int!]!
 }
 
-type FollowingUser {
-  id: Int!
-  username: String!
-}
-
 type UserPlayTimeGQL {
   totalSeconds: Float!
 }