Update get user and following response

Merge pull request 'Delete user with ids' (#92 ) from kat/remove-user-ids into master
Reviewed-on: #92
2024-10-25 01:27:14 -06:00 · 2024-10-25 01:08:04 -06:00 · 2024-10-25 01:07:23 -06:00 · 2024-10-25 00:31:29 -06:00 · 2024-10-25 00:18:19 -06:00 · 2024-10-25 00:16:59 -06:00
4 changed files with 17 additions and 14 deletions
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -2508,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"];
@@ -2527,7 +2527,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 = {
@@ -2700,7 +2700,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;
@@ -3085,7 +3089,7 @@ export type EditProfileImageUriMutation = {
  editProfileImageUri: {
    __typename?: "UserGQL";
    id: number;
-    firebaseUid: string;
+    firebaseUid?: string | null;
    username: string;
    profileImageUri?: string | null;
    createdAt?: any | null;
@@ -3100,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;
@@ -3143,7 +3147,6 @@ export type GetUsernamesAndFollowingQuery = {
    __typename?: "UsernamesAndFollowingResponse";
    followers: Array<number>;
    following: Array<number>;
-    usernames: Array<string>;
  };
 };

@@ -3272,7 +3275,7 @@ export type GetVideoDetailsQuery = {
    owner?: {
      __typename?: "UserGQL";
      id: number;
-      firebaseUid: string;
+      firebaseUid?: string | null;
      username: string;
      profileImageUri?: string | null;
    } | null;
@@ -4053,6 +4056,7 @@ export const GetFeedDocument = gql`
        elapsedTime
        screenshotUri
        stream {
+          id
          isCompleted
        }
        tableSize
@@ -5134,7 +5138,6 @@ export const GetUsernamesAndFollowingDocument = gql`
    ) {
      followers
      following
-      usernames
    }
  }
 `;
--- a/src/operations/feed.gql
+++ b/src/operations/feed.gql
@@ -21,6 +21,7 @@ query GetFeed(
      elapsedTime
      screenshotUri
      stream {
+        id
        isCompleted
      }
      tableSize
--- a/src/operations/user.gql
+++ b/src/operations/user.gql
@@ -71,7 +71,6 @@ query getUsernamesAndFollowing(
  ) {
    followers
    following
-    usernames
  }
 }

--- a/src/schema.gql
+++ b/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,7 +555,7 @@ input CreatedAfter @oneOf {
 }

 type UsernamesAndFollowingResponse {
-  usernames: [String!]!
+  users: [UserGQL!]!
  following: [Int!]!
  followers: [Int!]!
 }
Author	SHA1	Message	Date
Kat Huang	24d9b9225e	Update get user and following response All checks were successful Tests / Tests (pull_request) Successful in 15s Details	2024-10-25 01:27:14 -06:00
Kat Huang	f6f6404302	Merge pull request 'Delete user with ids' (#92 ) from kat/remove-user-ids into master Reviewed-on: #92	2024-10-25 01:08:04 -06:00
Kat Huang	4609af726b	Delete user with ids All checks were successful Tests / Tests (pull_request) Successful in 9s Details	2024-10-25 01:07:23 -06:00
Kat Huang	c5919c90d0	User UserGQL in response	2024-10-25 00:31:29 -06:00
Kat Huang	605adc3293	Merge pull request 'Update get usernames ids' (#90 ) from kat/update-get-username-ids into master Reviewed-on: #90	2024-10-25 00:18:19 -06:00
Kat Huang	b40554d38d	Update get usernames ids All checks were successful Tests / Tests (pull_request) Successful in 15s Details	2024-10-25 00:16:59 -06:00
Kat Huang	194d7c66a0	Merge pull request 'Add subfields to usernames and following' (#89 ) from kat/usernames-following-response into master Reviewed-on: #89	2024-10-24 23:50:28 -06:00
Kat Huang	3adc301935	Add subfields to usernames and following All checks were successful Tests / Tests (pull_request) Successful in 15s Details	2024-10-24 23:49:47 -06:00
Kat Huang	9232c673e8	Merge pull request 'Return usernamesAndIds' (#88 ) from kat/update-usernames-and-following into master Reviewed-on: #88	2024-10-24 23:46:27 -06:00
Kat Huang	c2cb411469	Return usernamesAndIds All checks were successful Tests / Tests (pull_request) Successful in 16s Details	2024-10-24 23:41:52 -06:00
Volodymyr Smolianinov	44ddc732a1	Fix cache merge (#87 ) Co-authored-by: Kat Huang <kkathuang@gmail.com> Reviewed-on: #87 Co-authored-by: Volodymyr Smolianinov <voidozzer@gmail.com> Co-committed-by: Volodymyr Smolianinov <voidozzer@gmail.com>	2024-10-24 13:50:52 -06:00