Add option to trim UUIDs in skip segments endpoint

ajayyy · Jan 18, 2025 · be9d97a · be9d97a
1 parent 06f83cd
commit be9d97a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/routes/getSkipSegments.ts b/src/routes/getSkipSegments.ts
@@ -150,7 +150,7 @@ async function getSegmentsByVideoID(req: Request, videoID: VideoID, categories:
 }
 
 async function getSegmentsByHash(req: Request, hashedVideoIDPrefix: VideoIDHash, categories: Category[],
-    actionTypes: ActionType[], requiredSegments: SegmentUUID[], service: Service): Promise<SBRecord<VideoID, VideoData>> {
+    actionTypes: ActionType[], trimUUIDs: number, requiredSegments: SegmentUUID[], service: Service): Promise<SBRecord<VideoID, VideoData>> {
     const cache: SegmentCache = { shadowHiddenSegmentIPs: {} };
     const segments: SBRecord<VideoID, VideoData> = {};
 
@@ -188,7 +188,7 @@ async function getSegmentsByHash(req: Request, hashedVideoIDPrefix: VideoIDHash,
                     category: segment.category,
                     actionType: segment.actionType,
                     segment: segment.segment,
-                    UUID: segment.UUID,
+                    UUID: trimUUIDs ? segment.UUID.substring(0, trimUUIDs) as SegmentUUID : segment.UUID,
                     videoDuration: segment.videoDuration,
                     locked: segment.locked,
                     votes: segment.votes,

diff --git a/src/routes/getSkipSegmentsByHash.ts b/src/routes/getSkipSegmentsByHash.ts
@@ -17,10 +17,10 @@ export async function getSkipSegmentsByHash(req: Request, res: Response): Promis
     if (parseResult.errors.length > 0) {
         return res.status(400).send(parseResult.errors);
     }
-    const { categories, actionTypes, requiredSegments, service } = parseResult;
+    const { categories, actionTypes, trimUUIDs, requiredSegments, service } = parseResult;
 
     // Get all video id's that match hash prefix
-    const segments = await getSegmentsByHash(req, hashPrefix, categories, actionTypes, requiredSegments, service);
+    const segments = await getSegmentsByHash(req, hashPrefix, categories, actionTypes, trimUUIDs, requiredSegments, service);
 
     try {
         await getEtag("skipSegmentsHash", hashPrefix, service)

diff --git a/src/utils/parseSkipSegments.ts b/src/utils/parseSkipSegments.ts
@@ -9,12 +9,14 @@ const errorMessage = (parameter: string) => `${parameter} parameter does not mat
 export function parseSkipSegments(req: Request): {
     categories: Category[];
     actionTypes: ActionType[];
+    trimUUIDs: number | null;
     requiredSegments: SegmentUUID[];
     service: Service;
     errors: string[];
 } {
     const categories: Category[] = parseCategories(req, [ "sponsor" as Category ]);
     const actionTypes: ActionType[] = parseActionTypes(req, [ActionType.Skip]);
+    const trimUUIDs: number | null = req.query.trimUUIDs ? (parseInt(req.query.trimUUIDs as string) || null) : null;
     const requiredSegments: SegmentUUID[] = parseRequiredSegments(req);
     const service: Service = getService(req.query.service, req.body.services);
     const errors: string[] = [];
@@ -27,6 +29,7 @@ export function parseSkipSegments(req: Request): {
     return {
         categories,
         actionTypes,
+        trimUUIDs,
         requiredSegments,
         service,
         errors