Merge pull request 'Use getOrderedShots when requesting getShotsWithVideoGql' (#100) from loewy/use-ordered-shots-to-get-thumbnail into master

Reviewed-on: #100

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,7 +3190,9 @@ 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;
   };
 };
 
@@ -4471,9 +4476,16 @@ export type UpdateShotAnnotationsMutationOptions = Apollo.BaseMutationOptions<
   UpdateShotAnnotationsMutationVariables
 >;
 export const GetShotsWithVideoGqlDocument = gql`
-  query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
-    getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
-      ids
+  query GetShotsWithVideoGql(
+    $filterInput: FilterInput!
+    $shotsOrdering: GetShotsOrdering
+    $limit: Int
+  ) {
+    getOrderedShots(
+      filterInput: $filterInput
+      shotsOrdering: $shotsOrdering
+      limit: $limit
+    ) {
       shots {
         id
         videoId
@@ -4499,6 +4511,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 +4949,7 @@ export const GetLoggedInUserDocument = gql`
       username
       isAdmin
       profileImageUri
+      fargoRating
       activeVideoId
       createdAt
       updatedAt
@@ -5324,8 +5338,12 @@ export type GetUserTagsQueryResult = Apollo.QueryResult<
 export const FollowUserDocument = gql`
   mutation followUser($followedUserId: Int!) {
     followUser(followedUserId: $followedUserId) {
+      username
+      following {
+        id
+      }
       followers {
-        username
+        id
       }
     }
   }
@@ -5376,8 +5394,12 @@ export type FollowUserMutationOptions = Apollo.BaseMutationOptions<
 export const UnfollowUserDocument = gql`
   mutation unfollowUser($followedUserId: Int!) {
     unfollowUser(followedUserId: $followedUserId) {
+      username
+      following {
+        id
+      }
       followers {
-        username
+        id
       }
     }
   }

src/operations/shots.gql

@@ -40,9 +40,16 @@ mutation UpdateShotAnnotations(
   }
 }
 
-query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
-  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
-    ids
+query GetShotsWithVideoGql(
+  $filterInput: FilterInput!
+  $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,16 +90,24 @@ query GetUserTags {
 
 mutation followUser($followedUserId: Int!) {
   followUser(followedUserId: $followedUserId) {
+    username
+    following {
+      id
+    }
     followers {
-      username
+      id
     }
   }
 }
 
 mutation unfollowUser($followedUserId: Int!) {
   unfollowUser(followedUserId: $followedUserId) {
+    username
+    following {
+      id
+    }
     followers {
-      username
+      id
     }
   }
 }