Compare commits

...

19 Commits

Author SHA1 Message Date
1e53dc21ee add fargoRating in user operations
All checks were successful
Tests / Tests (pull_request) Successful in 9s
2024-10-28 16:00:11 -07:00
5c5014339f Allow python 3.12 2024-10-28 02:24:24 -06:00
84188a6066 Merge pull request 'Return username in follow unfollow' (#96) from kat/return-username into master
Reviewed-on: #96
2024-10-27 19:19:41 -06:00
7c7be319d1 Return username in follow unfollow
All checks were successful
Tests / Tests (pull_request) Successful in 9s
2024-10-27 19:18:57 -06:00
79784faba1 Merge pull request 'Follow and unfollow mutation' (#95) from kat/user-relationships-result into master
Reviewed-on: #95
2024-10-27 13:53:22 -06:00
f3ea44755c Follow, unfollow mutation
All checks were successful
Tests / Tests (pull_request) Successful in 8s
2024-10-27 12:22:22 -06:00
9b6559559c Use clearer names in the fields of GetUserRelationshipsMatching 2024-10-25 16:58:21 -06:00
2398216bf2 Replace GetUsernamesAndRelationships with GetUserRelationshipsMatching 2024-10-25 02:45:07 -06:00
d942b91d17 Merge pull request 'Update get user and following response' (#94) from kat/update-gql-v2 into master
Reviewed-on: #94
2024-10-25 01:28:03 -06:00
24d9b9225e Update get user and following response
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-10-25 01:27:14 -06:00
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
4609af726b Delete user with ids
All checks were successful
Tests / Tests (pull_request) Successful in 9s
2024-10-25 01:07:23 -06:00
c5919c90d0 User UserGQL in response 2024-10-25 00:31:29 -06:00
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
b40554d38d Update get usernames ids
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-10-25 00:16:59 -06:00
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
3adc301935 Add subfields to usernames and following
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-10-24 23:49:47 -06:00
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
c2cb411469 Return usernamesAndIds
All checks were successful
Tests / Tests (pull_request) Successful in 16s
2024-10-24 23:41:52 -06:00
4 changed files with 238 additions and 81 deletions

View File

@ -7,7 +7,7 @@ readme = "README.md"
packages = [{include = "rbproto"}]
[tool.poetry.dependencies]
python = ">=3.10,<3.12"
python = ">=3.10,<=3.13"
protobuf = "^4.25.3"

View File

@ -2166,10 +2166,10 @@ export type Query = {
getShotsByIds: Array<ShotGql>;
getShotsWithMetadata: GetShotsResult;
getUser?: Maybe<UserGql>;
getUserRelationshipsMatching: UserRelationshipsResult;
getUserTags: Array<TagGql>;
getUserVideos: VideoHistoryGql;
getUsernames: Array<Scalars["String"]["output"]>;
getUsernamesAndFollowing: UsernamesAndFollowingResponse;
getVideo: VideoGql;
getVideoMakePercentageIntervals: Array<MakePercentageIntervalGql>;
getVideos: Array<VideoGql>;
@ -2226,6 +2226,13 @@ export type QueryGetUserArgs = {
userId: Scalars["Int"]["input"];
};
export type QueryGetUserRelationshipsMatchingArgs = {
after?: InputMaybe<Scalars["String"]["input"]>;
limit?: InputMaybe<Scalars["Int"]["input"]>;
matchString?: InputMaybe<Scalars["String"]["input"]>;
userId: Scalars["Int"]["input"];
};
export type QueryGetUserVideosArgs = {
after?: InputMaybe<Scalars["String"]["input"]>;
filters?: InputMaybe<VideoFilterInput>;
@ -2239,13 +2246,6 @@ export type QueryGetUsernamesArgs = {
matchString?: InputMaybe<Scalars["String"]["input"]>;
};
export type QueryGetUsernamesAndFollowingArgs = {
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 +2508,11 @@ export type UserGql = {
activeVideoId?: Maybe<Scalars["Int"]["output"]>;
createdAt?: Maybe<Scalars["DateTime"]["output"]>;
fargoRating?: Maybe<Scalars["Int"]["output"]>;
firebaseUid: Scalars["String"]["output"];
followers?: Maybe<Array<Scalars["Int"]["output"]>>;
following?: Maybe<Array<Scalars["Int"]["output"]>>;
firebaseUid?: Maybe<Scalars["String"]["output"]>;
followers?: Maybe<Array<UserGql>>;
following?: Maybe<Array<UserGql>>;
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"];
@ -2523,11 +2523,17 @@ export type UserPlayTimeGql = {
totalSeconds: Scalars["Float"]["output"];
};
export type UsernamesAndFollowingResponse = {
__typename?: "UsernamesAndFollowingResponse";
followers: Array<Scalars["Int"]["output"]>;
following: Array<Scalars["Int"]["output"]>;
usernames: Array<Scalars["String"]["output"]>;
export type UserRelationship = {
__typename?: "UserRelationship";
toUser: UserGql;
toUserFollows: Scalars["Boolean"]["output"];
toUserIsFollowedBy: Scalars["Boolean"]["output"];
};
export type UserRelationshipsResult = {
__typename?: "UserRelationshipsResult";
inquiringUser: UserGql;
relationships: Array<UserRelationship>;
};
export type VideoFilterInput = {
@ -3089,7 +3095,7 @@ export type EditProfileImageUriMutation = {
editProfileImageUri: {
__typename?: "UserGQL";
id: number;
firebaseUid: string;
firebaseUid?: string | null;
username: string;
profileImageUri?: string | null;
createdAt?: any | null;
@ -3104,10 +3110,11 @@ export type GetLoggedInUserQuery = {
getLoggedInUser?: {
__typename?: "UserGQL";
id: number;
firebaseUid: string;
firebaseUid?: string | null;
username: string;
isAdmin: boolean;
isAdmin?: boolean | null;
profileImageUri?: string | null;
fargoRating?: number | null;
activeVideoId?: number | null;
createdAt?: any | null;
updatedAt?: any | null;
@ -3134,20 +3141,23 @@ export type GetUsernamesQuery = {
getUsernames: Array<string>;
};
export type GetUsernamesAndFollowingQueryVariables = Exact<{
export type GetUserRelationshipsMatchingQueryVariables = Exact<{
userId: Scalars["Int"]["input"];
matchString: Scalars["String"]["input"];
limit?: InputMaybe<Scalars["Int"]["input"]>;
after?: InputMaybe<Scalars["String"]["input"]>;
}>;
export type GetUsernamesAndFollowingQuery = {
export type GetUserRelationshipsMatchingQuery = {
__typename?: "Query";
getUsernamesAndFollowing: {
__typename?: "UsernamesAndFollowingResponse";
followers: Array<number>;
following: Array<number>;
usernames: Array<string>;
getUserRelationshipsMatching: {
__typename?: "UserRelationshipsResult";
relationships: Array<{
__typename?: "UserRelationship";
toUserFollows: boolean;
toUserIsFollowedBy: boolean;
toUser: { __typename?: "UserGQL"; username: string; id: number };
}>;
};
};
@ -3158,6 +3168,24 @@ export type GetUserTagsQuery = {
getUserTags: Array<{ __typename?: "TagGQL"; id: number; name: string }>;
};
export type FollowUserMutationVariables = Exact<{
followedUserId: Scalars["Int"]["input"];
}>;
export type FollowUserMutation = {
__typename?: "Mutation";
followUser: { __typename?: "UserGQL"; username: string };
};
export type UnfollowUserMutationVariables = Exact<{
followedUserId: Scalars["Int"]["input"];
}>;
export type UnfollowUserMutation = {
__typename?: "Mutation";
unfollowUser: { __typename?: "UserGQL"; username: string };
};
export type GetStreamMonitoringDetailsQueryVariables = Exact<{
videoId: Scalars["Int"]["input"];
debuggingJson?: InputMaybe<Scalars["JSON"]["input"]>;
@ -3276,7 +3304,7 @@ export type GetVideoDetailsQuery = {
owner?: {
__typename?: "UserGQL";
id: number;
firebaseUid: string;
firebaseUid?: string | null;
username: string;
profileImageUri?: string | null;
} | null;
@ -4903,6 +4931,7 @@ export const GetLoggedInUserDocument = gql`
username
isAdmin
profileImageUri
fargoRating
activeVideoId
createdAt
updatedAt
@ -5124,37 +5153,42 @@ export type GetUsernamesQueryResult = Apollo.QueryResult<
GetUsernamesQuery,
GetUsernamesQueryVariables
>;
export const GetUsernamesAndFollowingDocument = gql`
query getUsernamesAndFollowing(
export const GetUserRelationshipsMatchingDocument = gql`
query getUserRelationshipsMatching(
$userId: Int!
$matchString: String!
$limit: Int = null
$after: String = null
) {
getUsernamesAndFollowing(
getUserRelationshipsMatching(
userId: $userId
matchString: $matchString
limit: $limit
after: $after
) {
followers
following
usernames
relationships {
toUser {
username
id
}
toUserFollows
toUserIsFollowedBy
}
}
}
`;
/**
* __useGetUsernamesAndFollowingQuery__
* __useGetUserRelationshipsMatchingQuery__
*
* To run a query within a React component, call `useGetUsernamesAndFollowingQuery` and pass it any options that fit your needs.
* When your component renders, `useGetUsernamesAndFollowingQuery` returns an object from Apollo Client that contains loading, error, and data properties
* To run a query within a React component, call `useGetUserRelationshipsMatchingQuery` and pass it any options that fit your needs.
* When your component renders, `useGetUserRelationshipsMatchingQuery` returns an object from Apollo Client that contains loading, error, and data properties
* you can use to render your UI.
*
* @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
*
* @example
* const { data, loading, error } = useGetUsernamesAndFollowingQuery({
* const { data, loading, error } = useGetUserRelationshipsMatchingQuery({
* variables: {
* userId: // value for 'userId'
* matchString: // value for 'matchString'
@ -5163,54 +5197,54 @@ export const GetUsernamesAndFollowingDocument = gql`
* },
* });
*/
export function useGetUsernamesAndFollowingQuery(
export function useGetUserRelationshipsMatchingQuery(
baseOptions: Apollo.QueryHookOptions<
GetUsernamesAndFollowingQuery,
GetUsernamesAndFollowingQueryVariables
GetUserRelationshipsMatchingQuery,
GetUserRelationshipsMatchingQueryVariables
>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useQuery<
GetUsernamesAndFollowingQuery,
GetUsernamesAndFollowingQueryVariables
>(GetUsernamesAndFollowingDocument, options);
GetUserRelationshipsMatchingQuery,
GetUserRelationshipsMatchingQueryVariables
>(GetUserRelationshipsMatchingDocument, options);
}
export function useGetUsernamesAndFollowingLazyQuery(
export function useGetUserRelationshipsMatchingLazyQuery(
baseOptions?: Apollo.LazyQueryHookOptions<
GetUsernamesAndFollowingQuery,
GetUsernamesAndFollowingQueryVariables
GetUserRelationshipsMatchingQuery,
GetUserRelationshipsMatchingQueryVariables
>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useLazyQuery<
GetUsernamesAndFollowingQuery,
GetUsernamesAndFollowingQueryVariables
>(GetUsernamesAndFollowingDocument, options);
GetUserRelationshipsMatchingQuery,
GetUserRelationshipsMatchingQueryVariables
>(GetUserRelationshipsMatchingDocument, options);
}
export function useGetUsernamesAndFollowingSuspenseQuery(
export function useGetUserRelationshipsMatchingSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<
GetUsernamesAndFollowingQuery,
GetUsernamesAndFollowingQueryVariables
GetUserRelationshipsMatchingQuery,
GetUserRelationshipsMatchingQueryVariables
>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<
GetUsernamesAndFollowingQuery,
GetUsernamesAndFollowingQueryVariables
>(GetUsernamesAndFollowingDocument, options);
GetUserRelationshipsMatchingQuery,
GetUserRelationshipsMatchingQueryVariables
>(GetUserRelationshipsMatchingDocument, options);
}
export type GetUsernamesAndFollowingQueryHookResult = ReturnType<
typeof useGetUsernamesAndFollowingQuery
export type GetUserRelationshipsMatchingQueryHookResult = ReturnType<
typeof useGetUserRelationshipsMatchingQuery
>;
export type GetUsernamesAndFollowingLazyQueryHookResult = ReturnType<
typeof useGetUsernamesAndFollowingLazyQuery
export type GetUserRelationshipsMatchingLazyQueryHookResult = ReturnType<
typeof useGetUserRelationshipsMatchingLazyQuery
>;
export type GetUsernamesAndFollowingSuspenseQueryHookResult = ReturnType<
typeof useGetUsernamesAndFollowingSuspenseQuery
export type GetUserRelationshipsMatchingSuspenseQueryHookResult = ReturnType<
typeof useGetUserRelationshipsMatchingSuspenseQuery
>;
export type GetUsernamesAndFollowingQueryResult = Apollo.QueryResult<
GetUsernamesAndFollowingQuery,
GetUsernamesAndFollowingQueryVariables
export type GetUserRelationshipsMatchingQueryResult = Apollo.QueryResult<
GetUserRelationshipsMatchingQuery,
GetUserRelationshipsMatchingQueryVariables
>;
export const GetUserTagsDocument = gql`
query GetUserTags {
@ -5283,6 +5317,106 @@ export type GetUserTagsQueryResult = Apollo.QueryResult<
GetUserTagsQuery,
GetUserTagsQueryVariables
>;
export const FollowUserDocument = gql`
mutation followUser($followedUserId: Int!) {
followUser(followedUserId: $followedUserId) {
username
}
}
`;
export type FollowUserMutationFn = Apollo.MutationFunction<
FollowUserMutation,
FollowUserMutationVariables
>;
/**
* __useFollowUserMutation__
*
* To run a mutation, you first call `useFollowUserMutation` within a React component and pass it any options that fit your needs.
* When your component renders, `useFollowUserMutation` returns a tuple that includes:
* - A mutate function that you can call at any time to execute the mutation
* - An object with fields that represent the current status of the mutation's execution
*
* @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
*
* @example
* const [followUserMutation, { data, loading, error }] = useFollowUserMutation({
* variables: {
* followedUserId: // value for 'followedUserId'
* },
* });
*/
export function useFollowUserMutation(
baseOptions?: Apollo.MutationHookOptions<
FollowUserMutation,
FollowUserMutationVariables
>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useMutation<FollowUserMutation, FollowUserMutationVariables>(
FollowUserDocument,
options,
);
}
export type FollowUserMutationHookResult = ReturnType<
typeof useFollowUserMutation
>;
export type FollowUserMutationResult =
Apollo.MutationResult<FollowUserMutation>;
export type FollowUserMutationOptions = Apollo.BaseMutationOptions<
FollowUserMutation,
FollowUserMutationVariables
>;
export const UnfollowUserDocument = gql`
mutation unfollowUser($followedUserId: Int!) {
unfollowUser(followedUserId: $followedUserId) {
username
}
}
`;
export type UnfollowUserMutationFn = Apollo.MutationFunction<
UnfollowUserMutation,
UnfollowUserMutationVariables
>;
/**
* __useUnfollowUserMutation__
*
* To run a mutation, you first call `useUnfollowUserMutation` within a React component and pass it any options that fit your needs.
* When your component renders, `useUnfollowUserMutation` returns a tuple that includes:
* - A mutate function that you can call at any time to execute the mutation
* - An object with fields that represent the current status of the mutation's execution
*
* @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
*
* @example
* const [unfollowUserMutation, { data, loading, error }] = useUnfollowUserMutation({
* variables: {
* followedUserId: // value for 'followedUserId'
* },
* });
*/
export function useUnfollowUserMutation(
baseOptions?: Apollo.MutationHookOptions<
UnfollowUserMutation,
UnfollowUserMutationVariables
>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useMutation<
UnfollowUserMutation,
UnfollowUserMutationVariables
>(UnfollowUserDocument, options);
}
export type UnfollowUserMutationHookResult = ReturnType<
typeof useUnfollowUserMutation
>;
export type UnfollowUserMutationResult =
Apollo.MutationResult<UnfollowUserMutation>;
export type UnfollowUserMutationOptions = Apollo.BaseMutationOptions<
UnfollowUserMutation,
UnfollowUserMutationVariables
>;
export const GetStreamMonitoringDetailsDocument = gql`
query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
getVideo(videoId: $videoId, debuggingJson: $debuggingJson) {

View File

@ -37,6 +37,7 @@ query getLoggedInUser {
username
isAdmin
profileImageUri
fargoRating
activeVideoId
createdAt
updatedAt
@ -57,21 +58,26 @@ query getUsernames(
getUsernames(matchString: $matchString, limit: $limit, after: $after)
}
query getUsernamesAndFollowing(
query getUserRelationshipsMatching(
$userId: Int!
$matchString: String!
$limit: Int = null
$after: String = null
) {
getUsernamesAndFollowing(
getUserRelationshipsMatching(
userId: $userId
matchString: $matchString
limit: $limit
after: $after
) {
followers
following
usernames
relationships {
toUser {
username
id
}
toUserFollows
toUserIsFollowedBy
}
}
}
@ -81,3 +87,15 @@ query GetUserTags {
name
}
}
mutation followUser($followedUserId: Int!) {
followUser(followedUserId: $followedUserId) {
username
}
}
mutation unfollowUser($followedUserId: Int!) {
unfollowUser(followedUserId: $followedUserId) {
username
}
}

View File

@ -35,12 +35,12 @@ type Query {
limit: Int = null
after: String = null
): [String!]!
getUsernamesAndFollowing(
getUserRelationshipsMatching(
userId: Int!
matchString: String = null
limit: Int = 100
after: String = null
): UsernamesAndFollowingResponse!
): UserRelationshipsResult!
getPlayTime(userId: Int!): UserPlayTimeGQL!
getUserVideos(
userId: Int = null
@ -341,16 +341,16 @@ type SerializedShotPathsGQL {
type UserGQL {
id: Int!
firebaseUid: String!
firebaseUid: String
username: String!
isAdmin: Boolean!
isAdmin: Boolean
fargoRating: Int
activeVideoId: Int
profileImageUri: String
createdAt: DateTime
updatedAt: DateTime
following: [Int!]
followers: [Int!]
following: [UserGQL!]
followers: [UserGQL!]
}
type ShotAnnotationGQL {
@ -554,10 +554,15 @@ input CreatedAfter @oneOf {
createdAt: DateTime
}
type UsernamesAndFollowingResponse {
usernames: [String!]!
following: [Int!]!
followers: [Int!]!
type UserRelationshipsResult {
inquiringUser: UserGQL!
relationships: [UserRelationship!]!
}
type UserRelationship {
toUser: UserGQL!
toUserFollows: Boolean!
toUserIsFollowedBy: Boolean!
}
type UserPlayTimeGQL {