GetShotsWithMetadata accepts ids

codegen.yml

@@ -1,7 +1,5 @@
 overwrite: true
-schema:
-  - "src/schema.gql"
-  - "src/client-schema.gql"
+schema: "src/schema.gql"
 documents: "src/**/*.gql"
 generates:
   src/index.tsx:

src/client-schema.gql

@@ -1,25 +0,0 @@
-# see: https://www.apollographql.com/docs/react/local-state/managing-state-with-field-policies/
-directive @client on FIELD
-
-extend type ShotGQL {
-  startTime: Float!
-  endTime: Float!
-}
-
-extend type UploadStreamGQL {
-  segmentEndFrames: [Int!]!
-}
-
-extend type HLSPlaylistGQL {
-  segmentStartTimes: [Float!]!
-}
-
-type SegmentEndFramesGQL {
-  id: Int!
-  segmentEndFrames: [Int!]!
-}
-
-type SegmentStartTimesGQL {
-  id: Int!
-  segmentStartTimes: [Float!]!
-}

src/operations/shots.gql

@@ -17,61 +17,6 @@ query GetShotAnnotationTypes {
   }
 }
 
-mutation UpdateShotAnnotations(
-  $shotId: Int!
-  $annotations: [UpdateAnnotationInputGQL!]!
-) {
-  updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
-    value {
-      ... on SuccessfulUpdate {
-        value
-      }
-      ... on UpdateShotAnnotationErrors {
-        error {
-          shotId
-          msg
-        }
-      }
-    }
-  }
-}
-
-query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
-  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
-    ids
-    shots {
-      id
-      videoId
-      video {
-        screenshotUri
-        endTime
-      }
-    }
-  }
-}
-
-## Reserved for playlists (which are created from a filter)
-query GetShotsWithMetadataFilterResult(
-  $filterInput: FilterInput!
-  $shotsOrdering: GetShotsOrdering
-  $limit: Int
-  $ids: [Int!]
-) {
-  getOrderedShots(
-    filterInput: $filterInput
-    shotsOrdering: $shotsOrdering
-    limit: $limit
-    ids: $ids
-  ) {
-    count
-    shots {
-      ...ShotWithAllFeatures
-    }
-    ids
-  }
-}
-
-# TODO: Delete
 query GetShotsWithMetadata(
   $filterInput: FilterInput!
   $shotsPagination: GetShotsPagination
@@ -103,12 +48,18 @@ fragment ShotWithAllFeatures on ShotGQL {
   videoId
   startFrame
   endFrame
-  startTime @client
-  endTime @client
   user {
     id
   }
   falsePositiveScore
+  video {
+    stream {
+      resolution {
+        width
+        height
+      }
+    }
+  }
   createdAt
   updatedAt
   cueObjectFeatures {
@@ -119,11 +70,8 @@ fragment ShotWithAllFeatures on ShotGQL {
     spinType
   }
   pocketingIntentionFeatures {
-    make
     targetPocketDistance
-    targetPocketAngle
-    targetPocketAngleDirection
-    marginOfErrorInDegrees
+    make
     intendedPocketType
   }
   pocketingIntentionInfo {
@@ -134,12 +82,4 @@ fragment ShotWithAllFeatures on ShotGQL {
   serializedShotPaths {
     b64EncodedBuffer
   }
-  annotations {
-    shotId
-    type {
-      id
-      name
-    }
-    notes
-  }
 }

src/operations/user.gql

@@ -57,24 +57,6 @@ query getUsernames(
   getUsernames(matchString: $matchString, limit: $limit, after: $after)
 }
 
-query getUsernamesAndFollowing(
-  $userId: Int!
-  $matchString: String!
-  $limit: Int = null
-  $after: String = null
-) {
-  getUsernamesAndFollowing(
-    userId: $userId
-    matchString: $matchString
-    limit: $limit
-    after: $after
-  ) {
-    followers
-    following
-    usernames
-  }
-}
-
 query GetUserTags {
   getUserTags {
     id

src/operations/video.gql

@@ -117,32 +117,22 @@ query GetVideoDetails($videoId: Int!) {
 
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
-    ...VideoStreamMetadata
-  }
-}
-
-fragment VideoStreamMetadata on VideoGQL {
-  id
-  framesPerSecond
-  stream {
     id
-    streamSegmentType
-    segments {
-      uploaded
-      valid
-      segmentIndex
-      endFrameIndex
-      framesPerSecond
+    framesPerSecond
+    stream {
+      id
+      streamSegmentType
+      segments {
+        uploaded
+        valid
+        segmentIndex
+        endFrameIndex
+        framesPerSecond
+      }
+    }
+    playlist {
+      segmentDurations
     }
-  }
-  playlist {
-    segmentDurations
-  }
-}
-
-query GetVideoForShotTime($videoId: Int!) {
-  getVideo(videoId: $videoId) {
-    ...VideoStreamMetadata
   }
 }
 
@@ -214,14 +204,12 @@ query GetAverageTimePerShotForVideo($videoId: Int!) {
     averageTimeBetweenShots
   }
 }
-
 query GetElapsedTimeForVideo($videoId: Int!) {
   getVideo(videoId: $videoId) {
     id
     elapsedTime
   }
 }
-
 query GetMedianRunForVideo($videoId: Int!) {
   getVideo(videoId: $videoId) {
     id
@@ -229,60 +217,23 @@ query GetMedianRunForVideo($videoId: Int!) {
   }
 }
 
-fragment StreamWithEndFrames on UploadStreamGQL {
-  id
-  streamSegmentType
-  segmentEndFrames @client
-  resolution {
-    width
-    height
-  }
-  segments {
-    uploaded
-    valid
-    segmentIndex
-    endFrameIndex
-    framesPerSecond
-  }
-}
-
-fragment SegmentEndFrames on SegmentEndFramesGQL {
-  id
-  segmentEndFrames
-}
-
-fragment SegmentStartTimes on SegmentStartTimesGQL {
-  id
-  segmentStartTimes
-}
-
-fragment PlaylistWithSegmentStartTimes on HLSPlaylistGQL {
-  videoId
-  segmentDurations
-  segmentStartTimes @client
-}
-
-fragment VideoDurationData on VideoGQL {
-  id
-  framesPerSecond
-  playlist {
-    ...PlaylistWithSegmentStartTimes
-  }
-  stream {
-    ...StreamWithEndFrames
-  }
-}
-
 query GetVideoForClipTimes($videoId: Int!) {
-  getVideo(videoId: $videoId) {
-    ...VideoDurationData
-  }
-}
-
-query GetHeaderInfoByVideoId($videoId: Int!) {
   getVideo(videoId: $videoId) {
     id
-    name
-    startTime
+    framesPerSecond
+    playlist {
+      segmentDurations
+    }
+    stream {
+      id
+      streamSegmentType
+      segments {
+        uploaded
+        valid
+        segmentIndex
+        endFrameIndex
+        framesPerSecond
+      }
+    }
   }
 }

src/schema.gql

@@ -9,12 +9,6 @@ type Query {
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
-  getOrderedShots(
-    filterInput: FilterInput!
-    ids: [Int!] = null
-    shotsOrdering: GetShotsOrdering = null
-    limit: Int! = 500
-  ): GetShotsResult!
   getShotsWithMetadata(
     filterInput: FilterInput!
     ids: [Int!] = null
@@ -35,12 +29,6 @@ type Query {
     limit: Int = null
     after: String = null
   ): [String!]!
-  getUsernamesAndFollowing(
-    userId: Int!
-    matchString: String = null
-    limit: Int = 100
-    after: String = null
-  ): UsernamesAndFollowingResponse!
   getPlayTime(userId: Int!): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
@@ -51,11 +39,6 @@ type Query {
   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 {
@@ -142,7 +125,6 @@ enum AlignedIntervalEnum {
   MONTH
   YEAR
   WEEK
-  DAY
 }
 
 input FilterInput @oneOf {
@@ -158,8 +140,6 @@ input FilterInput @oneOf {
   shotDirection: [ShotDirectionEnum!]
   videoId: [Int!]
   userId: [Int!]
-  username: [String!]
-  fargoRating: FloatRangeFilter
   make: [Boolean!]
   tags: [VideoTagInput!]
   annotations: [ShotAnnotationInput!]
@@ -182,10 +162,7 @@ input FilterInput @oneOf {
   targetPocketAngleDirection: [ShotDirectionEnum!]
   targetPocketAngle: FloatRangeFilter
   missAngleInDegrees: FloatRangeFilter
-  marginOfErrorInDegrees: FloatRangeFilter
   createdAt: DateRangeFilter
-  totalDistance: FloatRangeFilter
-  runLength: FloatRangeFilter
 }
 
 input FloatRangeFilter {
@@ -305,7 +282,6 @@ type PocketingIntentionFeaturesGQL {
   difficulty: Float
   targetPocketAngle: Float
   targetPocketAngleDirection: ShotDirectionEnum
-  marginOfErrorInDegrees: Float
   backcut: Boolean
 }
 
@@ -344,13 +320,10 @@ type UserGQL {
   firebaseUid: String!
   username: String!
   isAdmin: Boolean!
-  fargoRating: Int
   activeVideoId: Int
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
-  following: [Int!]
-  followers: [Int!]
 }
 
 type ShotAnnotationGQL {
@@ -517,33 +490,6 @@ type VideoProcessingStatusGQL {
   updatedAt: DateTime
 }
 
-input GetShotsOrdering {
-  orderings: [ShotsOrderingComponent!]!
-}
-
-input ShotsOrderingComponent @oneOf {
-  videoCreation: DatetimeShotOrdering
-  marginOfError: FloatShotOrdering
-  videoId: IntShotOrdering
-  startFrame: IntShotOrdering
-  runLength: IntShotOrdering
-}
-
-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!
@@ -554,12 +500,6 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
-type UsernamesAndFollowingResponse {
-  usernames: [String!]!
-  following: [Int!]!
-  followers: [Int!]!
-}
-
 type UserPlayTimeGQL {
   totalSeconds: Float!
 }
@@ -601,17 +541,10 @@ type Mutation {
     annotationName: String!
     notes: String = null
   ): AddShotAnnotationReturn!
-  updateShotAnnotations(
-    shotId: Int!
-    annotations: [UpdateAnnotationInputGQL!]!
-  ): UpdateShotAnnotationReturn!
   getProfileImageUploadLink(
     fileExt: String = ".png"
   ): GetProfileUploadLinkReturn!
   editProfileImageUri(profileImageUri: String!): UserGQL!
-  editUser(input: EditUserInputGQL!): UserGQL!
-  followUser(followedUserId: Int!): UserGQL!
-  unfollowUser(followedUserId: Int!): UserGQL!
   createUploadStream(
     videoMetadata: VideoMetadataInput!
   ): CreateUploadStreamReturn!
@@ -661,27 +594,6 @@ type OtherErrorNeedsNote {
   msg: String
 }
 
-type UpdateShotAnnotationReturn {
-  value: SuccessfulUpdateUpdateShotAnnotationErrors!
-}
-
-union SuccessfulUpdateUpdateShotAnnotationErrors =
-    SuccessfulUpdate
-  | UpdateShotAnnotationErrors
-
-type SuccessfulUpdate {
-  value: Boolean!
-}
-
-type UpdateShotAnnotationErrors {
-  error: DoesNotOwnShotErr
-}
-
-input UpdateAnnotationInputGQL {
-  name: String!
-  notes: String = null
-}
-
 type GetProfileUploadLinkReturn {
   value: UploadLinkGetProfileUploadLinkErrors!
 }
@@ -708,11 +620,6 @@ type TooManyProfileImageUploadsErr {
   linksRequested: Int!
 }
 
-input EditUserInputGQL {
-  username: String = null
-  fargoRating: Int = null
-}
-
 type CreateUploadStreamReturn {
   videoId: Int!
 }
@@ -723,6 +630,7 @@ input VideoMetadataInput {
   endTime: DateTime = null
   gameType: String = null
   tableSize: Float = null
+  uploadStreamMetadataInput: UploadStreamMetadataInput = null
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null
   endStream: Boolean! = false
@@ -730,6 +638,24 @@ input VideoMetadataInput {
   framesPerSecond: Float = null
 }
 
+input UploadStreamMetadataInput {
+  deviceType: DeviceTypeEnum = null
+  osVersion: String = null
+  appVersion: String = null
+  browserName: String = null
+  browserVersion: String = null
+  locale: String = null
+  timezone: String = null
+  networkType: String = null
+  ipAddress: String = null
+}
+
+enum DeviceTypeEnum {
+  IOS
+  ANDROID
+  BROWSER
+}
+
 input VideoResolution {
   width: Int!
   height: Int!