Add stream type to get videos

src/index.tsx

@@ -34,16 +34,6 @@ export type Scalars = {
   JSON: { input: any; output: any };
 };
 
-export type AddShotAnnotationErrors = {
-  __typename?: "AddShotAnnotationErrors";
-  error: DoesNotOwnShotErrOtherErrorNeedsNote;
-};
-
-export type AddShotAnnotationReturn = {
-  __typename?: "AddShotAnnotationReturn";
-  value: SuccessfulAddAddShotAnnotationErrors;
-};
-
 export type AggregateInputGql = {
   aggregations: Array<AggregationInput>;
   filterInput?: InputMaybe<FilterInput>;
@@ -141,16 +131,6 @@ export enum DeviceTypeEnum {
   Ios = "IOS",
 }
 
-export type DoesNotOwnShotErr = {
-  __typename?: "DoesNotOwnShotErr";
-  msg?: Maybe<Scalars["String"]["output"]>;
-  shotId: Scalars["Int"]["output"];
-};
-
-export type DoesNotOwnShotErrOtherErrorNeedsNote =
-  | DoesNotOwnShotErr
-  | OtherErrorNeedsNote;
-
 export type EnumAggregation = {
   feature: Scalars["String"]["input"];
 };
@@ -1117,16 +1097,6 @@ export type FilterInput =
       videoId: Array<Scalars["Int"]["input"]>;
     };
 
-export type GetProfileUploadLinkErrors = {
-  __typename?: "GetProfileUploadLinkErrors";
-  error: TooManyProfileImageUploadsErr;
-};
-
-export type GetProfileUploadLinkReturn = {
-  __typename?: "GetProfileUploadLinkReturn";
-  value: UploadLinkGetProfileUploadLinkErrors;
-};
-
 export type GetShotsPagination = {
   createdAfter: CreatedAfter;
   startFrameAfter: Scalars["Int"]["input"];
@@ -1199,14 +1169,14 @@ export type MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailed
 
 export type Mutation = {
   __typename?: "Mutation";
-  addAnnotationToShot: AddShotAnnotationReturn;
+  addAnnotationToShot: Scalars["Boolean"]["output"];
   createBucketSet: BucketSetGql;
   createUploadStream: CreateUploadStreamReturn;
   deleteVideo: Scalars["Boolean"]["output"];
   editProfileImageUri: UserGql;
   editUploadStream: Scalars["Boolean"]["output"];
   getHlsInitUploadLink: GetUploadLinkReturn;
-  getProfileImageUploadLink: GetProfileUploadLinkReturn;
+  getProfileImageUploadLink: GetUploadLinkReturn;
   getUploadLink: GetUploadLinkReturn;
   setLoggerLevel: Scalars["Boolean"]["output"];
   setSegmentDuration: Scalars["Boolean"]["output"];
@@ -1214,7 +1184,6 @@ export type Mutation = {
 
 export type MutationAddAnnotationToShotArgs = {
   annotationName: Scalars["String"]["input"];
-  notes?: InputMaybe<Scalars["String"]["input"]>;
   shotId: Scalars["Int"]["input"];
 };
 
@@ -1268,11 +1237,6 @@ export type NoInitForChunkedUploadErr = {
   segmentType: StreamSegmentTypeEnum;
 };
 
-export type OtherErrorNeedsNote = {
-  __typename?: "OtherErrorNeedsNote";
-  msg?: Maybe<Scalars["String"]["output"]>;
-};
-
 export type PageInfoGql = {
   __typename?: "PageInfoGQL";
   endCursor?: Maybe<Scalars["String"]["output"]>;
@@ -1349,10 +1313,6 @@ export type QueryGetPlayTimeArgs = {
   userId: Scalars["Int"]["input"];
 };
 
-export type QueryGetShotAnnotationTypesArgs = {
-  errorTypes?: InputMaybe<Scalars["Boolean"]["input"]>;
-};
-
 export type QueryGetShotsArgs = {
   filterInput: FilterInput;
   limit?: Scalars["Int"]["input"];
@@ -1417,7 +1377,6 @@ export type ShotAnnotationGql = {
   __typename?: "ShotAnnotationGQL";
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
   creator: UserGql;
-  errorDefault: Scalars["Boolean"]["output"];
   notes: Scalars["String"]["output"];
   shotId: Scalars["Int"]["output"];
   type: ShotAnnotationTypeGql;
@@ -1468,15 +1427,6 @@ export enum StreamSegmentTypeEnum {
   RbChunkedMp4 = "RB_CHUNKED_MP4",
 }
 
-export type SuccessfulAdd = {
-  __typename?: "SuccessfulAdd";
-  value: Scalars["Boolean"]["output"];
-};
-
-export type SuccessfulAddAddShotAnnotationErrors =
-  | AddShotAnnotationErrors
-  | SuccessfulAdd;
-
 export type TagGql = {
   __typename?: "TagGQL";
   group?: Maybe<Scalars["String"]["output"]>;
@@ -1502,10 +1452,6 @@ export type UploadLink = {
   uploadUrl: Scalars["String"]["output"];
 };
 
-export type UploadLinkGetProfileUploadLinkErrors =
-  | GetProfileUploadLinkErrors
-  | UploadLink;
-
 export type UploadLinkGetUploadLinkErrors = GetUploadLinkErrors | UploadLink;
 
 export type UploadSegmentGql = {
@@ -1831,14 +1777,19 @@ export type GetProfileImageUploadLinkMutationVariables = Exact<{
 export type GetProfileImageUploadLinkMutation = {
   __typename?: "Mutation";
   getProfileImageUploadLink: {
-    __typename?: "GetProfileUploadLinkReturn";
+    __typename?: "GetUploadLinkReturn";
     value:
       | {
-          __typename?: "GetProfileUploadLinkErrors";
-          error: {
-            __typename?: "TooManyProfileImageUploadsErr";
-            linksRequested: number;
-          };
+          __typename?: "GetUploadLinkErrors";
+          error:
+            | { __typename?: "MustHaveSetForUploadLinkErr" }
+            | { __typename?: "NoInitForChunkedUploadErr" }
+            | { __typename?: "ProcessingFailedErr" }
+            | { __typename?: "SegmentAlreadyUploadedErr" }
+            | {
+                __typename?: "TooManyProfileImageUploadsErr";
+                linksRequested: number;
+              };
         }
       | {
           __typename?: "UploadLink";
@@ -2044,13 +1995,10 @@ export type GetVideosQuery = {
   getVideos: Array<{
     __typename?: "VideoGQL";
     id: number;
-    playlist?: {
-      __typename?: "HLSPlaylistGQL";
-      segmentDurations: Array<number>;
-    } | null;
     stream?: {
       __typename?: "UploadStreamGQL";
       id: string;
+      streamSegmentType: StreamSegmentTypeEnum;
       segments: Array<{
         __typename?: "UploadSegmentGQL";
         uploaded: boolean;
@@ -2060,6 +2008,10 @@ export type GetVideosQuery = {
         framesPerSecond?: number | null;
       }>;
     } | null;
+    playlist?: {
+      __typename?: "HLSPlaylistGQL";
+      segmentDurations: Array<number>;
+    } | null;
   }>;
 };
 
@@ -2240,10 +2192,6 @@ export type GetUploadLinkMutation = {
             value: string;
           } | null>;
         };
-    stream?: {
-      __typename?: "UploadStreamGQL";
-      uploadCompletionCursor: number;
-    } | null;
   };
 };
 
@@ -2895,7 +2843,7 @@ export const GetProfileImageUploadLinkDocument = gql`
             value
           }
         }
-        ... on GetProfileUploadLinkErrors {
+        ... on GetUploadLinkErrors {
           error {
             ... on TooManyProfileImageUploadsErr {
               linksRequested
@@ -3601,11 +3549,9 @@ export const GetVideosDocument = gql`
   query GetVideos($videoIds: [Int!]!) {
     getVideos(videoIds: $videoIds) {
       id
-      playlist {
-        segmentDurations
-      }
       stream {
         id
+        streamSegmentType
         segments {
           uploaded
           valid
@@ -3614,6 +3560,9 @@ export const GetVideosDocument = gql`
           framesPerSecond
         }
       }
+      playlist {
+        segmentDurations
+      }
     }
   }
 `;
@@ -4193,9 +4142,6 @@ export const GetUploadLinkDocument = gql`
           }
         }
       }
-      stream {
-        uploadCompletionCursor
-      }
     }
   }
 `;

src/operations/user.gql

@@ -8,7 +8,7 @@ mutation getProfileImageUploadLink($fileExt: String = ".png") {
           value
         }
       }
-      ... on GetProfileUploadLinkErrors {
+      ... on GetUploadLinkErrors {
         error {
           ... on TooManyProfileImageUploadsErr {
             linksRequested

src/operations/video.gql

@@ -118,11 +118,9 @@ query GetVideoDetails($videoId: Int!) {
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
     id
-    playlist {
-      segmentDurations
-    }
     stream {
       id
+      streamSegmentType
       segments {
         uploaded
         valid
@@ -131,6 +129,9 @@ query GetVideos($videoIds: [Int!]!) {
         framesPerSecond
       }
     }
+    playlist {
+      segmentDurations
+    }
   }
 }
 

src/operations/video_upload.gql

@@ -34,9 +34,6 @@ mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
         }
       }
     }
-    stream {
-      uploadCompletionCursor
-    }
   }
 }
 

src/schema.gql

@@ -14,7 +14,7 @@ type Query {
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
   ): [ShotGQL!]!
-  getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
+  getShotAnnotationTypes: [ShotAnnotationTypeGQL!]!
   getUser(userId: Int!): UserGQL
   getLoggedInUser: UserGQL
   getUsernames(
@@ -231,7 +231,6 @@ type ShotAnnotationGQL {
   type: ShotAnnotationTypeGQL!
   creator: UserGQL!
   notes: String!
-  errorDefault: Boolean!
   createdAt: DateTime
   updatedAt: DateTime
 }
@@ -435,14 +434,8 @@ scalar JSON
 type Mutation {
   createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
   setLoggerLevel(path: String!, level: String!): Boolean!
-  addAnnotationToShot(
-    shotId: Int!
-    annotationName: String!
-    notes: String = null
-  ): AddShotAnnotationReturn!
-  getProfileImageUploadLink(
-    fileExt: String = ".png"
-  ): GetProfileUploadLinkReturn!
+  addAnnotationToShot(shotId: Int!, annotationName: String!): Boolean!
+  getProfileImageUploadLink(fileExt: String = ".png"): GetUploadLinkReturn!
   editProfileImageUri(profileImageUri: String!): UserGQL!
   createUploadStream(
     videoMetadata: VideoMetadataInput!
@@ -464,42 +457,12 @@ input CreateBucketSetInput {
   buckets: [BucketInputGQL!]!
 }
 
-type AddShotAnnotationReturn {
-  value: SuccessfulAddAddShotAnnotationErrors!
+type GetUploadLinkReturn {
+  value: UploadLinkGetUploadLinkErrors!
+  stream: UploadStreamGQL
 }
 
-union SuccessfulAddAddShotAnnotationErrors =
-    SuccessfulAdd
-  | AddShotAnnotationErrors
-
-type SuccessfulAdd {
-  value: Boolean!
-}
-
-type AddShotAnnotationErrors {
-  error: DoesNotOwnShotErrOtherErrorNeedsNote!
-}
-
-union DoesNotOwnShotErrOtherErrorNeedsNote =
-    DoesNotOwnShotErr
-  | OtherErrorNeedsNote
-
-type DoesNotOwnShotErr {
-  shotId: Int!
-  msg: String
-}
-
-type OtherErrorNeedsNote {
-  msg: String
-}
-
-type GetProfileUploadLinkReturn {
-  value: UploadLinkGetProfileUploadLinkErrors!
-}
-
-union UploadLinkGetProfileUploadLinkErrors =
-    UploadLink
-  | GetProfileUploadLinkErrors
+union UploadLinkGetUploadLinkErrors = UploadLink | GetUploadLinkErrors
 
 type UploadLink {
   uploadUrl: String!
@@ -511,8 +474,32 @@ type Header {
   value: String!
 }
 
-type GetProfileUploadLinkErrors {
-  error: TooManyProfileImageUploadsErr!
+type GetUploadLinkErrors {
+  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr!
+}
+
+union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr =
+    MustHaveSetForUploadLinkErr
+  | SegmentAlreadyUploadedErr
+  | ProcessingFailedErr
+  | NoInitForChunkedUploadErr
+  | TooManyProfileImageUploadsErr
+
+type MustHaveSetForUploadLinkErr {
+  resolution: Boolean
+  framesPerSecond: Boolean
+}
+
+type SegmentAlreadyUploadedErr {
+  segmentId: Int!
+}
+
+type ProcessingFailedErr {
+  processing: VideoProcessingGQL!
+}
+
+type NoInitForChunkedUploadErr {
+  segmentType: StreamSegmentTypeEnum!
 }
 
 type TooManyProfileImageUploadsErr {
@@ -559,38 +546,3 @@ input VideoResolution {
   width: Int!
   height: Int!
 }
-
-type GetUploadLinkReturn {
-  value: UploadLinkGetUploadLinkErrors!
-  stream: UploadStreamGQL
-}
-
-union UploadLinkGetUploadLinkErrors = UploadLink | GetUploadLinkErrors
-
-type GetUploadLinkErrors {
-  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr!
-}
-
-union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr =
-    MustHaveSetForUploadLinkErr
-  | SegmentAlreadyUploadedErr
-  | ProcessingFailedErr
-  | NoInitForChunkedUploadErr
-  | TooManyProfileImageUploadsErr
-
-type MustHaveSetForUploadLinkErr {
-  resolution: Boolean
-  framesPerSecond: Boolean
-}
-
-type SegmentAlreadyUploadedErr {
-  segmentId: Int!
-}
-
-type ProcessingFailedErr {
-  processing: VideoProcessingGQL!
-}
-
-type NoInitForChunkedUploadErr {
-  segmentType: StreamSegmentTypeEnum!
-}