Mirror/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-12-10 21:47:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix error with errors

Browse Source
This commit is contained in:
Michael C
2021-08-28 01:48:48 -04:00
parent 1c2dd055c1
commit 7601a1d4bf
17 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cronjob/downvoteSegmentArchiveJob.ts
View File

@@ -29,7 +29,7 @@ export const archiveDownvoteSegment = async (dayLimit: number, voteLimit: number
} catch (err) {
Logger.error("Execption when insert segment in archivedSponsorTimes");
Logger.error(err as string);
Logger.error(err);
return 1;
}
@@ -47,7 +47,7 @@ export const archiveDownvoteSegment = async (dayLimit: number, voteLimit: number
} catch (err) {
Logger.error("Execption when deleting segment in sponsorTimes");
Logger.error(err as string);
Logger.error(err);
return 1;
}

2
src/routes/addUnlistedVideo.ts
View File

@@ -23,7 +23,7 @@ export function addUnlistedVideo(req: Request, res: Response): Response {
const timeSubmitted = Date.now();
db.prepare("run", `INSERT INTO "unlistedVideos" ("videoID", "year", "views", "channelID", "timeSubmitted") values (?, ?, ?, ?, ?)`, [videoID, year, views, channelID, timeSubmitted]);
} catch (err) {
Logger.error(err as string);
Logger.error(err);
return res.sendStatus(500);
}

6
src/routes/dumpDatabase.ts
View File

@@ -65,8 +65,10 @@ function removeOutdatedDumps(exportPath: string): Promise<void> {
// read files in export directory
fs.readdir(exportPath, async (err: any, files: string[]) => {
if (err) Logger.error(err);
if (err) return resolve();
if (err) {
Logger.error(err);
return resolve();
}
files.forEach(file => {
// we only care about files that start with "<tablename>_" and ends with .csv

2
src/routes/getIsUserVIP.ts
View File

@@ -22,7 +22,7 @@ export async function getIsUserVIP(req: Request, res: Response): Promise<Respons
vip: vipState,
});
} catch (err) {
Logger.error(err as string);
Logger.error(err);
return res.sendStatus(500);
}
}

2
src/routes/getLockCategories.ts
View File

@@ -25,7 +25,7 @@ export async function getLockCategories(req: Request, res: Response): Promise<Re
categories
});
} catch (err) {
Logger.error(err as string);
Logger.error(err);
return res.sendStatus(500);
}
}

2
src/routes/getLockCategoriesByHash.ts
View File

@@ -54,7 +54,7 @@ export async function getLockCategoriesByHash(req: Request, res: Response): Prom
// merge all locks
return res.send(mergeLocks(lockedRows));
} catch (err) {
Logger.error(err as string);
Logger.error(err);
return res.sendStatus(500);
}
}

6
src/routes/getSkipSegments.ts
View File

@@ -80,7 +80,7 @@ async function getSegmentsByVideoID(req: Request, videoID: VideoID, categories:
return segments;
} catch (err) {
if (err) {
Logger.error(err as string);
Logger.error(err);
return null;
}
}
@@ -125,12 +125,10 @@ async function getSegmentsByHash(req: Request, hashedVideoIDPrefix: VideoIDHash,
return segments;
} catch (err) {
if (err) {
Logger.error(err as string);
Logger.error(err);
return null;
}
}
}
async function getSegmentsFromDBByHash(hashedVideoIDPrefix: VideoIDHash, service: Service): Promise<DBSegment[]> {
const fetchFromDB = () => db

2
src/routes/getUsername.ts
View File

@@ -28,7 +28,7 @@ export async function getUsername(req: Request, res: Response): Promise<Response
});
}
} catch (err) {
Logger.error(err as string);
Logger.error(err);
return res.sendStatus(500);
}
}

2
src/routes/getViewsForUser.ts
View File

@@ -26,7 +26,7 @@ export async function getViewsForUser(req: Request, res: Response): Promise<Resp
return res.sendStatus(404);
}
} catch (err) {
Logger.error(err as string);
Logger.error(err);
return res.sendStatus(500);
}
}

4
src/routes/postLockCategories.ts
View File

@@ -68,7 +68,7 @@ export async function postLockCategories(req: Request, res: Response): Promise<s
await db.prepare("run", `INSERT INTO "lockCategories" ("videoID", "userID", "category", "hashedVideoID", "reason") VALUES(?, ?, ?, ?, ?)`, [videoID, userID, category, hashedVideoID, reason]);
} catch (err) {
Logger.error(`Error submitting 'lockCategories' marker for category '${category}' for video '${videoID}'`);
Logger.error(err as string);
Logger.error(err);
res.status(500).json({
message: "Internal Server Error: Could not write marker to the database.",
});
@@ -89,7 +89,7 @@ export async function postLockCategories(req: Request, res: Response): Promise<s
[reason, userID, videoID, category]);
} catch (err) {
Logger.error(`Error submitting 'lockCategories' marker for category '${category}' for video '${videoID}'`);
Logger.error(err as string);
Logger.error(err);
res.status(500).json({
message: "Internal Server Error: Could not write marker to the database.",
});

2
src/routes/postPurgeAllSegments.ts
View File

@@ -29,7 +29,7 @@ export async function postPurgeAllSegments(req: Request, res: Response): Promise
await db.prepare("run", `UPDATE "sponsorTimes" SET "hidden" = 1 WHERE "videoID" = ?`, [videoID]);
} catch (err) {
Logger.error(err as string);
Logger.error(err);
return res.sendStatus(500);
}
return res.sendStatus(200);

2
src/routes/postSegmentShift.ts
View File

@@ -92,7 +92,7 @@ export async function postSegmentShift(req: Request, res: Response): Promise<Res
}
}
} catch (err) {
Logger.error(err as string);
Logger.error(err);
return res.sendStatus(500);
}

2
src/routes/postSkipSegments.ts
View File

@@ -670,7 +670,7 @@ export async function postSkipSegments(req: Request, res: Response): Promise<Res
});
}
} catch (err) {
Logger.error(err as string);
Logger.error(err);
return res.sendStatus(500);
}

2
src/routes/setUsername.ts
View File

@@ -80,7 +80,7 @@ export async function setUsername(req: Request, res: Response): Promise<Response
return res.sendStatus(200);
} catch (err) {
Logger.error(err as string);
Logger.error(err);
return res.sendStatus(500);
}
}

2
src/routes/voteOnSponsorTime.ts
View File

@@ -458,7 +458,7 @@ export async function voteOnSponsorTime(req: Request, res: Response): Promise<Re
}
return res.status(finalResponse.finalStatus).send(finalResponse.finalMessage ?? undefined);
} catch (err) {
Logger.error(err as string);
Logger.error(err);
return res.status(500).json({error: "Internal error creating segment vote"});
}
}

10
src/utils/logger.ts
View File

@@ -53,20 +53,20 @@ class Logger {
}
}
error(str: string) {
error(str: string | Error) {
this.log(LogLevel.ERROR, str);
}
warn(str: string) {
warn(str: string | Error) {
this.log(LogLevel.WARN, str);
}
info(str: string) {
info(str: string | Error) {
this.log(LogLevel.INFO, str);
}
debug(str: string) {
debug(str: string | Error) {
this.log(LogLevel.DEBUG, str);
}
private log(level: LogLevel, str: string) {
private log(level: LogLevel, str: string | Error) {
if (!this._settings[level]) {
return;
}

4
src/utils/youtubeApi.ts
View File

@@ -20,7 +20,7 @@ export class YouTubeAPI {
return { err: null, data: JSON.parse(data) };
}
} catch (err) {
return { err: err as string | boolean, data: null };
return { err, data: null };
}
}
@@ -45,7 +45,7 @@ export class YouTubeAPI {
return { err: result.statusText, data: null };
}
} catch (err) {
return {err: err as string | boolean, data: null};
return {err, data: null};
}
}
}