Merge branch 'master' into dean/add-pocket-size-clean

src/index.tsx

@@ -3178,6 +3178,7 @@ export type UserGql = {
   following?: Maybe<Array<UserGql>>;
   id: Scalars["Int"]["output"];
   isAdmin?: Maybe<Scalars["Boolean"]["output"]>;
+  isFollowedByCurrentUser?: Maybe<Scalars["Boolean"]["output"]>;
   profileImageUri?: Maybe<Scalars["String"]["output"]>;
   stripeCustomerId?: Maybe<Scalars["String"]["output"]>;
   updatedAt?: Maybe<Scalars["DateTime"]["output"]>;
@@ -3227,16 +3228,25 @@ export type VideoFeedInputGql =
   | {
       allUsers: Scalars["Boolean"]["input"];
       followedByUserId?: never;
+      home?: never;
       userId?: never;
     }
   | {
       allUsers?: never;
       followedByUserId: Scalars["Int"]["input"];
+      home?: never;
       userId?: never;
     }
   | {
       allUsers?: never;
       followedByUserId?: never;
+      home: Scalars["Boolean"]["input"];
+      userId?: never;
+    }
+  | {
+      allUsers?: never;
+      followedByUserId?: never;
+      home?: never;
       userId: Scalars["Int"]["input"];
     };
 
@@ -3538,12 +3548,7 @@ export type GetFeedQuery = {
           id: number;
           username: string;
           profileImageUri?: string | null;
-          followers?: Array<{
+          isFollowedByCurrentUser?: boolean | null;
-            __typename?: "UserGQL";
-            id: number;
-            username: string;
-            profileImageUri?: string | null;
-          }> | null;
         };
       }>;
       comments: Array<{
@@ -3555,12 +3560,7 @@ export type GetFeedQuery = {
           id: number;
           username: string;
           profileImageUri?: string | null;
-          followers?: Array<{
+          isFollowedByCurrentUser?: boolean | null;
-            __typename?: "UserGQL";
-            id: number;
-            username: string;
-            profileImageUri?: string | null;
-          }> | null;
         };
         replies: Array<{
           __typename?: "CommentGQL";
@@ -3571,12 +3571,7 @@ export type GetFeedQuery = {
             id: number;
             username: string;
             profileImageUri?: string | null;
-            followers?: Array<{
+            isFollowedByCurrentUser?: boolean | null;
-              __typename?: "UserGQL";
-              id: number;
-              username: string;
-              profileImageUri?: string | null;
-            }> | null;
           };
         }>;
       }>;
@@ -3594,12 +3589,7 @@ export type UserSocialsFieldsFragment = {
   id: number;
   username: string;
   profileImageUri?: string | null;
-  followers?: Array<{
+  isFollowedByCurrentUser?: boolean | null;
-    __typename?: "UserGQL";
-    id: number;
-    username: string;
-    profileImageUri?: string | null;
-  }> | null;
 };
 
 export type VideoCardFieldsFragment = {
@@ -3656,12 +3646,7 @@ export type VideoCardFieldsFragment = {
       id: number;
       username: string;
       profileImageUri?: string | null;
-      followers?: Array<{
+      isFollowedByCurrentUser?: boolean | null;
-        __typename?: "UserGQL";
-        id: number;
-        username: string;
-        profileImageUri?: string | null;
-      }> | null;
     };
   }>;
   comments: Array<{
@@ -3673,12 +3658,7 @@ export type VideoCardFieldsFragment = {
       id: number;
       username: string;
       profileImageUri?: string | null;
-      followers?: Array<{
+      isFollowedByCurrentUser?: boolean | null;
-        __typename?: "UserGQL";
-        id: number;
-        username: string;
-        profileImageUri?: string | null;
-      }> | null;
     };
     replies: Array<{
       __typename?: "CommentGQL";
@@ -3689,12 +3669,7 @@ export type VideoCardFieldsFragment = {
         id: number;
         username: string;
         profileImageUri?: string | null;
-        followers?: Array<{
+        isFollowedByCurrentUser?: boolean | null;
-          __typename?: "UserGQL";
-          id: number;
-          username: string;
-          profileImageUri?: string | null;
-        }> | null;
       };
     }>;
   }>;
@@ -3713,6 +3688,7 @@ export type GetVideoFeedQuery = {
   __typename?: "Query";
   getFeedVideos: {
     __typename?: "VideoHistoryGQL";
+    hasFollowing: boolean;
     videos: Array<{
       __typename?: "VideoGQL";
       id: number;
@@ -3770,12 +3746,7 @@ export type GetVideoFeedQuery = {
           id: number;
           username: string;
           profileImageUri?: string | null;
-          followers?: Array<{
+          isFollowedByCurrentUser?: boolean | null;
-            __typename?: "UserGQL";
-            id: number;
-            username: string;
-            profileImageUri?: string | null;
-          }> | null;
         };
       }>;
       comments: Array<{
@@ -3787,12 +3758,7 @@ export type GetVideoFeedQuery = {
           id: number;
           username: string;
           profileImageUri?: string | null;
-          followers?: Array<{
+          isFollowedByCurrentUser?: boolean | null;
-            __typename?: "UserGQL";
-            id: number;
-            username: string;
-            profileImageUri?: string | null;
-          }> | null;
         };
         replies: Array<{
           __typename?: "CommentGQL";
@@ -3803,12 +3769,7 @@ export type GetVideoFeedQuery = {
             id: number;
             username: string;
             profileImageUri?: string | null;
-            followers?: Array<{
+            isFollowedByCurrentUser?: boolean | null;
-              __typename?: "UserGQL";
-              id: number;
-              username: string;
-              profileImageUri?: string | null;
-            }> | null;
           };
         }>;
       }>;
@@ -4975,21 +4936,7 @@ export type FollowUserMutationVariables = Exact<{
 
 export type FollowUserMutation = {
   __typename?: "Mutation";
-  followUser: {
+  followUser: { __typename?: "UserGQL"; id: number; username: string };
-    __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<{
@@ -4998,21 +4945,7 @@ export type UnfollowUserMutationVariables = Exact<{
 
 export type UnfollowUserMutation = {
   __typename?: "Mutation";
-  unfollowUser: {
+  unfollowUser: { __typename?: "UserGQL"; id: number; username: string };
-    __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<{
@@ -5029,12 +4962,14 @@ export type GetUserFollowingFollowersQuery = {
       id: number;
       username: string;
       profileImageUri?: string | null;
+      isFollowedByCurrentUser?: boolean | null;
     }> | null;
     followers?: Array<{
       __typename?: "UserGQL";
       id: number;
       username: string;
       profileImageUri?: string | null;
+      isFollowedByCurrentUser?: boolean | null;
     }> | null;
   } | null;
 };
@@ -5262,12 +5197,7 @@ export type GetVideoSocialDetailsByIdQuery = {
         id: number;
         username: string;
         profileImageUri?: string | null;
-        followers?: Array<{
+        isFollowedByCurrentUser?: boolean | null;
-          __typename?: "UserGQL";
-          id: number;
-          username: string;
-          profileImageUri?: string | null;
-        }> | null;
       };
     }>;
     comments: Array<{
@@ -5279,12 +5209,7 @@ export type GetVideoSocialDetailsByIdQuery = {
         id: number;
         username: string;
         profileImageUri?: string | null;
-        followers?: Array<{
+        isFollowedByCurrentUser?: boolean | null;
-          __typename?: "UserGQL";
-          id: number;
-          username: string;
-          profileImageUri?: string | null;
-        }> | null;
       };
       replies: Array<{
         __typename?: "CommentGQL";
@@ -5295,12 +5220,7 @@ export type GetVideoSocialDetailsByIdQuery = {
           id: number;
           username: string;
           profileImageUri?: string | null;
-          followers?: Array<{
+          isFollowedByCurrentUser?: boolean | null;
-            __typename?: "UserGQL";
-            id: number;
-            username: string;
-            profileImageUri?: string | null;
-          }> | null;
         };
       }>;
     }>;
@@ -5888,11 +5808,7 @@ export const UserSocialsFieldsFragmentDoc = gql`
     id
     username
     profileImageUri
-    followers {
+    isFollowedByCurrentUser
-      id
-      username
-      profileImageUri
-    }
   }
 `;
 export const VideoCardFieldsFragmentDoc = gql`
@@ -6797,6 +6713,7 @@ export const GetVideoFeedDocument = gql`
         hasNextPage
         endCursor
       }
+      hasFollowing
     }
   }
   ${VideoCardFieldsFragmentDoc}
@@ -9571,16 +9488,8 @@ export type GetUserTagsQueryResult = Apollo.QueryResult<
 export const FollowUserDocument = gql`
   mutation followUser($followedUserId: Int!) {
     followUser(followedUserId: $followedUserId) {
-      username
       id
-      following {
+      username
-        id
-        username
-      }
-      followers {
-        id
-        username
-      }
     }
   }
 `;
@@ -9630,16 +9539,8 @@ export type FollowUserMutationOptions = Apollo.BaseMutationOptions<
 export const UnfollowUserDocument = gql`
   mutation unfollowUser($followedUserId: Int!) {
     unfollowUser(followedUserId: $followedUserId) {
-      username
       id
-      following {
+      username
-        id
-        username
-      }
-      followers {
-        id
-        username
-      }
     }
   }
 `;
@@ -9694,11 +9595,13 @@ export const GetUserFollowingFollowersDocument = gql`
         id
         username
         profileImageUri
+        isFollowedByCurrentUser
       }
       followers {
         id
         username
         profileImageUri
+        isFollowedByCurrentUser
       }
     }
   }

src/operations/feed.gql

@@ -19,11 +19,7 @@ fragment UserSocialsFields on UserGQL {
   id
   username
   profileImageUri
-  followers {
+  isFollowedByCurrentUser
-    id
-    username
-    profileImageUri
-  }
 }
 
 fragment VideoCardFields on VideoGQL {
@@ -116,5 +112,6 @@ query GetVideoFeed(
       hasNextPage
       endCursor
     }
+    hasFollowing
   }
 }

src/operations/user.gql

@@ -88,31 +88,15 @@ query GetUserTags {
 
 mutation followUser($followedUserId: Int!) {
   followUser(followedUserId: $followedUserId) {
-    username
     id
-    following {
+    username
-      id
-      username
-    }
-    followers {
-      id
-      username
-    }
   }
 }
 
 mutation unfollowUser($followedUserId: Int!) {
   unfollowUser(followedUserId: $followedUserId) {
-    username
     id
-    following {
+    username
-      id
-      username
-    }
-    followers {
-      id
-      username
-    }
   }
 }
 
@@ -123,11 +107,13 @@ query getUserFollowingFollowers {
       id
       username
       profileImageUri
+      isFollowedByCurrentUser
     }
     followers {
       id
       username
       profileImageUri
+      isFollowedByCurrentUser
     }
   }
 }

src/operations/video.gql

@@ -88,11 +88,7 @@ fragment UserSocialsFields on UserGQL {
   id
   username
   profileImageUri
-  followers {
+  isFollowedByCurrentUser
-    id
-    username
-    profileImageUri
-  }
 }
 
 query GetVideoSocialDetailsById($videoId: Int!) {

src/schema.gql

@@ -375,6 +375,7 @@ type UserGQL {
   agreesToMarketing: Boolean
   following: [UserGQL!]
   followers: [UserGQL!]
+  isFollowedByCurrentUser: Boolean
 }
 
 type ShotGQL {
@@ -654,6 +655,7 @@ input VideoFeedInputGQL @oneOf {
   followedByUserId: Int
   userId: Int
   allUsers: Boolean
+  home: Boolean
 }
 
 type MakePercentageIntervalGQL {