Mirror/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-12-06 11:36:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix naming regression, simplify findCategory

Browse Source
This commit is contained in:
Michael C
2022-03-31 14:19:06 -04:00
parent 2fb7f4faa6
commit 65a661ca4d
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/routes/getVideoLabel.ts
View File

@@ -118,16 +118,11 @@ function chooseSegment<T extends DBSegment>(choices: T[]): Segment[] {
return transformDBSegments(choices); return transformDBSegments(choices);
} }
// sponsor > exclusive > selfpromo // sponsor > exclusive > selfpromo
const sponsorResult = choices.find((segment) => segment.category === "sponsor"); const findCategory = (category: string) => choices.find((segment) => segment.category === category);
const eaResult = choices.find((segment) => segment.category === "exclusive_access");
const selfpromoResult = choices.find((segment) => segment.category === "selfpromo"); const categoryResult = findCategory("sponsor") ?? findCategory("exclusive_access") ?? findCategory("selfpromo");
if (sponsorResult) { if (categoryResult) results.push(categoryResult);
results.push(sponsorResult);
} else if (eaResult) {
results.push(eaResult);
} else if (selfpromoResult) {
results.push(selfpromoResult);
}
return transformDBSegments(results); return transformDBSegments(results);
} }
@@ -167,6 +162,6 @@ async function endpoint(req: Request, res: Response): Promise<Response> {
export { export {
getLabelsByVideoID, getLabelsByVideoID,
getLabelsbyHash, getLabelsByHash,
endpoint endpoint
}; };

4
src/routes/getVideoLabelByHash.ts
View File

@@ -1,5 +1,5 @@
import { hashPrefixTester } from "../utils/hashPrefixTester"; import { hashPrefixTester } from "../utils/hashPrefixTester";
import { getLabelsbyHash } from "./getVideoLabel"; import { getLabelsByHash } from "./getVideoLabel";
import { Request, Response } from "express"; import { Request, Response } from "express";
import { VideoIDHash, Service } from "../types/segments.model"; import { VideoIDHash, Service } from "../types/segments.model";
import { getService } from "../utils/getService"; import { getService } from "../utils/getService";
@@ -14,7 +14,7 @@ export async function getVideoLabelsByHash(req: Request, res: Response): Promise
const service: Service = getService(req.query.service, req.body.service); const service: Service = getService(req.query.service, req.body.service);
// Get all video id's that match hash prefix // Get all video id's that match hash prefix
const segments = await getLabelsbyHash(hashPrefix, service); const segments = await getLabelsByHash(hashPrefix, service);
if (!segments) return res.status(404).json([]); if (!segments) return res.status(404).json([]);