From 7601a1d4bfaee82bcaa401fc6a9b4cdeda87ee0e Mon Sep 17 00:00:00 2001
From: Michael C <michael@mchang.name>
Date: Sat, 28 Aug 2021 01:48:48 -0400
Subject: [PATCH] fix error with errors

---
 src/cronjob/downvoteSegmentArchiveJob.ts |  4 ++--
 src/routes/addUnlistedVideo.ts           |  2 +-
 src/routes/dumpDatabase.ts               |  6 ++++--
 src/routes/getIsUserVIP.ts               |  2 +-
 src/routes/getLockCategories.ts          |  2 +-
 src/routes/getLockCategoriesByHash.ts    |  2 +-
 src/routes/getSkipSegments.ts            |  8 +++-----
 src/routes/getUsername.ts                |  2 +-
 src/routes/getViewsForUser.ts            |  2 +-
 src/routes/postLockCategories.ts         |  4 ++--
 src/routes/postPurgeAllSegments.ts       |  2 +-
 src/routes/postSegmentShift.ts           |  2 +-
 src/routes/postSkipSegments.ts           |  2 +-
 src/routes/setUsername.ts                |  2 +-
 src/routes/voteOnSponsorTime.ts          |  2 +-
 src/utils/logger.ts                      | 10 +++++-----
 src/utils/youtubeApi.ts                  |  4 ++--
 17 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/cronjob/downvoteSegmentArchiveJob.ts b/src/cronjob/downvoteSegmentArchiveJob.ts
index 74d72ac..6fa4f71 100644
--- a/src/cronjob/downvoteSegmentArchiveJob.ts
+++ b/src/cronjob/downvoteSegmentArchiveJob.ts
@@ -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;
     }
 
diff --git a/src/routes/addUnlistedVideo.ts b/src/routes/addUnlistedVideo.ts
index 01a1749..4926658 100644
--- a/src/routes/addUnlistedVideo.ts
+++ b/src/routes/addUnlistedVideo.ts
@@ -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);
     }
 
diff --git a/src/routes/dumpDatabase.ts b/src/routes/dumpDatabase.ts
index 8ebd82c..f0669fd 100644
--- a/src/routes/dumpDatabase.ts
+++ b/src/routes/dumpDatabase.ts
@@ -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
diff --git a/src/routes/getIsUserVIP.ts b/src/routes/getIsUserVIP.ts
index 1363c2b..050be2e 100644
--- a/src/routes/getIsUserVIP.ts
+++ b/src/routes/getIsUserVIP.ts
@@ -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);
     }
 }
diff --git a/src/routes/getLockCategories.ts b/src/routes/getLockCategories.ts
index 047c757..74b1a0b 100644
--- a/src/routes/getLockCategories.ts
+++ b/src/routes/getLockCategories.ts
@@ -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);
     }
 }
diff --git a/src/routes/getLockCategoriesByHash.ts b/src/routes/getLockCategoriesByHash.ts
index 4bedc73..22d5dde 100644
--- a/src/routes/getLockCategoriesByHash.ts
+++ b/src/routes/getLockCategoriesByHash.ts
@@ -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);
     }
 }
diff --git a/src/routes/getSkipSegments.ts b/src/routes/getSkipSegments.ts
index 99e8f50..cffe290 100644
--- a/src/routes/getSkipSegments.ts
+++ b/src/routes/getSkipSegments.ts
@@ -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,10 +125,8 @@ async function getSegmentsByHash(req: Request, hashedVideoIDPrefix: VideoIDHash,
 
         return segments;
     } catch (err) {
-        if (err) {
-            Logger.error(err as string);
-            return null;
-        }
+        Logger.error(err);
+        return null;
     }
 }
 
diff --git a/src/routes/getUsername.ts b/src/routes/getUsername.ts
index 8867e8f..823509a 100644
--- a/src/routes/getUsername.ts
+++ b/src/routes/getUsername.ts
@@ -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);
     }
 }
diff --git a/src/routes/getViewsForUser.ts b/src/routes/getViewsForUser.ts
index a7932ec..c129a3a 100644
--- a/src/routes/getViewsForUser.ts
+++ b/src/routes/getViewsForUser.ts
@@ -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);
     }
 }
diff --git a/src/routes/postLockCategories.ts b/src/routes/postLockCategories.ts
index fa53fb7..39ef1a8 100644
--- a/src/routes/postLockCategories.ts
+++ b/src/routes/postLockCategories.ts
@@ -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.",
                 });
diff --git a/src/routes/postPurgeAllSegments.ts b/src/routes/postPurgeAllSegments.ts
index 3785b6e..aecaf5d 100644
--- a/src/routes/postPurgeAllSegments.ts
+++ b/src/routes/postPurgeAllSegments.ts
@@ -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);
diff --git a/src/routes/postSegmentShift.ts b/src/routes/postSegmentShift.ts
index 84eb268..3abbd25 100644
--- a/src/routes/postSegmentShift.ts
+++ b/src/routes/postSegmentShift.ts
@@ -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);
     }
 
diff --git a/src/routes/postSkipSegments.ts b/src/routes/postSkipSegments.ts
index 1d7e59e..492e5dc 100644
--- a/src/routes/postSkipSegments.ts
+++ b/src/routes/postSkipSegments.ts
@@ -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);
     }
 
diff --git a/src/routes/setUsername.ts b/src/routes/setUsername.ts
index a3966d5..f81cdfc 100644
--- a/src/routes/setUsername.ts
+++ b/src/routes/setUsername.ts
@@ -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);
     }
 }
diff --git a/src/routes/voteOnSponsorTime.ts b/src/routes/voteOnSponsorTime.ts
index 8235364..02e8fbe 100644
--- a/src/routes/voteOnSponsorTime.ts
+++ b/src/routes/voteOnSponsorTime.ts
@@ -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"});
     }
 }
\ No newline at end of file
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
index 159ec97..7f02f82 100644
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -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;
         }
diff --git a/src/utils/youtubeApi.ts b/src/utils/youtubeApi.ts
index 96dd669..6298702 100644
--- a/src/utils/youtubeApi.ts
+++ b/src/utils/youtubeApi.ts
@@ -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};
         }
     }
 }