add fargoRating in user operations

Reviewed-on: #96

pyproject.toml

@@ -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"
 
 

src/index.tsx

@@ -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,9 +3110,9 @@ 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;
@@ -3135,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 };
+    }>;
   };
 };
 
@@ -3159,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"]>;
@@ -3277,7 +3304,7 @@ export type GetVideoDetailsQuery = {
     owner?: {
       __typename?: "UserGQL";
       id: number;
-      firebaseUid: string;
+      firebaseUid?: string | null;
       username: string;
       profileImageUri?: string | null;
     } | null;
@@ -5126,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'
@@ -5165,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 {
@@ -5285,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) {

src/operations/user.gql

@@ -58,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
+    }
   }
 }
 
@@ -82,3 +87,15 @@ query GetUserTags {
     name
   }
 }
+
+mutation followUser($followedUserId: Int!) {
+  followUser(followedUserId: $followedUserId) {
+    username
+  }
+}
+
+mutation unfollowUser($followedUserId: Int!) {
+  unfollowUser(followedUserId: $followedUserId) {
+    username
+  }
+}

src/schema.gql

@@ -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 {