Merge pull request 'dean/add-home-feed-option' (#208) from dean/add-home-feed-option into master

Reviewed-on: #208
This commit is contained in:
2025-11-10 22:09:09 +00:00
5 changed files with 43 additions and 159 deletions

View File

@@ -3178,6 +3178,7 @@ export type UserGql = {
following?: Maybe<Array<UserGql>>; following?: Maybe<Array<UserGql>>;
id: Scalars["Int"]["output"]; id: Scalars["Int"]["output"];
isAdmin?: Maybe<Scalars["Boolean"]["output"]>; isAdmin?: Maybe<Scalars["Boolean"]["output"]>;
isFollowedByCurrentUser?: Maybe<Scalars["Boolean"]["output"]>;
profileImageUri?: Maybe<Scalars["String"]["output"]>; profileImageUri?: Maybe<Scalars["String"]["output"]>;
stripeCustomerId?: Maybe<Scalars["String"]["output"]>; stripeCustomerId?: Maybe<Scalars["String"]["output"]>;
updatedAt?: Maybe<Scalars["DateTime"]["output"]>; updatedAt?: Maybe<Scalars["DateTime"]["output"]>;
@@ -3227,16 +3228,25 @@ export type VideoFeedInputGql =
| { | {
allUsers: Scalars["Boolean"]["input"]; allUsers: Scalars["Boolean"]["input"];
followedByUserId?: never; followedByUserId?: never;
home?: never;
userId?: never; userId?: never;
} }
| { | {
allUsers?: never; allUsers?: never;
followedByUserId: Scalars["Int"]["input"]; followedByUserId: Scalars["Int"]["input"];
home?: never;
userId?: never; userId?: never;
} }
| { | {
allUsers?: never; allUsers?: never;
followedByUserId?: never; followedByUserId?: never;
home: Scalars["Boolean"]["input"];
userId?: never;
}
| {
allUsers?: never;
followedByUserId?: never;
home?: never;
userId: Scalars["Int"]["input"]; userId: Scalars["Int"]["input"];
}; };
@@ -3536,12 +3546,7 @@ export type GetFeedQuery = {
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
followers?: Array<{ isFollowedByCurrentUser?: boolean | null;
__typename?: "UserGQL";
id: number;
username: string;
profileImageUri?: string | null;
}> | null;
}; };
}>; }>;
comments: Array<{ comments: Array<{
@@ -3553,12 +3558,7 @@ export type GetFeedQuery = {
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
followers?: Array<{ isFollowedByCurrentUser?: boolean | null;
__typename?: "UserGQL";
id: number;
username: string;
profileImageUri?: string | null;
}> | null;
}; };
replies: Array<{ replies: Array<{
__typename?: "CommentGQL"; __typename?: "CommentGQL";
@@ -3569,12 +3569,7 @@ export type GetFeedQuery = {
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
followers?: Array<{ isFollowedByCurrentUser?: boolean | null;
__typename?: "UserGQL";
id: number;
username: string;
profileImageUri?: string | null;
}> | null;
}; };
}>; }>;
}>; }>;
@@ -3592,12 +3587,7 @@ export type UserSocialsFieldsFragment = {
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
followers?: Array<{ isFollowedByCurrentUser?: boolean | null;
__typename?: "UserGQL";
id: number;
username: string;
profileImageUri?: string | null;
}> | null;
}; };
export type VideoCardFieldsFragment = { export type VideoCardFieldsFragment = {
@@ -3654,12 +3644,7 @@ export type VideoCardFieldsFragment = {
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
followers?: Array<{ isFollowedByCurrentUser?: boolean | null;
__typename?: "UserGQL";
id: number;
username: string;
profileImageUri?: string | null;
}> | null;
}; };
}>; }>;
comments: Array<{ comments: Array<{
@@ -3671,12 +3656,7 @@ export type VideoCardFieldsFragment = {
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
followers?: Array<{ isFollowedByCurrentUser?: boolean | null;
__typename?: "UserGQL";
id: number;
username: string;
profileImageUri?: string | null;
}> | null;
}; };
replies: Array<{ replies: Array<{
__typename?: "CommentGQL"; __typename?: "CommentGQL";
@@ -3687,12 +3667,7 @@ export type VideoCardFieldsFragment = {
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
followers?: Array<{ isFollowedByCurrentUser?: boolean | null;
__typename?: "UserGQL";
id: number;
username: string;
profileImageUri?: string | null;
}> | null;
}; };
}>; }>;
}>; }>;
@@ -3711,6 +3686,7 @@ export type GetVideoFeedQuery = {
__typename?: "Query"; __typename?: "Query";
getFeedVideos: { getFeedVideos: {
__typename?: "VideoHistoryGQL"; __typename?: "VideoHistoryGQL";
hasFollowing: boolean;
videos: Array<{ videos: Array<{
__typename?: "VideoGQL"; __typename?: "VideoGQL";
id: number; id: number;
@@ -3768,12 +3744,7 @@ export type GetVideoFeedQuery = {
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
followers?: Array<{ isFollowedByCurrentUser?: boolean | null;
__typename?: "UserGQL";
id: number;
username: string;
profileImageUri?: string | null;
}> | null;
}; };
}>; }>;
comments: Array<{ comments: Array<{
@@ -3785,12 +3756,7 @@ export type GetVideoFeedQuery = {
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
followers?: Array<{ isFollowedByCurrentUser?: boolean | null;
__typename?: "UserGQL";
id: number;
username: string;
profileImageUri?: string | null;
}> | null;
}; };
replies: Array<{ replies: Array<{
__typename?: "CommentGQL"; __typename?: "CommentGQL";
@@ -3801,12 +3767,7 @@ export type GetVideoFeedQuery = {
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
followers?: Array<{ isFollowedByCurrentUser?: boolean | null;
__typename?: "UserGQL";
id: number;
username: string;
profileImageUri?: string | null;
}> | null;
}; };
}>; }>;
}>; }>;
@@ -4973,21 +4934,7 @@ export type FollowUserMutationVariables = Exact<{
export type FollowUserMutation = { export type FollowUserMutation = {
__typename?: "Mutation"; __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<{ export type UnfollowUserMutationVariables = Exact<{
@@ -4996,21 +4943,7 @@ export type UnfollowUserMutationVariables = Exact<{
export type UnfollowUserMutation = { export type UnfollowUserMutation = {
__typename?: "Mutation"; __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<{ export type GetUserFollowingFollowersQueryVariables = Exact<{
@@ -5027,12 +4960,14 @@ export type GetUserFollowingFollowersQuery = {
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
isFollowedByCurrentUser?: boolean | null;
}> | null; }> | null;
followers?: Array<{ followers?: Array<{
__typename?: "UserGQL"; __typename?: "UserGQL";
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
isFollowedByCurrentUser?: boolean | null;
}> | null; }> | null;
} | null; } | null;
}; };
@@ -5258,12 +5193,7 @@ export type GetVideoSocialDetailsByIdQuery = {
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
followers?: Array<{ isFollowedByCurrentUser?: boolean | null;
__typename?: "UserGQL";
id: number;
username: string;
profileImageUri?: string | null;
}> | null;
}; };
}>; }>;
comments: Array<{ comments: Array<{
@@ -5275,12 +5205,7 @@ export type GetVideoSocialDetailsByIdQuery = {
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
followers?: Array<{ isFollowedByCurrentUser?: boolean | null;
__typename?: "UserGQL";
id: number;
username: string;
profileImageUri?: string | null;
}> | null;
}; };
replies: Array<{ replies: Array<{
__typename?: "CommentGQL"; __typename?: "CommentGQL";
@@ -5291,12 +5216,7 @@ export type GetVideoSocialDetailsByIdQuery = {
id: number; id: number;
username: string; username: string;
profileImageUri?: string | null; profileImageUri?: string | null;
followers?: Array<{ isFollowedByCurrentUser?: boolean | null;
__typename?: "UserGQL";
id: number;
username: string;
profileImageUri?: string | null;
}> | null;
}; };
}>; }>;
}>; }>;
@@ -5884,11 +5804,7 @@ export const UserSocialsFieldsFragmentDoc = gql`
id id
username username
profileImageUri profileImageUri
followers { isFollowedByCurrentUser
id
username
profileImageUri
}
} }
`; `;
export const VideoCardFieldsFragmentDoc = gql` export const VideoCardFieldsFragmentDoc = gql`
@@ -6793,6 +6709,7 @@ export const GetVideoFeedDocument = gql`
hasNextPage hasNextPage
endCursor endCursor
} }
hasFollowing
} }
} }
${VideoCardFieldsFragmentDoc} ${VideoCardFieldsFragmentDoc}
@@ -9567,16 +9484,8 @@ export type GetUserTagsQueryResult = Apollo.QueryResult<
export const FollowUserDocument = gql` export const FollowUserDocument = gql`
mutation followUser($followedUserId: Int!) { mutation followUser($followedUserId: Int!) {
followUser(followedUserId: $followedUserId) { followUser(followedUserId: $followedUserId) {
username
id id
following { username
id
username
}
followers {
id
username
}
} }
} }
`; `;
@@ -9626,16 +9535,8 @@ export type FollowUserMutationOptions = Apollo.BaseMutationOptions<
export const UnfollowUserDocument = gql` export const UnfollowUserDocument = gql`
mutation unfollowUser($followedUserId: Int!) { mutation unfollowUser($followedUserId: Int!) {
unfollowUser(followedUserId: $followedUserId) { unfollowUser(followedUserId: $followedUserId) {
username
id id
following { username
id
username
}
followers {
id
username
}
} }
} }
`; `;
@@ -9690,11 +9591,13 @@ export const GetUserFollowingFollowersDocument = gql`
id id
username username
profileImageUri profileImageUri
isFollowedByCurrentUser
} }
followers { followers {
id id
username username
profileImageUri profileImageUri
isFollowedByCurrentUser
} }
} }
} }

View File

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

View File

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

View File

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

View File

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