mirror of
https://github.com/ajayyy/SponsorBlockServer.git
synced 2024-09-20 04:54:00 +02:00
Fix getSkipSegmentsByHash requires valid json
The categories parameter has to be a valid array with strings in JSON format
This commit is contained in:
parent
e86f442249
commit
09c9b25178
2 changed files with 20 additions and 8 deletions
|
@ -10,11 +10,23 @@ export async function getSkipSegmentsByHash(req: Request, res: Response) {
|
|||
return;
|
||||
}
|
||||
|
||||
const categories: Category[] = req.query.categories
|
||||
? JSON.parse(req.query.categories as string)
|
||||
: req.query.category
|
||||
? [req.query.category]
|
||||
: ['sponsor'];
|
||||
let categories: Category[] = [];
|
||||
try {
|
||||
categories = req.query.categories
|
||||
? JSON.parse(req.query.categories as string)
|
||||
: req.query.category
|
||||
? [req.query.category]
|
||||
: ["sponsor"];
|
||||
if (!Array.isArray(categories)) {
|
||||
return res.status(400).send("Categories parameter does not match format requirements.");
|
||||
}
|
||||
}
|
||||
catch(error) {
|
||||
return res.status(400).send("Bad parameter: categories (invalid JSON)");
|
||||
}
|
||||
|
||||
// filter out none string elements, only flat array with strings is valid
|
||||
categories = categories.filter((item: any) => typeof item === "string");
|
||||
|
||||
// Get all video id's that match hash prefix
|
||||
const segments = getSegmentsByHash(req, hashPrefix, categories);
|
||||
|
|
|
@ -96,10 +96,10 @@ describe('getSegmentsByHash', () => {
|
|||
.catch(err => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return 500 for bad format categories', (done: Done) => { // should probably be 400
|
||||
fetch(getbaseURL() + '/api/skipSegments/?categories=shilling')
|
||||
it('Should return 400 for bad format categories', (done: Done) => {
|
||||
fetch(getbaseURL() + '/api/skipSegments/fdaf?categories=shilling')
|
||||
.then(res => {
|
||||
if (res.status !== 500) done("expected 500 got " + res.status);
|
||||
if (res.status !== 400) done("expected 400 got " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
|
|
Loading…
Reference in a new issue