Merge pull request 'Get user following followers' (#101) from kat/get-user-following-followers into master

Reviewed-on: #101

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

@@ -2804,14 +2804,14 @@ export type UpdateShotAnnotationsMutation = {
 
 export type GetShotsWithVideoGqlQueryVariables = Exact<{
   filterInput: FilterInput;
+  shotsOrdering?: InputMaybe<GetShotsOrdering>;
   limit?: InputMaybe<Scalars["Int"]["input"]>;
 }>;
 
 export type GetShotsWithVideoGqlQuery = {
   __typename?: "Query";
-  getShotsWithMetadata: {
+  getOrderedShots: {
     __typename?: "GetShotsResult";
-    ids: Array<number>;
     shots: Array<{
       __typename?: "ShotGQL";
       id: number;
@@ -3114,6 +3114,7 @@ export type GetLoggedInUserQuery = {
     username: string;
     isAdmin?: boolean | null;
     profileImageUri?: string | null;
+    fargoRating?: number | null;
     activeVideoId?: number | null;
     createdAt?: any | null;
     updatedAt?: any | null;
@@ -3175,7 +3176,9 @@ export type FollowUserMutation = {
   __typename?: "Mutation";
   followUser: {
     __typename?: "UserGQL";
-    followers?: Array<{ __typename?: "UserGQL"; username: string }> | null;
+    username: string;
+    following?: Array<{ __typename?: "UserGQL"; id: number }> | null;
+    followers?: Array<{ __typename?: "UserGQL"; id: number }> | null;
   };
 };
 
@@ -3187,10 +3190,34 @@ export type UnfollowUserMutation = {
   __typename?: "Mutation";
   unfollowUser: {
     __typename?: "UserGQL";
-    followers?: Array<{ __typename?: "UserGQL"; username: string }> | null;
+    username: string;
+    following?: Array<{ __typename?: "UserGQL"; id: number }> | null;
+    followers?: Array<{ __typename?: "UserGQL"; id: number }> | null;
   };
 };
 
+export type GetUserFollowingFollowersQueryVariables = Exact<{
+  [key: string]: never;
+}>;
+
+export type GetUserFollowingFollowersQuery = {
+  __typename?: "Query";
+  getLoggedInUser?: {
+    __typename?: "UserGQL";
+    id: number;
+    following?: Array<{
+      __typename?: "UserGQL";
+      id: number;
+      username: string;
+    }> | null;
+    followers?: Array<{
+      __typename?: "UserGQL";
+      id: number;
+      username: string;
+    }> | null;
+  } | null;
+};
+
 export type GetStreamMonitoringDetailsQueryVariables = Exact<{
   videoId: Scalars["Int"]["input"];
   debuggingJson?: InputMaybe<Scalars["JSON"]["input"]>;
@@ -4471,9 +4498,16 @@ export type UpdateShotAnnotationsMutationOptions = Apollo.BaseMutationOptions<
   UpdateShotAnnotationsMutationVariables
 >;
 export const GetShotsWithVideoGqlDocument = gql`
-  query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
+  query GetShotsWithVideoGql(
-    getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
+    $filterInput: FilterInput!
-      ids
+    $shotsOrdering: GetShotsOrdering
+    $limit: Int
+  ) {
+    getOrderedShots(
+      filterInput: $filterInput
+      shotsOrdering: $shotsOrdering
+      limit: $limit
+    ) {
       shots {
         id
         videoId
@@ -4499,6 +4533,7 @@ export const GetShotsWithVideoGqlDocument = gql`
  * const { data, loading, error } = useGetShotsWithVideoGqlQuery({
  *   variables: {
  *      filterInput: // value for 'filterInput'
+ *      shotsOrdering: // value for 'shotsOrdering'
  *      limit: // value for 'limit'
  *   },
  * });
@@ -4936,6 +4971,7 @@ export const GetLoggedInUserDocument = gql`
       username
       isAdmin
       profileImageUri
+      fargoRating
       activeVideoId
       createdAt
       updatedAt
@@ -5324,8 +5360,12 @@ export type GetUserTagsQueryResult = Apollo.QueryResult<
 export const FollowUserDocument = gql`
   mutation followUser($followedUserId: Int!) {
     followUser(followedUserId: $followedUserId) {
-      followers {
       username
+      following {
+        id
+      }
+      followers {
+        id
       }
     }
   }
@@ -5376,8 +5416,12 @@ export type FollowUserMutationOptions = Apollo.BaseMutationOptions<
 export const UnfollowUserDocument = gql`
   mutation unfollowUser($followedUserId: Int!) {
     unfollowUser(followedUserId: $followedUserId) {
-      followers {
       username
+      following {
+        id
+      }
+      followers {
+        id
       }
     }
   }
@@ -5425,6 +5469,86 @@ export type UnfollowUserMutationOptions = Apollo.BaseMutationOptions<
   UnfollowUserMutation,
   UnfollowUserMutationVariables
 >;
+export const GetUserFollowingFollowersDocument = gql`
+  query getUserFollowingFollowers {
+    getLoggedInUser {
+      id
+      following {
+        id
+        username
+      }
+      followers {
+        id
+        username
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetUserFollowingFollowersQuery__
+ *
+ * To run a query within a React component, call `useGetUserFollowingFollowersQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetUserFollowingFollowersQuery` 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 } = useGetUserFollowingFollowersQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useGetUserFollowingFollowersQuery(
+  baseOptions?: Apollo.QueryHookOptions<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >(GetUserFollowingFollowersDocument, options);
+}
+export function useGetUserFollowingFollowersLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >(GetUserFollowingFollowersDocument, options);
+}
+export function useGetUserFollowingFollowersSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >(GetUserFollowingFollowersDocument, options);
+}
+export type GetUserFollowingFollowersQueryHookResult = ReturnType<
+  typeof useGetUserFollowingFollowersQuery
+>;
+export type GetUserFollowingFollowersLazyQueryHookResult = ReturnType<
+  typeof useGetUserFollowingFollowersLazyQuery
+>;
+export type GetUserFollowingFollowersSuspenseQueryHookResult = ReturnType<
+  typeof useGetUserFollowingFollowersSuspenseQuery
+>;
+export type GetUserFollowingFollowersQueryResult = Apollo.QueryResult<
+  GetUserFollowingFollowersQuery,
+  GetUserFollowingFollowersQueryVariables
+>;
 export const GetStreamMonitoringDetailsDocument = gql`
   query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     getVideo(videoId: $videoId, debuggingJson: $debuggingJson) {

src/operations/shots.gql

@@ -40,9 +40,16 @@ mutation UpdateShotAnnotations(
   }
 }
 
-query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
+query GetShotsWithVideoGql(
-  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
+  $filterInput: FilterInput!
-    ids
+  $shotsOrdering: GetShotsOrdering
+  $limit: Int
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+  ) {
     shots {
       id
       videoId

src/operations/user.gql

@@ -37,6 +37,7 @@ query getLoggedInUser {
     username
     isAdmin
     profileImageUri
+    fargoRating
     activeVideoId
     createdAt
     updatedAt
@@ -89,15 +90,37 @@ query GetUserTags {
 
 mutation followUser($followedUserId: Int!) {
   followUser(followedUserId: $followedUserId) {
-    followers {
     username
+    following {
+      id
+    }
+    followers {
+      id
     }
   }
 }
 
 mutation unfollowUser($followedUserId: Int!) {
   unfollowUser(followedUserId: $followedUserId) {
+    username
+    following {
+      id
+    }
     followers {
+      id
+    }
+  }
+}
+
+query getUserFollowingFollowers {
+  getLoggedInUser {
+    id
+    following {
+      id
+      username
+    }
+    followers {
+      id
       username
     }
   }