mirrors/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-05-11 18:36:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add option to trim UUIDs in skip segments endpoint

Browse source
This commit is contained in:
Ajay 2025-01-18 02:09:46 -05:00
parent 06f83cd8d4
commit be9d97ae2b
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/routes/getSkipSegments.ts
View file

@ -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,

4
src/routes/getSkipSegmentsByHash.ts
View file

@ -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)

3
src/utils/parseSkipSegments.ts
View file

@ -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