Remove field for now

package.json

@@ -12,7 +12,7 @@
   "author": "Ivan Malison <IvanMalison@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "@apollo/client": "^3.11.10",
+    "@apollo/client": "^3.9.2",
     "@graphql-codegen/cli": "^5.0.0",
     "@graphql-codegen/typescript": "^4.0.1",
     "@graphql-codegen/typescript-operations": "^4.0.1",

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/client-schema.gql

@@ -1,16 +1,9 @@
 # see: https://www.apollographql.com/docs/react/local-state/managing-state-with-field-policies/
 directive @client on FIELD
 
-type SegmentInfo {
-  index: Int!
-  time: Float!
-}
-
 extend type ShotGQL {
   startTime: Float!
   endTime: Float!
-  startSegment: SegmentInfo!
-  endSegment: SegmentInfo!
 }
 
 extend type UploadStreamGQL {

src/operations/challenges.gql

@@ -1,207 +0,0 @@
-query GetChallenges {
-  challenges {
-    id
-    name
-    description
-    minimumShots
-    startDate
-    endDate
-    createdAt
-    updatedAt
-    requiredTableSize
-    requiredPocketSize
-    isPublic
-    maxAttempts
-    ruleSet {
-      id
-      name
-      description
-    }
-    createdBy {
-      id
-      username
-      profileImageUri
-    }
-  }
-}
-
-query GetChallenge($id: ID!) {
-  challenge(id: $id) {
-    id
-    name
-    description
-    minimumShots
-    startDate
-    endDate
-    createdAt
-    updatedAt
-    requiredTableSize
-    requiredPocketSize
-    isPublic
-    maxAttempts
-    ruleSet {
-      id
-      name
-      description
-    }
-    createdBy {
-      id
-      username
-      profileImageUri
-    }
-  }
-}
-
-query GetRuleSets {
-  ruleSets {
-    id
-    name
-    description
-  }
-}
-
-query GetChallengeLeaderboard($challengeId: ID!, $limit: Int) {
-  challengeLeaderboard(challengeId: $challengeId, limit: $limit) {
-    id
-    status
-    shotsCount
-    makesCount
-    makeRate
-    qualified
-    createdAt
-    user {
-      id
-      username
-      profileImageUri
-    }
-    video {
-      id
-      createdAt
-    }
-  }
-}
-
-query GetMyChallengeInvitations {
-  myChallengeInvitations {
-    id
-    status
-    createdAt
-    challenge {
-      id
-      name
-      description
-      startDate
-      endDate
-      createdBy {
-        id
-        username
-        profileImageUri
-      }
-    }
-    inviter {
-      id
-      username
-      profileImageUri
-    }
-  }
-}
-
-mutation CreateRuleSet($name: String!, $description: String) {
-  createRuleSet(name: $name, description: $description) {
-    id
-    name
-    description
-  }
-}
-
-mutation CreateChallenge(
-  $name: String!
-  $ruleSetId: ID!
-  $minimumShots: Int!
-  $startDate: DateTime!
-  $endDate: DateTime!
-  $description: String
-  $requiredTableSize: Float
-  $requiredPocketSize: Float
-  $isPublic: Boolean! = false
-  $maxAttempts: Int
-) {
-  createChallenge(
-    name: $name
-    ruleSetId: $ruleSetId
-    minimumShots: $minimumShots
-    startDate: $startDate
-    endDate: $endDate
-    description: $description
-    requiredTableSize: $requiredTableSize
-    requiredPocketSize: $requiredPocketSize
-    isPublic: $isPublic
-    maxAttempts: $maxAttempts
-  ) {
-    id
-    name
-    description
-    requiredTableSize
-    requiredPocketSize
-    isPublic
-    maxAttempts
-  }
-}
-
-mutation InviteUsersToChallenge($challengeId: ID!, $userIds: [ID!]!) {
-  inviteUsersToChallenge(challengeId: $challengeId, userIds: $userIds) {
-    id
-    status
-    inviter {
-      id
-      username
-    }
-  }
-}
-
-mutation RespondToChallengeInvitation($invitationId: ID!, $accept: Boolean!) {
-  respondToChallengeInvitation(invitationId: $invitationId, accept: $accept) {
-    id
-    status
-    challenge {
-      id
-    }
-  }
-}
-
-mutation StartChallenge($challengeId: ID!) {
-  startChallenge(challengeId: $challengeId) {
-    id
-    status
-    createdAt
-    challenge {
-      id
-      name
-    }
-  }
-}
-
-mutation SubmitChallengeEntry($entryId: ID!, $videoId: ID!) {
-  submitChallengeEntry(entryId: $entryId, videoId: $videoId) {
-    id
-    status
-    qualified
-    makeRate
-    shotsCount
-    makesCount
-    video {
-      id
-    }
-  }
-}
-
-mutation RecalculateChallengeEntry($entryId: ID!) {
-  recalculateChallengeEntry(entryId: $entryId) {
-    id
-    status
-    qualified
-    makeRate
-    shotsCount
-    makesCount
-  }
-}

src/operations/comments.gql

@@ -1,19 +0,0 @@
-mutation CommentOnVideo(
-  $videoId: Int!
-  $message: String!
-  $parentCommentId: Int
-) {
-  commentOnVideo(
-    videoId: $videoId
-    message: $message
-    parentCommentId: $parentCommentId
-  )
-}
-
-mutation EditComment($videoId: Int!, $commentId: Int!, $newMessage: String!) {
-  editComment(videoId: $videoId, commentId: $commentId, newMessage: $newMessage)
-}
-
-mutation DeleteComment($videoId: Int!, $commentId: Int!) {
-  deleteComment(videoId: $videoId, commentId: $commentId)
-}

src/operations/config.gql

@@ -5,14 +5,5 @@ query getDeployedConfig {
     environment
     firebase
     minimumAllowedAppVersion
-    subscriptionGatingEnabled
-    bannerMessages {
-      color
-      dismissible
-      id
-      kind
-      message
-      priority
-    }
   }
 }

src/operations/content-moderation.gql

@@ -1,15 +0,0 @@
-mutation blockContent($videoId: Int!) {
-  blockContent(videoId: $videoId)
-}
-
-mutation blockUser($userId: Int!) {
-  blockUser(userId: $userId)
-}
-
-mutation reportContent(
-  $videoId: Int!
-  $reason: ReportReasonEnum!
-  $customReason: String = null
-) {
-  reportContent(videoId: $videoId, reason: $reason, customReason: $customReason)
-}

src/operations/feed.gql

@@ -1,4 +1,3 @@
-# DO NOT USE: use getVideoFeed instead
 query GetFeed(
   $limit: Int! = 5
   $after: String = null
@@ -6,52 +5,24 @@ query GetFeed(
 ) {
   getUserVideos(limit: $limit, after: $after, filters: $filters) {
     videos {
-      ...VideoCardFields
-    }
-    pageInfo {
-      hasNextPage
-      endCursor
-    }
-  }
-}
-
-fragment UserSocialsFields on UserGQL {
-  id
-  username
-  profileImageUri
-  followers {
-    id
-    username
-    profileImageUri
-  }
-}
-
-fragment VideoCardFields on VideoGQL {
       id
       owner {
-    id
         username
-    profileImageUri
       }
       name
       screenshotUri
       totalShotsMade
       totalShots
       makePercentage
-  averageTimeBetweenShots
-  averageDifficulty
       createdAt
       updatedAt
       startTime
       endTime
-  private
       elapsedTime
       screenshotUri
       stream {
         id
-    lastIntendedSegmentBound
         isCompleted
-    streamSegmentType
       }
       tableSize
       tags {
@@ -60,57 +31,6 @@ fragment VideoCardFields on VideoGQL {
         }
         name
       }
-  currentProcessing {
-    id
-    errors {
-      message
-    }
-    status
-    statuses {
-      status
-    }
-  }
-  reactions {
-    videoId
-    user {
-      ...UserSocialsFields
-    }
-    reaction
-  }
-  comments {
-    id
-    message
-    user {
-      ...UserSocialsFields
-    }
-    replies {
-      id
-      message
-      user {
-        ...UserSocialsFields
-      }
-    }
-  }
-}
-
-query GetVideoFeed(
-  $limit: Int! = 5
-  $after: String = null
-  $filters: VideoFilterInput = null
-  $includeCallersVideos: Boolean = null
-  $includePrivate: IncludePrivateEnum = MINE
-  $feedInput: VideoFeedInputGQL = null
-) {
-  getFeedVideos(
-    limit: $limit
-    after: $after
-    filters: $filters
-    includeCallersVideos: $includeCallersVideos
-    includePrivate: $includePrivate
-    feedInput: $feedInput
-  ) {
-    videos {
-      ...VideoCardFields
     }
     pageInfo {
       hasNextPage

src/operations/leaderboards.gql

@@ -1,32 +0,0 @@
-query GetMakesLeaderboard($interval: TimeInterval, $when: DateTime) {
-  getMakesLeaderboard(interval: $interval, when: $when) {
-    entries {
-      user {
-        id
-        username
-        profileImageUri
-      }
-      value
-      proportionMade
-      total
-    }
-  }
-}
-
-query GetRunsLeaderboard($interval: TimeInterval, $when: DateTime) {
-  getLongestRunsLeaderboard(interval: $interval, when: $when) {
-    entries {
-      id
-      runLength
-      video {
-        name
-        createdAt
-      }
-      user {
-        id
-        username
-        profileImageUri
-      }
-    }
-  }
-}

src/operations/medals.gql

@@ -1,75 +0,0 @@
-fragment MedalFields on MedalGQL {
-  count
-  nickname
-}
-
-query getMedals($scope: MedalScope!, $userId: Int) {
-  getMedals(scope: $scope, userId: $userId) {
-    distanceOver78 {
-      ...MedalFields
-    }
-    distanceOver90 {
-      ...MedalFields
-    }
-    runLength3 {
-      ...MedalFields
-    }
-    runLength5 {
-      ...MedalFields
-    }
-    runLength8 {
-      ...MedalFields
-    }
-    runLength10 {
-      ...MedalFields
-    }
-    runLength15 {
-      ...MedalFields
-    }
-    runLength20 {
-      ...MedalFields
-    }
-    runLength25 {
-      ...MedalFields
-    }
-    runLength30 {
-      ...MedalFields
-    }
-    runLength40 {
-      ...MedalFields
-    }
-    runLength50 {
-      ...MedalFields
-    }
-    totalMakes100 {
-      ...MedalFields
-    }
-    totalMakes500 {
-      ...MedalFields
-    }
-    totalMakes1000 {
-      ...MedalFields
-    }
-    totalMakes5000 {
-      ...MedalFields
-    }
-    totalMakes10000 {
-      ...MedalFields
-    }
-    dailyMakes50 {
-      ...MedalFields
-    }
-    dailyMakes100 {
-      ...MedalFields
-    }
-    dailyMakes150 {
-      ...MedalFields
-    }
-    dailyMakes200 {
-      ...MedalFields
-    }
-    dailyMakes250 {
-      ...MedalFields
-    }
-  }
-}

src/operations/notifications.gql

@@ -1,58 +0,0 @@
-query GetNotifications(
-  $limit: Int! = 20
-  $offset: Int! = 0
-  $filters: NotificationFilters = null
-) {
-  notifications(limit: $limit, offset: $offset, filters: $filters) {
-    notifications {
-      ...Notification
-    }
-    totalCount
-    unreadCount
-    hasMore
-  }
-}
-
-query GetUnreadNotificationCount {
-  unreadNotificationCount
-}
-
-mutation MarkNotificationAsRead($notificationId: Int!) {
-  markNotificationAsRead(notificationId: $notificationId)
-}
-
-mutation MarkNotificationsAsRead($notificationIds: [Int!]!) {
-  markNotificationsAsRead(notificationIds: $notificationIds)
-}
-
-mutation MarkAllNotificationsAsRead {
-  markAllNotificationsAsRead
-}
-
-mutation DeleteNotification($notificationId: Int!) {
-  deleteNotification(notificationId: $notificationId)
-}
-
-fragment Notification on NotificationGQL {
-  id
-  notificationType
-  actor {
-    id
-    username
-    profileImageUri
-  }
-  videoId
-  comment {
-    id
-    message
-    user {
-      id
-      username
-      profileImageUri
-    }
-  }
-  reactionType
-  isRead
-  createdAt
-  readAt
-}

src/operations/payments.gql

@@ -1,65 +0,0 @@
-mutation EnsureStripeCustomerExists {
-  ensureStripeCustomerExists {
-    id
-    firebaseUid
-    username
-    stripeCustomerId
-    profileImageUri
-    isAdmin
-    fargoRating
-    videosPrivateByDefault
-    createdAt
-    updatedAt
-  }
-}
-
-mutation CreateSubscription($priceId: String!) {
-  createSubscription(priceId: $priceId) {
-    checkoutUrl
-    sessionId
-  }
-}
-
-query GetAvailableSubscriptionOptions {
-  getAvailableSubscriptionOptions {
-    products {
-      id
-      name
-      description
-      active
-      prices {
-        id
-        currency
-        unitAmount
-        recurringInterval
-        recurringIntervalCount
-        type
-        active
-      }
-    }
-  }
-}
-
-query GetSubscriptionStatus {
-  getUserSubscriptionStatus {
-    hasActiveSubscription
-    subscriptionStatus
-    currentPeriodStart
-    currentPeriodEnd
-    validUntil
-    stripePriceId
-    stripeSubscriptionId
-  }
-}
-
-mutation CancelSubscription {
-  cancelSubscription {
-    hasActiveSubscription
-    subscriptionStatus
-    currentPeriodStart
-    currentPeriodEnd
-    validUntil
-    stripePriceId
-    stripeSubscriptionId
-  }
-}

src/operations/reactions.gql

@@ -1,3 +0,0 @@
-mutation ReactToVideo($videoId: Int!, $reaction: ReactionEnum) {
-  reactToVideo(videoId: $videoId, reaction: $reaction)
-}

src/operations/runs.gql

@@ -1,67 +0,0 @@
-query GetRunsForHighlights(
-  $filterInput: RunFilterInput!
-  $runIds: [Int!] = null
-  $runsOrdering: GetRunsOrdering
-  $limit: Int! = 500
-  $countRespectsLimit: Boolean! = false
-) {
-  getRuns(
-    filterInput: $filterInput
-    runIds: $runIds
-    runsOrdering: $runsOrdering
-    limit: $limit
-    countRespectsLimit: $countRespectsLimit
-  ) {
-    count
-    runs {
-      id
-      runLength
-      userId
-      videoId
-      shots {
-        videoId
-        id
-      }
-    }
-    runIds
-  }
-}
-
-fragment PocketingIntentionFragment on PocketingIntentionFeaturesGQL {
-  make
-  targetPocketDistance
-  targetPocketAngle
-  targetPocketAngleDirection
-  marginOfErrorInDegrees
-  intendedPocketType
-  difficulty
-}
-
-query GetRunsWithTimestamps(
-  $filterInput: RunFilterInput!
-  $runIds: [Int!] = null
-  $runsOrdering: GetRunsOrdering
-) {
-  getRuns(
-    filterInput: $filterInput
-    runIds: $runIds
-    runsOrdering: $runsOrdering
-  ) {
-    count
-    runs {
-      id
-      runLength
-      userId
-      videoId
-      shots {
-        videoId
-        id
-        createdAt
-        pocketingIntentionFeatures {
-          ...PocketingIntentionFragment
-        }
-      }
-    }
-    runIds
-  }
-}

src/operations/shots.gql

@@ -40,17 +40,9 @@ mutation UpdateShotAnnotations(
   }
 }
 
-## Should be deprecated
+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
@@ -62,40 +54,18 @@ query GetShotsWithVideoGql(
   }
 }
 
-query GetShotsWithJustIds(
-  $filterInput: FilterInput!
-  $shotsOrdering: GetShotsOrdering
-  $limit: Int
-  $countRespectsLimit: Boolean
-) {
-  getOrderedShots(
-    filterInput: $filterInput
-    shotsOrdering: $shotsOrdering
-    limit: $limit
-    countRespectsLimit: $countRespectsLimit
-  ) {
-    count
-    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 {
@@ -139,14 +109,6 @@ fragment ShotWithAllFeatures on ShotGQL {
   endFrame
   startTime @client
   endTime @client
-  startSegment @client {
-    index
-    time
-  }
-  endSegment @client {
-    index
-    time
-  }
   user {
     id
   }
@@ -167,7 +129,6 @@ fragment ShotWithAllFeatures on ShotGQL {
     targetPocketAngleDirection
     marginOfErrorInDegrees
     intendedPocketType
-    difficulty
   }
   pocketingIntentionInfo {
     ballId
@@ -185,26 +146,4 @@ fragment ShotWithAllFeatures on ShotGQL {
     }
     notes
   }
-  video {
-    id
-    stream {
-      id
-      streamSegmentType
-    }
-    playlist {
-      segmentDurations
-    }
-  }
-}
-
-mutation EditShot($shotId: Int!, $fieldsToEdit: EditableShotFieldInputGQL!) {
-  editShot(shotId: $shotId, fieldsToEdit: $fieldsToEdit) {
-    error {
-      shotId
-      msg
-    }
-    shot {
-      ...ShotWithAllFeatures
-    }
-  }
 }

src/operations/tags.gql

@@ -1,7 +0,0 @@
-mutation RetireTags($tagIds: [Int!]!) {
-  retireTags(tagIds: $tagIds)
-}
-
-mutation DeleteTags($videoId: Int!, $tagsToDelete: [VideoTagInput!]!) {
-  deleteTags(videoId: $videoId, tagsToDelete: $tagsToDelete)
-}

src/operations/user.gql

@@ -21,24 +21,30 @@ mutation getProfileImageUploadLink($fileExt: String = ".png") {
 
 mutation editProfileImageUri($profileImageUri: String!) {
   editProfileImageUri(profileImageUri: $profileImageUri) {
-    ...UserFragment
+    id
+    firebaseUid
+    username
+    profileImageUri
+    createdAt
+    updatedAt
   }
 }
 
 query getLoggedInUser {
   getLoggedInUser {
-    ...UserFragment
+    id
+    firebaseUid
+    username
+    isAdmin
+    profileImageUri
+    activeVideoId
+    createdAt
+    updatedAt
   }
 }
 
-query GetUser($userId: Int!) {
+query GetUserPlayTime($userId: Int!) {
-  getUser(userId: $userId) {
+  getPlayTime(userId: $userId) {
-    ...UserFragment
-  }
-}
-
-query GetUserPlayTime($userId: Int!, $filters: VideoFilterInput) {
-  getPlayTime(userId: $userId, filters: $filters) {
     totalSeconds
   }
 }
@@ -51,27 +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 {
+    followers
-      toUser {
+    following
-        username
-        profileImageUri
-        id
-      }
-      toUserFollows
-      toUserIsFollowedBy
-    }
   }
 }
 
@@ -79,111 +78,5 @@ query GetUserTags {
   getUserTags {
     id
     name
-    tagClasses {
-      id
-      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
-      profileImageUri
-    }
-    followers {
-      id
-      username
-      profileImageUri
-    }
-  }
-}
-
-query doesUsernameExist($candidateUsername: String!) {
-  doesUsernameExist(candidateUsername: $candidateUsername)
-}
-
-mutation editUser(
-  $username: String
-  $fargoRating: Int
-  $videosPrivateByDefault: Boolean
-  $agreesToMarketing: Boolean
-) {
-  editUser(
-    input: {
-      username: $username
-      fargoRating: $fargoRating
-      videosPrivateByDefault: $videosPrivateByDefault
-      agreesToMarketing: $agreesToMarketing
-    }
-  ) {
-    id
-    firebaseUid
-    username
-    fargoRating
-    updatedAt
-    videosPrivateByDefault
-    agreesToMarketing
-  }
-}
-
-mutation deleteUser {
-  deleteUser
-}
-
-fragment UserFragment on UserGQL {
-  id
-  firebaseUid
-  username
-  isAdmin
-  profileImageUri
-  fargoRating
-  activeVideoId
-  createdAt
-  updatedAt
-  videosPrivateByDefault
-  agreesToMarketing
-}
-
-query GetUsersMatching(
-  $matchString: String = null
-  $limit: Int = null
-  $after: String = null
-) {
-  getUsersMatching(matchString: $matchString, limit: $limit, after: $after) {
-    ...UserFragment
   }
 }

src/operations/video.gql

@@ -5,7 +5,44 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     makePercentage
     elapsedTime
     currentHomography {
-      ...HomographyInfo
+      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
+        }
+      }
     }
     stream {
       id
@@ -18,7 +55,6 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
       initPlaylistUploadStatus
     }
     currentProcessing {
-      id
       errors {
         message
         startSegmentIndex
@@ -36,8 +72,6 @@ query GetVideoUpdatePageDetails($videoId: Int!) {
     makePercentage
     elapsedTime
     tableSize
-    pocketSize
-    private
     tags {
       tagClasses {
         name
@@ -67,8 +101,6 @@ query GetVideoDetails($videoId: Int!) {
     createdAt
     updatedAt
     tableSize
-    pocketSize
-    private
     owner {
       id
       firebaseUid
@@ -84,60 +116,6 @@ query GetVideoDetails($videoId: Int!) {
   }
 }
 
-fragment UserSocialsFields on UserGQL {
-  id
-  username
-  profileImageUri
-  followers {
-    id
-    username
-    profileImageUri
-  }
-}
-
-query GetVideoSocialDetailsById($videoId: Int!) {
-  getVideo(videoId: $videoId) {
-    id
-    name
-    screenshotUri
-    makePercentage
-    totalShots
-    owner {
-      id
-      firebaseUid
-      username
-      profileImageUri
-    }
-    tags {
-      tagClasses {
-        name
-      }
-      name
-    }
-    reactions {
-      videoId
-      user {
-        ...UserSocialsFields
-      }
-      reaction
-    }
-    comments {
-      id
-      message
-      user {
-        ...UserSocialsFields
-      }
-      replies {
-        id
-        message
-        user {
-          ...UserSocialsFields
-        }
-      }
-    }
-  }
-}
-
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
     ...VideoStreamMetadata
@@ -176,7 +154,45 @@ query GetVideo($videoId: Int!) {
       segmentDurations
     }
     homographyHistory {
-      ...HomographyInfo
+      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
+        }
+      }
     }
     stream {
       id
@@ -272,69 +288,3 @@ query GetHeaderInfoByVideoId($videoId: Int!) {
     startTime
   }
 }
-query GetBannerInfoByVideoId($videoId: Int!) {
-  getVideo(videoId: $videoId) {
-    id
-    name
-    stream {
-      id
-      lastIntendedSegmentBound
-    }
-    owner {
-      id
-    }
-    currentProcessing {
-      id
-      status
-    }
-  }
-}
-
-mutation FindPrerecordTableLayout($b64Image: String!, $videoId: Int!) {
-  findPrerecordTableLayout(b64Image: $b64Image, videoId: $videoId) {
-    ...HomographyInfo
-  }
-}
-
-fragment HomographyInfo on HomographyInfoGQL {
-  id
-  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
-    }
-  }
-}

src/operations/video_upload.gql

@@ -101,8 +101,13 @@ query GetUploadStreams(
     }
   }
 }
-
+query GetUploadStreamsWithDetails(
-fragment UploadStreamWithDetails on VideoGQL {
+  $limit: Int! = 5
+  $after: String = null
+  $filters: VideoFilterInput = null
+) {
+  getUserVideos(limit: $limit, after: $after, filters: $filters) {
+    videos {
       id
       name
       startTime
@@ -113,16 +118,6 @@ fragment UploadStreamWithDetails on VideoGQL {
         uploadsCompleted
       }
     }
-
-query GetUploadStreamsWithDetails(
-  $limit: Int! = 5
-  $after: String = null
-  $filters: VideoFilterInput = null
-) {
-  getUserVideos(limit: $limit, after: $after, filters: $filters) {
-    videos {
-      ...UploadStreamWithDetails
-    }
     pageInfo {
       hasNextPage
       endCursor

src/schema.gql

@@ -3,108 +3,59 @@ type Query {
     aggregateInput: AggregateInputGQL!
   ): [AggregateResultGQL!]!
   getBucketSet(keyName: String!): BucketSetGQL
-  challenges: [Challenge!]!
-  challenge(id: ID!): Challenge
-  challengeLeaderboard(challengeId: ID!, limit: Int! = 50): [ChallengeEntry!]!
-  myChallengeInvitations: [ChallengeInvitation!]!
-  ruleSets: [RuleSet!]!
-  myChallengeEntries: [ChallengeEntry!]!
   getDeployedConfig: DeployedConfigGQL!
   waitFor(duration: Float!): Float!
-  getFeedVideos(
-    limit: Int! = 5
-    after: String = null
-    includePrivate: IncludePrivateEnum! = MINE
-    includeCallersVideos: Boolean = true
-    filters: VideoFilterInput = null
-    feedInput: VideoFeedInputGQL = null
-  ): VideoHistoryGQL!
   getVideoMakePercentageIntervals(
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
-  getLongestRunsLeaderboard(
-    interval: TimeInterval = null
-    when: DateTime = null
-    limit: Int! = 100
-    requiredTags: [String!] = null
-  ): RunLeaderboardGQL!
-  getMakesLeaderboard(
-    interval: TimeInterval = null
-    when: DateTime = null
-  ): CountLeaderboardGQL!
-  getMedals(scope: MedalScope!, userId: Int = null): RequestedMedalsGQL!
-  notifications(
-    limit: Int! = 20
-    offset: Int! = 0
-    filters: NotificationFilters = null
-  ): NotificationConnection!
-  unreadNotificationCount: Int!
-  getRuns(
-    filterInput: RunFilterInput!
-    runIds: [Int!] = null
-    runsOrdering: GetRunsOrdering = null
-    limit: Int! = 500
-    countRespectsLimit: Boolean! = false
-  ): GetRunsResult!
-  getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
-  getTableState(
-    b64Image: String!
-    tableSize: Float = 100
-    useHomography: HomographyInputGQL = null
-  ): TableStateGQL!
   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!]!
-  getUsersMatching(
+  getUsernamesAndFollowing(
-    matchString: String = null
-    limit: Int = null
-    after: String = null
-  ): [UserGQL!]!
-  getUserRelationshipsMatching(
     userId: Int!
     matchString: String = null
     limit: Int = 100
     after: String = null
-  ): UserRelationshipsResult!
+  ): UsernamesAndFollowingResponse!
-  getAvailableSubscriptionOptions: StripeSubscriptionOptionsGQL!
+  getPlayTime(userId: Int!): UserPlayTimeGQL!
-  getUserSubscriptionStatus: UserSubscriptionStatusGQL!
-  getPlayTime(userId: Int!, filters: VideoFilterInput = null): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
     limit: Int! = 5
     after: String = null
     filters: VideoFilterInput = null
   ): VideoHistoryGQL!
-  getUserTags(includeRetiredTags: Boolean = false): [TagGQL!]!
+  getUserTags: [TagGQL!]!
   getVideo(videoId: Int!, debuggingJson: JSON = null): VideoGQL!
   getVideos(videoIds: [Int!]!): [VideoGQL!]!
+  getFeedVideos(
+    limit: Int! = 5
+    after: String = null
+    filters: VideoFilterInput = null
+  ): VideoHistoryGQL!
 }
 
 type AggregateResultGQL {
@@ -207,7 +158,6 @@ input FilterInput @oneOf {
   shotDirection: [ShotDirectionEnum!]
   videoId: [Int!]
   userId: [Int!]
-  runId: [Int!]
   username: [String!]
   fargoRating: FloatRangeFilter
   make: [Boolean!]
@@ -219,7 +169,6 @@ input FilterInput @oneOf {
   isLeftMiss: [Boolean!]
   isRightMiss: [Boolean!]
   isDirect: [Boolean!]
-  isBreakHeuristic: [Boolean!]
   tableSize: FloatRangeFilter
   bankAngle: FloatRangeFilter
   bankDistance: FloatRangeFilter
@@ -304,91 +253,23 @@ type BucketGQL {
   lowerBound: Float!
 }
 
-type Challenge {
+type DeployedConfigGQL {
-  id: ID!
+  allowNewUsers: Boolean!
-  name: String!
+  firebase: Boolean!
-  description: String
+  devMode: Boolean!
-  minimumShots: Int!
+  environment: String!
-  requiredTableSize: Float
+  minimumAllowedAppVersion: String!
-  requiredPocketSize: Float
-  isPublic: Boolean!
-  maxAttempts: Int
-  startDate: DateTime!
-  endDate: DateTime!
-  createdAt: DateTime!
-  updatedAt: DateTime!
-  ruleSet: RuleSet!
-  createdBy: UserGQL!
 }
 
-type RuleSet {
+type MakePercentageIntervalGQL {
-  id: ID!
-  name: String!
-  description: String
-  createdAt: DateTime!
-  updatedAt: DateTime!
-}
-
-type UserGQL {
-  id: Int!
-  firebaseUid: String
-  username: String!
-  isAdmin: Boolean
-  fargoRating: Int
-  activeVideoId: Int
-  stripeCustomerId: String
-  profileImageUri: String
-  createdAt: DateTime
-  updatedAt: DateTime
-  videosPrivateByDefault: Boolean
-  agreesToMarketing: Boolean
-  following: [UserGQL!]
-  followers: [UserGQL!]
-  isFollowedByCurrentUser: Boolean
-}
-
-type ChallengeEntry {
-  id: ID!
-  status: String!
-  shotsCount: Int
-  makesCount: Int
-  makeRate: Float
-  qualified: Boolean
-  createdAt: DateTime!
-  challenge: Challenge!
-  video: VideoGQL
-  user: UserGQL!
-}
-
-type VideoGQL {
-  id: Int!
-  owner: UserGQL
-  name: String
-  screenshotUri: String
-  totalShotsMade: Int!
-  totalShots: Int!
   makePercentage: Float!
-  medianRun: Float
+  elapsedTime: Float!
-  averageTimeBetweenShots: Float
+}
-  averageDifficulty: Float
+
-  createdAt: DateTime
+type GetShotsResult {
-  updatedAt: DateTime
   shots: [ShotGQL!]!
-  startTime: DateTime
+  count: Int
-  endTime: DateTime
+  ids: [Int!]!
-  elapsedTime: Float
-  framesPerSecond: Float!
-  tableSize: Float!
-  pocketSize: Float
-  private: Boolean!
-  stream: UploadStreamGQL
-  playlist: HLSPlaylistGQL
-  tags: [VideoTag!]!
-  currentHomography: HomographyInfoGQL
-  homographyHistory: [HomographyInfoGQL!]!
-  currentProcessing: VideoProcessingGQL
-  reactions: [ReactionGQL!]!
-  comments: [CommentGQL!]!
 }
 
 type ShotGQL {
@@ -407,8 +288,6 @@ type ShotGQL {
   annotations: [ShotAnnotationGQL!]!
   falsePositiveScore: Float
   video: VideoGQL
-  run: RunGQL
-  runFeatures: RunFeaturesGQL
 }
 
 type CueObjectFeaturesGQL {
@@ -460,6 +339,20 @@ type SerializedShotPathsGQL {
   b64EncodedBuffer: String
 }
 
+type UserGQL {
+  id: Int!
+  firebaseUid: String!
+  username: String!
+  isAdmin: Boolean!
+  fargoRating: Int
+  activeVideoId: Int
+  profileImageUri: String
+  createdAt: DateTime
+  updatedAt: DateTime
+  following: [Int!]
+  followers: [Int!]
+}
+
 type ShotAnnotationGQL {
   shotId: Int!
   type: ShotAnnotationTypeGQL!
@@ -475,19 +368,30 @@ type ShotAnnotationTypeGQL {
   name: String!
 }
 
-type RunGQL {
+type VideoGQL {
   id: Int!
-  runLength: Int!
+  owner: UserGQL
-  videoId: Int!
+  name: String
-  userId: Int!
+  screenshotUri: String
+  totalShotsMade: Int!
+  totalShots: Int!
+  makePercentage: Float!
+  medianRun: Float
+  averageTimeBetweenShots: Float
+  createdAt: DateTime
+  updatedAt: DateTime
   shots: [ShotGQL!]!
-  video: VideoGQL!
+  startTime: DateTime
-  user: UserGQL!
+  endTime: DateTime
-}
+  elapsedTime: Float
-
+  framesPerSecond: Float!
-type RunFeaturesGQL {
+  tableSize: Float!
-  runId: Int!
+  stream: UploadStreamGQL
-  indexInRun: Int!
+  playlist: HLSPlaylistGQL
+  tags: [VideoTag!]!
+  currentHomography: HomographyInfoGQL
+  homographyHistory: [HomographyInfoGQL!]!
+  currentProcessing: VideoProcessingGQL
 }
 
 type UploadStreamGQL {
@@ -504,7 +408,6 @@ type UploadStreamGQL {
   createdAt: DateTime!
   updatedAt: DateTime!
   segments: [UploadSegmentGQL!]!
-  clientUploadStatus: ClientUploadStatusEnum
   resolution: VideoResolutionGQL!
   streamSegmentType: StreamSegmentTypeEnum!
 }
@@ -529,11 +432,6 @@ type UploadSegmentGQL {
   linksRequested: Int!
 }
 
-enum ClientUploadStatusEnum {
-  UPLOAD_ENABLED
-  UPLOAD_DISABLED
-}
-
 type VideoResolutionGQL {
   width: Int
   height: Int
@@ -560,7 +458,6 @@ type VideoTagClass {
 }
 
 type HomographyInfoGQL {
-  id: Int!
   frameIndex: Int!
   crop: BoundingBoxGQL!
   pockets: [BoundingBoxGQL!]!
@@ -590,13 +487,9 @@ type IntPoint2D {
 }
 
 type VideoProcessingGQL {
-  id: Int!
   errors: [VideoProcessingErrorGQL!]!
   status: ProcessingStatusEnum!
   statuses: [VideoProcessingStatusGQL!]!
-  framesProcessed: Int
-  currentSegment: Int
-  progressPercentage: Float
 }
 
 type VideoProcessingErrorGQL {
@@ -624,284 +517,33 @@ type VideoProcessingStatusGQL {
   updatedAt: DateTime
 }
 
-type ReactionGQL {
-  videoId: Int!
-  user: UserGQL!
-  reaction: ReactionEnum!
-  createdAt: DateTime
-  updatedAt: DateTime
-}
-
-enum ReactionEnum {
-  LIKE
-  HEART
-  BULLSEYE
-  HUNDRED
-}
-
-type CommentGQL {
-  id: Int!
-  user: UserGQL!
-  message: String!
-  replies: [CommentGQL!]!
-}
-
-type ChallengeInvitation {
-  id: ID!
-  status: String!
-  createdAt: DateTime!
-  challenge: Challenge!
-  inviter: UserGQL!
-}
-
-type DeployedConfigGQL {
-  allowNewUsers: Boolean!
-  firebase: Boolean!
-  devMode: Boolean!
-  environment: String!
-  minimumAllowedAppVersion: String!
-  subscriptionGatingEnabled: Boolean!
-  bannerMessages: [BannerGQL!]!
-}
-
-type BannerGQL {
-  id: Int!
-  message: String!
-  color: String!
-  kind: BannerKindEnum!
-  dismissible: Boolean!
-  priority: Int!
-}
-
-enum BannerKindEnum {
-  INFO
-  WARNING
-  ERROR
-}
-
-type VideoHistoryGQL {
-  videos: [VideoGQL!]!
-  pageInfo: PageInfoGQL!
-  hasFollowing: Boolean!
-}
-
-type PageInfoGQL {
-  hasNextPage: Boolean!
-  endCursor: String
-}
-
-enum IncludePrivateEnum {
-  ALL
-  MINE
-  NONE
-}
-
-input VideoFilterInput {
-  isStreamCompleted: Boolean = null
-  requireCursorCompletion: Boolean! = true
-  createdAt: DateRangeFilter = null
-  excludeVideosWithNoShots: Boolean = null
-}
-
-input VideoFeedInputGQL @oneOf {
-  followedByUserId: Int
-  userId: Int
-  allUsers: Boolean
-  home: Boolean
-}
-
-type MakePercentageIntervalGQL {
-  makePercentage: Float!
-  elapsedTime: Float!
-}
-
-type RunLeaderboardGQL {
-  entries: [RunGQL!]!
-}
-
-type CountLeaderboardGQL {
-  entries: [UserShotCountEntry!]!
-}
-
-type UserShotCountEntry {
-  user: UserGQL!
-  value: Int!
-  total: Int!
-  proportionMade: Float!
-  videos: Int!
-}
-
-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 @deprecated(reason: "no longer supported")
-  totalMakes50: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes75: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes200: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes300: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes400: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes750: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes100: MedalGQL
-  totalMakes500: MedalGQL
-  totalMakes1000: MedalGQL
-  totalMakes5000: MedalGQL
-  totalMakes10000: MedalGQL
-  dailyMakes50: MedalGQL
-  dailyMakes100: MedalGQL
-  dailyMakes150: MedalGQL
-  dailyMakes200: MedalGQL
-  dailyMakes250: MedalGQL
-}
-
-type MedalGQL {
-  count: Int!
-  nickname: String
-}
-
-input MedalScope @oneOf {
-  videoId: Int
-  interval: TimeInterval
-    @deprecated(reason: "NO LONGER SUPPORTED, USE DATETIME_RANGE")
-  datetimeRange: DatetimeRangeAggregationInput
-}
-
-type NotificationConnection {
-  notifications: [NotificationGQL!]!
-  totalCount: Int!
-  unreadCount: Int!
-  hasMore: Boolean!
-}
-
-type NotificationGQL {
-  id: Int!
-  notificationType: NotificationTypeEnum!
-  actor: UserGQL!
-  videoId: Int
-  comment: CommentGQL
-  reactionType: String
-  isRead: Boolean!
-  createdAt: DateTime!
-  readAt: DateTime
-}
-
-enum NotificationTypeEnum {
-  COMMENT
-  COMMENT_REPLY
-  REACTION
-  FOLLOW
-}
-
-input NotificationFilters {
-  isRead: Boolean = null
-  notificationTypes: [NotificationTypeEnum!] = null
-}
-
-type GetRunsResult {
-  runs: [RunGQL!]!
-  count: Int
-  runIds: [Int!]!
-}
-
-input RunFilterInput {
-  videoId: [Int!]
-  userId: [Int!]
-  username: [String!]
-  andFilters: [RunFilterInput!]
-  orFilters: [RunFilterInput!]
-  notFilter: RunFilterInput
-  tableSize: FloatRangeFilter
-  createdAt: DateRangeFilter
-  runLength: FloatRangeFilter
-}
-
-input GetRunsOrdering {
-  orderings: [RunsOrderingComponent!]!
-}
-
-input RunsOrderingComponent @oneOf {
-  runLength: IntOrdering
-  videoId: IntOrdering
-  videoCreation: DatetimeOrdering
-}
-
-input IntOrdering {
-  descending: Boolean! = true
-  startingAt: Int = null
-}
-
-input DatetimeOrdering {
-  descending: Boolean! = true
-  startingAt: DateTime = null
-}
-
-type TableStateGQL {
-  identifierToPosition: [[Float!]!]!
-  homography: HomographyInfoGQL
-}
-
-input HomographyInputGQL {
-  crop: BoundingBoxInputGQL!
-  pockets: [BoundingBoxInputGQL!]!
-  sourcePoints: PocketPointsInputGQL!
-  destPoints: PocketPointsInputGQL!
-}
-
-input BoundingBoxInputGQL {
-  left: Float!
-  top: Float!
-  width: Float!
-  height: Float!
-}
-
-input PocketPointsInputGQL {
-  topLeft: IntPoint2DInput!
-  topSide: IntPoint2DInput!
-  topRight: IntPoint2DInput!
-  bottomLeft: IntPoint2DInput!
-  bottomSide: IntPoint2DInput!
-  bottomRight: IntPoint2DInput!
-}
-
-input IntPoint2DInput {
-  x: Int!
-  y: Int!
-}
-
-type GetShotsResult {
-  shots: [ShotGQL!]!
-  count: Int
-  ids: [Int!]!
-}
-
 input GetShotsOrdering {
   orderings: [ShotsOrderingComponent!]!
 }
 
 input ShotsOrderingComponent @oneOf {
-  videoCreation: DatetimeOrdering
+  videoCreation: DatetimeShotOrdering
-  marginOfError: FloatOrdering
+  marginOfError: FloatShotOrdering
-  difficulty: FloatOrdering
+  videoId: IntShotOrdering
-  videoId: IntOrdering
+  startFrame: IntShotOrdering
-  startFrame: IntOrdering
+  runLength: IntShotOrdering
-  runLength: IntOrdering
 }
 
-input FloatOrdering {
+input DatetimeShotOrdering {
+  descending: Boolean! = true
+  startingAt: DateTime = null
+}
+
+input FloatShotOrdering {
   descending: Boolean! = true
   startingAt: Float = null
 }
 
+input IntShotOrdering {
+  descending: Boolean! = true
+  startingAt: Int = null
+}
+
 input GetShotsPagination {
   createdAfter: CreatedAfter!
   startFrameAfter: Int!
@@ -912,74 +554,35 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
-type UserRelationshipsResult {
+type UsernamesAndFollowingResponse {
-  inquiringUser: UserGQL!
+  usernames: [String!]!
-  relationships: [UserRelationship!]!
+  following: [Int!]!
-}
+  followers: [Int!]!
-
-type UserRelationship {
-  toUser: UserGQL!
-  toUserFollows: Boolean!
-  toUserIsFollowedBy: Boolean!
-}
-
-type StripeSubscriptionOptionsGQL {
-  products: [StripeProductGQL!]!
-}
-
-type StripeProductGQL {
-  id: String!
-  name: String!
-  description: String
-  active: Boolean!
-  prices: [StripePriceGQL!]!
-}
-
-type StripePriceGQL {
-  id: String!
-  currency: String!
-  unitAmount: Int
-  recurringInterval: String
-  recurringIntervalCount: Int
-  type: String!
-  active: Boolean!
-}
-
-type UserSubscriptionStatusGQL {
-  hasActiveSubscription: Boolean!
-  subscriptionStatus: StripeSubscriptionStatusEnum
-  currentPeriodStart: DateTime
-  currentPeriodEnd: DateTime
-  validUntil: DateTime
-  stripePriceId: String
-  stripeSubscriptionId: String
-}
-
-enum StripeSubscriptionStatusEnum {
-  INCOMPLETE
-  INCOMPLETE_EXPIRED
-  TRIALING
-  ACTIVE
-  PAST_DUE
-  CANCELED
-  UNPAID
-  PAUSED
 }
 
 type UserPlayTimeGQL {
   totalSeconds: Float!
 }
 
-type TagGQL {
+type VideoHistoryGQL {
-  id: Int!
+  videos: [VideoGQL!]!
-  name: String!
+  pageInfo: PageInfoGQL!
-  tagClasses: [TagClassGQL!]
-  retired: Boolean!
 }
 
-type TagClassGQL {
+type PageInfoGQL {
-  id: Int!
+  hasNextPage: Boolean!
+  endCursor: String
+}
+
+input VideoFilterInput {
+  isStreamCompleted: Boolean = null
+  requireCursorCompletion: Boolean! = true
+}
+
+type TagGQL {
   name: String!
+  id: Int!
+  group: String
 }
 
 """
@@ -992,50 +595,7 @@ scalar JSON
 
 type Mutation {
   createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
-  createRuleSet(name: String!, description: String = null): RuleSet!
-  createChallenge(
-    name: String!
-    ruleSetId: ID!
-    minimumShots: Int!
-    startDate: DateTime!
-    endDate: DateTime!
-    description: String = null
-    requiredTableSize: Float = null
-    requiredPocketSize: Float = null
-    isPublic: Boolean! = false
-    maxAttempts: Int = null
-  ): Challenge!
-  inviteUsersToChallenge(
-    challengeId: ID!
-    userIds: [ID!]!
-  ): [ChallengeInvitation!]!
-  respondToChallengeInvitation(
-    invitationId: ID!
-    accept: Boolean!
-  ): ChallengeInvitation!
-  startChallenge(challengeId: ID!): ChallengeEntry!
-  recalculateChallengeEntry(entryId: ID!): ChallengeEntry!
-  submitChallengeEntry(entryId: ID!, videoId: ID!): ChallengeEntry!
   setLoggerLevel(path: String!, level: String!): Boolean!
-  reactToVideo(videoId: Int!, reaction: ReactionEnum): Boolean!
-  commentOnVideo(
-    videoId: Int!
-    message: String!
-    parentCommentId: Int
-  ): Boolean!
-  editComment(videoId: Int!, commentId: Int!, newMessage: String!): Boolean!
-  deleteComment(videoId: Int!, commentId: Int!): Boolean!
-  blockContent(videoId: Int!): Boolean!
-  blockUser(userId: Int!): Boolean!
-  reportContent(
-    videoId: Int!
-    reason: ReportReasonEnum!
-    customReason: String = null
-  ): Boolean!
-  markNotificationAsRead(notificationId: Int!): Boolean!
-  markAllNotificationsAsRead: Boolean!
-  markNotificationsAsRead(notificationIds: [Int!]!): Boolean!
-  deleteNotification(notificationId: Int!): Boolean!
   addAnnotationToShot(
     shotId: Int!
     annotationName: String!
@@ -1045,10 +605,6 @@ type Mutation {
     shotId: Int!
     annotations: [UpdateAnnotationInputGQL!]!
   ): UpdateShotAnnotationReturn!
-  editShot(
-    shotId: Int!
-    fieldsToEdit: EditableShotFieldInputGQL!
-  ): EditShotReturn!
   getProfileImageUploadLink(
     fileExt: String = ".png"
   ): GetProfileUploadLinkReturn!
@@ -1056,12 +612,6 @@ type Mutation {
   editUser(input: EditUserInputGQL!): UserGQL!
   followUser(followedUserId: Int!): UserGQL!
   unfollowUser(followedUserId: Int!): UserGQL!
-  retireTags(tagIds: [Int!]!): Boolean!
-  ensureStripeCustomerExists: UserGQL!
-  deleteUser: Boolean!
-  createSubscription(priceId: String!): CreateSubscriptionResultGQL!
-  cancelSubscription: UserSubscriptionStatusGQL!
-  findPrerecordTableLayout(b64Image: String!, videoId: Int!): HomographyInfoGQL
   createUploadStream(
     videoMetadata: VideoMetadataInput!
   ): CreateUploadStreamReturn!
@@ -1074,7 +624,6 @@ type Mutation {
   ): Boolean!
   editUploadStream(videoId: Int!, videoMetadata: VideoMetadataInput!): Boolean!
   deleteVideo(videoId: Int!): Boolean!
-  deleteTags(videoId: Int!, tagsToDelete: [VideoTagInput!]!): Boolean!
 }
 
 input CreateBucketSetInput {
@@ -1083,15 +632,6 @@ input CreateBucketSetInput {
   buckets: [BucketInputGQL!]!
 }
 
-enum ReportReasonEnum {
-  SPAM
-  NUDITY
-  VIOLENCE
-  HATE
-  COPYRIGHT
-  OTHER
-}
-
 type AddShotAnnotationReturn {
   value: SuccessfulAddAddShotAnnotationErrors!
 }
@@ -1131,22 +671,6 @@ input UpdateAnnotationInputGQL {
   notes: String = null
 }
 
-type EditShotReturn {
-  shot: ShotGQL
-  error: DoesNotOwnShotErr
-}
-
-input EditableShotFieldInputGQL {
-  intendedPocketType: PocketEnum
-  shotDirection: ShotDirectionEnum
-  spinType: SpinTypeEnum
-  targetPocketAngleDirection: ShotDirectionEnum
-  make: Boolean
-  backcut: Boolean
-  excludeFromStats: Boolean
-  notes: String
-}
-
 type GetProfileUploadLinkReturn {
   value: UploadLinkGetProfileUploadLinkErrors!
 }
@@ -1176,13 +700,6 @@ type TooManyProfileImageUploadsErr {
 input EditUserInputGQL {
   username: String = null
   fargoRating: Int = null
-  videosPrivateByDefault: Boolean = null
-  agreesToMarketing: Boolean = null
-}
-
-type CreateSubscriptionResultGQL {
-  checkoutUrl: String!
-  sessionId: String!
 }
 
 type CreateUploadStreamReturn {
@@ -1194,19 +711,10 @@ input VideoMetadataInput {
   startTime: DateTime = null
   endTime: DateTime = null
   gameType: String = null
-    @deprecated(reason: "`game_type` is deprecated. Use `tags` instead.")
-
-  """
-  A list of tags associated with the video. Replace `game_type`
-  """
-  tags: [VideoTagInput!] = null
   tableSize: Float = null
-  pocketSize: Float = null
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null
-  private: Boolean = null
   endStream: Boolean! = false
-  clientUploadStatus: ClientUploadStatusEnum = null
   resolution: VideoResolution = null
   framesPerSecond: Float = null
 }