mirror of
https://github.com/ajayyy/SponsorBlockServer.git
synced 2025-12-26 01:18:40 +03:00
Make hasStartSegment result optional
This commit is contained in:
@@ -34,7 +34,7 @@ async function getLabelsByVideoID(videoID: VideoID, service: Service): Promise<F
|
||||
}
|
||||
}
|
||||
|
||||
async function getLabelsByHash(hashedVideoIDPrefix: VideoIDHash, service: Service): Promise<SBRecord<VideoID, FullVideoSegmentVideoData>> {
|
||||
async function getLabelsByHash(hashedVideoIDPrefix: VideoIDHash, service: Service, checkHasStartSegment: boolean): Promise<SBRecord<VideoID, FullVideoSegmentVideoData>> {
|
||||
const segments: SBRecord<VideoID, FullVideoSegmentVideoData> = {};
|
||||
|
||||
try {
|
||||
@@ -57,10 +57,10 @@ async function getLabelsByHash(hashedVideoIDPrefix: VideoIDHash, service: Servic
|
||||
const result = chooseSegment(videoData.segments);
|
||||
const data: FullVideoSegmentVideoData = {
|
||||
segments: result.segments,
|
||||
hasStartSegment: result.hasStartSegment
|
||||
hasStartSegment: checkHasStartSegment ? result.hasStartSegment : undefined
|
||||
};
|
||||
|
||||
if (data.segments.length > 0 || data.hasStartSegment) {
|
||||
if (data.segments.length > 0 || (data.hasStartSegment && checkHasStartSegment)) {
|
||||
segments[videoID] = data;
|
||||
}
|
||||
}
|
||||
@@ -153,7 +153,7 @@ async function handleGetLabel(req: Request, res: Response): Promise<FullVideoSeg
|
||||
return false;
|
||||
}
|
||||
|
||||
const hasStartSegment = !!req.query.hasStartSegment;
|
||||
const hasStartSegment = req.query.hasStartSegment === "true";
|
||||
|
||||
const service = getService(req.query.service, req.body.service);
|
||||
const segmentData = await getLabelsByVideoID(videoID, service);
|
||||
|
||||
@@ -11,10 +11,12 @@ export async function getVideoLabelsByHash(req: Request, res: Response): Promise
|
||||
}
|
||||
hashPrefix = hashPrefix.toLowerCase() as VideoIDHash;
|
||||
|
||||
const checkHasStartSegment = req.query.hasStartSegment === "true";
|
||||
|
||||
const service: Service = getService(req.query.service, req.body.service);
|
||||
|
||||
// Get all video id's that match hash prefix
|
||||
const segments = await getLabelsByHash(hashPrefix, service);
|
||||
const segments = await getLabelsByHash(hashPrefix, service, checkHasStartSegment);
|
||||
|
||||
if (!segments) return res.status(404).json([]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user