Return userGQL in usernames and ids endpoint

pyproject.toml

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

src/operations/check_homography.gql

@@ -1,69 +0,0 @@
-mutation checkHomographyIsValid($b64Image: String!, $videoId: Int!) {
-  checkHomographyIsValid(b64Image: $b64Image, videoId: $videoId) {
-    frameIndex
-    crop {
-      left
-      top
-      width
-      height
-    }
-    pockets {
-      left
-      top
-      width
-      height
-    }
-    sourcePoints {
-      topLeft {
-        x
-        y
-      }
-      topSide {
-        x
-        y
-      }
-      topRight {
-        x
-        y
-      }
-      bottomLeft {
-        x
-        y
-      }
-      bottomSide {
-        x
-        y
-      }
-      bottomRight {
-        x
-        y
-      }
-    }
-    destPoints {
-      topLeft {
-        x
-        y
-      }
-      topSide {
-        x
-        y
-      }
-      topRight {
-        x
-        y
-      }
-      bottomLeft {
-        x
-        y
-      }
-      bottomSide {
-        x
-        y
-      }
-      bottomRight {
-        x
-        y
-      }
-    }
-  }
-}

src/operations/feed.gql

@@ -1,4 +1,3 @@
-# DO NOT USE: use getVideoFeed instead
 query GetFeed(
   $limit: Int! = 5
   $after: String = null
@@ -39,59 +38,3 @@ query GetFeed(
     }
   }
 }
-
-fragment VideoCardFields on VideoGQL {
-  id
-  owner {
-    id
-    username
-    profileImageUri
-  }
-  name
-  screenshotUri
-  totalShotsMade
-  totalShots
-  makePercentage
-  createdAt
-  updatedAt
-  startTime
-  endTime
-  elapsedTime
-  screenshotUri
-  stream {
-    id
-    isCompleted
-  }
-  tableSize
-  tags {
-    tagClasses {
-      name
-    }
-    name
-  }
-  currentProcessing {
-    errors {
-      message
-    }
-    status
-    statuses {
-      status
-    }
-  }
-}
-
-query GetVideoFeed(
-  $limit: Int! = 5
-  $after: String = null
-  $filters: VideoFilterInput = null
-) {
-  getFeedVideos(limit: $limit, after: $after, filters: $filters) {
-    videos {
-      ...VideoCardFields
-    }
-    pageInfo {
-      hasNextPage
-      endCursor
-    }
-  }
-}

src/operations/shots.gql

@@ -40,17 +40,9 @@ mutation UpdateShotAnnotations(
   }
 }
 
-## Should be deprecated
-query GetShotsWithVideoGql(
-  $filterInput: FilterInput!
-  $shotsOrdering: GetShotsOrdering
-  $limit: Int
-) {
-  getOrderedShots(
-    filterInput: $filterInput
-    shotsOrdering: $shotsOrdering
-    limit: $limit
-  ) {
+query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
+  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
+    ids
     shots {
       id
       videoId
@@ -62,37 +54,18 @@ query GetShotsWithVideoGql(
   }
 }
 
-query GetShotsWithJustIds(
-  $filterInput: FilterInput!
-  $shotsOrdering: GetShotsOrdering
-  $limit: Int
-) {
-  getOrderedShots(
-    filterInput: $filterInput
-    shotsOrdering: $shotsOrdering
-    limit: $limit
-  ) {
-    shots {
-      id
-      videoId
-    }
-  }
-}
-
 ## Reserved for playlists (which are created from a filter)
 query GetShotsWithMetadataFilterResult(
   $filterInput: FilterInput!
   $shotsOrdering: GetShotsOrdering
   $limit: Int
   $ids: [Int!]
-  $countRespectsLimit: Boolean
 ) {
   getOrderedShots(
     filterInput: $filterInput
     shotsOrdering: $shotsOrdering
     limit: $limit
     ids: $ids
-    countRespectsLimit: $countRespectsLimit
   ) {
     count
     shots {

src/operations/user.gql

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

src/schema.gql

@@ -9,43 +9,44 @@ type Query {
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
-  getMedals(scope: MedalScope!, userId: Int = null): RequestedMedalsGQL!
   getOrderedShots(
     filterInput: FilterInput!
     ids: [Int!] = null
     shotsOrdering: GetShotsOrdering = null
     limit: Int! = 500
-    countRespectsLimit: Boolean! = false
   ): GetShotsResult!
   getShotsWithMetadata(
     filterInput: FilterInput!
     ids: [Int!] = null
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
-    countRespectsLimit: Boolean! = false
   ): GetShotsResult!
   getShots(
     filterInput: FilterInput!
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
-    countRespectsLimit: Boolean! = false
   ): [ShotGQL!]!
   getShotsByIds(ids: [Int!]!): [ShotGQL!]!
   getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
   getUser(userId: Int!): UserGQL
-  doesUsernameExist(candidateUsername: String!): Boolean!
   getLoggedInUser: UserGQL
   getUsernames(
     matchString: String = null
     limit: Int = null
     after: String = null
   ): [String!]!
-  getUserRelationshipsMatching(
+  getUsernamesAndFollowing(
     userId: Int!
     matchString: String = null
     limit: Int = 100
     after: String = null
-  ): UserRelationshipsResult!
+  ): UsernamesAndFollowingResponse!
+  getUsernamesAndFollowingOld(
+    userId: Int!
+    matchString: String = null
+    limit: Int = 100
+    after: String = null
+  ): UsernamesAndFollowingResponse!
   getPlayTime(userId: Int!): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
@@ -271,52 +272,6 @@ type MakePercentageIntervalGQL {
   elapsedTime: Float!
 }
 
-type RequestedMedalsGQL {
-  distanceOver66: MedalGQL
-  distanceOver78: MedalGQL
-  distanceOver90: MedalGQL
-  runLength3: MedalGQL
-  runLength5: MedalGQL
-  runLength8: MedalGQL
-  runLength10: MedalGQL
-  runLength15: MedalGQL
-  runLength20: MedalGQL
-  runLength25: MedalGQL
-  runLength30: MedalGQL
-  runLength40: MedalGQL
-  runLength50: MedalGQL
-  totalMakes25: MedalGQL
-  totalMakes50: MedalGQL
-  totalMakes75: MedalGQL
-  totalMakes100: MedalGQL
-  totalMakes200: MedalGQL
-  totalMakes300: MedalGQL
-  totalMakes400: MedalGQL
-  totalMakes500: MedalGQL
-  totalMakes750: MedalGQL
-  totalMakes1000: MedalGQL
-  dayStreak2: MedalGQL
-  dayStreak3: MedalGQL
-  dayStreak4: MedalGQL
-  dayStreak5: MedalGQL
-  dayStreak6: MedalGQL
-  dayStreak7: MedalGQL
-  dayStreak14: MedalGQL
-  dayStreak21: MedalGQL
-  dayStreak30: MedalGQL
-  dayStreak60: MedalGQL
-  dayStreak90: MedalGQL
-}
-
-type MedalGQL {
-  count: Int!
-}
-
-input MedalScope @oneOf {
-  videoId: Int
-  interval: TimeInterval
-}
-
 type GetShotsResult {
   shots: [ShotGQL!]!
   count: Int
@@ -400,8 +355,8 @@ type UserGQL {
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
-  following: [UserGQL!]
-  followers: [UserGQL!]
+  following: [Int!]
+  followers: [Int!]
 }
 
 type ShotAnnotationGQL {
@@ -605,15 +560,10 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
-type UserRelationshipsResult {
-  inquiringUser: UserGQL!
-  relationships: [UserRelationship!]!
-}
-
-type UserRelationship {
-  toUser: UserGQL!
-  toUserFollows: Boolean!
-  toUserIsFollowedBy: Boolean!
+type UsernamesAndFollowingResponse {
+  users: [UserGQL!]!
+  following: [Int!]!
+  followers: [Int!]!
 }
 
 type UserPlayTimeGQL {
@@ -668,7 +618,6 @@ type Mutation {
   editUser(input: EditUserInputGQL!): UserGQL!
   followUser(followedUserId: Int!): UserGQL!
   unfollowUser(followedUserId: Int!): UserGQL!
-  checkHomographyIsValid(b64Image: String!, videoId: Int!): HomographyInfoGQL
   createUploadStream(
     videoMetadata: VideoMetadataInput!
   ): CreateUploadStreamReturn!