Skip to content

Commit 506b657

Browse files
committed
add ignore next to catch errors
1 parent 8562dc2 commit 506b657

17 files changed

+34
-33
lines changed

src/app.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ function setupRoutes(router: Router) {
200200
router.get("/api/generateToken/:type", generateTokenRequest);
201201
router.get("/api/verifyToken", verifyTokenRequest);
202202

203-
/* instanbul ignore next */
203+
/* istanbul ignore next */
204204
if (config.postgres?.enabled) {
205205
router.get("/database", (req, res) => dumpDatabase(req, res, true));
206206
router.get("/database.json", (req, res) => dumpDatabase(req, res, false));

src/routes/getIsUserVIP.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export async function getIsUserVIP(req: Request, res: Response): Promise<Respons
2121
hashedUserID: hashedUserID,
2222
vip: vipState,
2323
});
24-
} catch (err) /* instanbul ignore next */ {
24+
} catch (err) /* istanbul ignore next */ {
2525
Logger.error(err as string);
2626
return res.sendStatus(500);
2727
}

src/routes/getLockCategories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export async function getLockCategories(req: Request, res: Response): Promise<Re
3333
categories,
3434
actionTypes
3535
});
36-
} catch (err) {
36+
} catch (err) /* istanbul ignore next */{
3737
Logger.error(err as string);
3838
return res.sendStatus(500);
3939
}

src/routes/getSavedTimeForUser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export async function getSavedTimeForUser(req: Request, res: Response): Promise<
2727
} else {
2828
return res.sendStatus(404);
2929
}
30-
} catch (err) {
30+
} catch (err) /* istanbul ignore next */ {
3131
Logger.error(`getSavedTimeForUser ${err}`);
3232
return res.sendStatus(500);
3333
}

src/routes/getSegmentInfo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const isValidSegmentUUID = (str: string): boolean => /^([a-f0-9]{64}|[a-f0-9]{8}
77
async function getSegmentFromDBByUUID(UUID: SegmentUUID): Promise<DBSegment> {
88
try {
99
return await db.prepare("get", `SELECT * FROM "sponsorTimes" WHERE "UUID" = ?`, [UUID]);
10-
} catch (err) {
10+
} catch (err) /* istanbul ignore next */ {
1111
return null;
1212
}
1313
}
@@ -62,7 +62,7 @@ async function endpoint(req: Request, res: Response): Promise<Response> {
6262
//send result
6363
return res.send(DBSegments);
6464
}
65-
} catch (err) {
65+
} catch (err) /* istanbul ignore next */ {
6666
if (err instanceof SyntaxError) { // catch JSON.parse error
6767
return res.status(400).send("UUIDs parameter does not match format requirements.");
6868
} else return res.sendStatus(500);

src/routes/getSkipSegments.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ async function getSegmentsByVideoID(req: Request, videoID: VideoID, categories:
107107
}
108108

109109
return processedSegments;
110-
} catch (err) {
110+
} catch (err) /* istanbul ignore next */ {
111111
if (err) {
112112
Logger.error(err as string);
113113
return null;
@@ -169,7 +169,7 @@ async function getSegmentsByHash(req: Request, hashedVideoIDPrefix: VideoIDHash,
169169
}));
170170

171171
return segments;
172-
} catch (err) {
172+
} catch (err) /* istanbul ignore next */ {
173173
Logger.error(err as string);
174174
return null;
175175
}
@@ -465,7 +465,7 @@ async function endpoint(req: Request, res: Response): Promise<Response> {
465465
//send result
466466
return res.send(segments);
467467
}
468-
} catch (err) {
468+
} catch (err) /* istanbul ignore next */ {
469469
if (err instanceof SyntaxError) {
470470
return res.status(400).send("Categories parameter does not match format requirements.");
471471
} else return res.sendStatus(500);

src/routes/getStatus.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export async function getStatus(req: Request, res: Response): Promise<Response>
2727
hostname: os.hostname()
2828
};
2929
return value ? res.send(JSON.stringify(statusValues[value])) : res.send(statusValues);
30-
} catch (err) {
30+
} catch (err) /* istanbul ignore next */ {
3131
Logger.error(err as string);
3232
return res.sendStatus(500);
3333
}

src/routes/getUserID.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ function getFuzzyUserID(userName: string): Promise<{userName: string, userID: Us
1212
try {
1313
return db.prepare("all", `SELECT "userName", "userID" FROM "userNames" WHERE "userName"
1414
LIKE ? ESCAPE '\\' LIMIT 10`, [userName]);
15-
} catch (err) {
15+
} catch (err) /* istanbul ignore next */ {
1616
return null;
1717
}
1818
}
1919

2020
function getExactUserID(userName: string): Promise<{userName: string, userID: UserID }[]> {
2121
try {
2222
return db.prepare("all", `SELECT "userName", "userID" from "userNames" WHERE "userName" = ? LIMIT 10`, [userName]);
23-
} catch (err) {
23+
} catch (err) /* istanbul ignore next */{
2424
return null;
2525
}
2626
}
@@ -42,6 +42,7 @@ export async function getUserID(req: Request, res: Response): Promise<Response>
4242
: await getFuzzyUserID(userName);
4343

4444
if (results === undefined || results === null) {
45+
/* istanbul ignore next */
4546
return res.sendStatus(500);
4647
} else if (results.length === 0) {
4748
return res.sendStatus(404);

src/routes/getUserInfo.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ async function dbGetSubmittedSegmentSummary(userID: HashedUserID): Promise<{ min
2828
segmentCount: 0,
2929
};
3030
}
31-
} catch (err) {
31+
} catch (err) /* istanbul ignore next */ {
3232
return null;
3333
}
3434
}
@@ -37,7 +37,7 @@ async function dbGetIgnoredSegmentCount(userID: HashedUserID): Promise<number> {
3737
try {
3838
const row = await db.prepare("get", `SELECT COUNT(*) as "ignoredSegmentCount" FROM "sponsorTimes" WHERE "userID" = ? AND ( "votes" <= -2 OR "shadowHidden" = 1 )`, [userID], { useReplica: true });
3939
return row?.ignoredSegmentCount ?? 0;
40-
} catch (err) {
40+
} catch (err) /* istanbul ignore next */ {
4141
return null;
4242
}
4343
}
@@ -46,7 +46,7 @@ async function dbGetUsername(userID: HashedUserID) {
4646
try {
4747
const row = await db.prepare("get", `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]);
4848
return row?.userName ?? userID;
49-
} catch (err) {
49+
} catch (err) /* istanbul ignore next */ {
5050
return false;
5151
}
5252
}
@@ -55,7 +55,7 @@ async function dbGetViewsForUser(userID: HashedUserID) {
5555
try {
5656
const row = await db.prepare("get", `SELECT SUM("views") as "viewCount" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID], { useReplica: true });
5757
return row?.viewCount ?? 0;
58-
} catch (err) {
58+
} catch (err) /* istanbul ignore next */ {
5959
return false;
6060
}
6161
}
@@ -64,7 +64,7 @@ async function dbGetIgnoredViewsForUser(userID: HashedUserID) {
6464
try {
6565
const row = await db.prepare("get", `SELECT SUM("views") as "ignoredViewCount" FROM "sponsorTimes" WHERE "userID" = ? AND ( "votes" <= -2 OR "shadowHidden" = 1 )`, [userID], { useReplica: true });
6666
return row?.ignoredViewCount ?? 0;
67-
} catch (err) {
67+
} catch (err) /* istanbul ignore next */ {
6868
return false;
6969
}
7070
}
@@ -73,7 +73,7 @@ async function dbGetWarningsForUser(userID: HashedUserID): Promise<number> {
7373
try {
7474
const row = await db.prepare("get", `SELECT COUNT(*) as total FROM "warnings" WHERE "userID" = ? AND "enabled" = 1`, [userID], { useReplica: true });
7575
return row?.total ?? 0;
76-
} catch (err) {
76+
} catch (err) /* istanbul ignore next */ {
7777
Logger.error(`Couldn't get warnings for user ${userID}. returning 0`);
7878
return 0;
7979
}
@@ -83,7 +83,7 @@ async function dbGetLastSegmentForUser(userID: HashedUserID): Promise<SegmentUUI
8383
try {
8484
const row = await db.prepare("get", `SELECT "UUID" FROM "sponsorTimes" WHERE "userID" = ? ORDER BY "timeSubmitted" DESC LIMIT 1`, [userID], { useReplica: true });
8585
return row?.UUID ?? null;
86-
} catch (err) {
86+
} catch (err) /* istanbul ignore next */ {
8787
return null;
8888
}
8989
}
@@ -92,7 +92,7 @@ async function dbGetActiveWarningReasonForUser(userID: HashedUserID): Promise<st
9292
try {
9393
const row = await db.prepare("get", `SELECT reason FROM "warnings" WHERE "userID" = ? AND "enabled" = 1 ORDER BY "issueTime" DESC LIMIT 1`, [userID], { useReplica: true });
9494
return row?.reason ?? "";
95-
} catch (err) {
95+
} catch (err) /* istanbul ignore next */ {
9696
Logger.error(`Couldn't get reason for user ${userID}. returning blank`);
9797
return "";
9898
}
@@ -102,7 +102,7 @@ async function dbGetBanned(userID: HashedUserID): Promise<boolean> {
102102
try {
103103
const row = await db.prepare("get", `SELECT count(*) as "userCount" FROM "shadowBannedUsers" WHERE "userID" = ? LIMIT 1`, [userID], { useReplica: true });
104104
return row?.userCount > 0 ?? false;
105-
} catch (err) {
105+
} catch (err) /* istanbul ignore next */ {
106106
return false;
107107
}
108108
}
@@ -195,7 +195,7 @@ async function getUserInfo(req: Request, res: Response): Promise<Response> {
195195
export async function endpoint(req: Request, res: Response): Promise<Response> {
196196
try {
197197
return await getUserInfo(req, res);
198-
} catch (err) {
198+
} catch (err) /* istanbul ignore next */ {
199199
if (err instanceof SyntaxError) { // catch JSON.parse error
200200
return res.status(400).send("Invalid values JSON");
201201
} else return res.sendStatus(500);

src/routes/getUserStats.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ async function dbGetUserSummary(userID: HashedUserID, fetchCategoryStats: boolea
7171
};
7272
}
7373
return result;
74-
} catch (err) /* instanbul ignore next */ {
74+
} catch (err) /* istanbul ignore next */ {
7575
Logger.error(err as string);
7676
return null;
7777
}
@@ -81,7 +81,7 @@ async function dbGetUsername(userID: HashedUserID) {
8181
try {
8282
const row = await db.prepare("get", `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]);
8383
return row?.userName ?? userID;
84-
} catch (err) /* instanbul ignore next */ {
84+
} catch (err) /* istanbul ignore next */ {
8585
return false;
8686
}
8787
}

0 commit comments

Comments
 (0)