From 1ba1450e9cf8277e9dfcd49409d45103971abca7 Mon Sep 17 00:00:00 2001
From: Michael C <michael@mchang.name>
Date: Tue, 13 Jul 2021 15:45:24 -0400
Subject: [PATCH] string literal fixes & npm run postgres:docker

---
 package.json                    |  1 +
 src/routes/dumpDatabase.ts      | 14 +++++++-------
 src/routes/postSkipSegments.ts  | 32 ++++++++++++++++----------------
 src/routes/voteOnSponsorTime.ts | 18 +++++++++---------
 4 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/package.json b/package.json
index fcba30c..bcced54 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "test": "npm run tsc && ts-node test/test.ts",
     "dev": "nodemon",
     "dev:bash": "nodemon -x 'npm test ; npm start'",
+    "postgres:docker": "docker run --rm -p 5432:5432 -e POSTGRES_USER=ci_db_user -e POSTGRES_PASSWORD=ci_db_pass postgres:alpine",
     "start": "ts-node src/index.ts",
     "tsc": "tsc -p tsconfig.json",
     "lint": "eslint src test",
diff --git a/src/routes/dumpDatabase.ts b/src/routes/dumpDatabase.ts
index fa1d262..5a05dba 100644
--- a/src/routes/dumpDatabase.ts
+++ b/src/routes/dumpDatabase.ts
@@ -127,13 +127,13 @@ export default async function dumpDatabase(req: Request, res: Response, showPage
                     </tr>
                 </thead>
                 <tbody>
-                ${latestDumpFiles.map((item:any) => {
-                    return `
-                    <tr>
-                        <td>${item.tableName}</td>
-                        <td><a href="/database/${item.tableName}.csv">${item.tableName}.csv</a></td>
-                    </tr>
-                    `;
+    ${latestDumpFiles.map((item:any) => {
+        return `
+        <tr>
+            <td>${item.tableName}</td>
+            <td><a href="/database/${item.tableName}.csv">${item.tableName}.csv</a></td>
+        </tr>
+        `;
     }).join("")}
         ${latestDumpFiles.length === 0 ? '<tr><td colspan="2">Please wait: Generating files</td></tr>' : ""}
         </tbody>
diff --git a/src/routes/postSkipSegments.ts b/src/routes/postSkipSegments.ts
index 5535dd0..d160218 100644
--- a/src/routes/postSkipSegments.ts
+++ b/src/routes/postSkipSegments.ts
@@ -71,10 +71,10 @@ async function sendWebhooks(apiVideoInfo: APIVideoInfo, userID: string, videoID:
                 "embeds": [{
                     "title": data?.title,
                     "url": `https://www.youtube.com/watch?v=${videoID}&t=${(parseInt(startTime.toFixed(0)) - 2)}`,
-                    "description": "Submission ID: " + UUID +
-                        "\n\nTimestamp: " +
-                        getFormattedTime(startTime) + " to " + getFormattedTime(endTime) +
-                        "\n\nCategory: " + segmentInfo.category,
+                    "description": `Submission ID: ${UUID}\
+                        \n\nTimestamp: \
+                        ${getFormattedTime(startTime)} to ${getFormattedTime(endTime)}\
+                        \n\nCategory: ${segmentInfo.category}`,
                     "color": 10813440,
                     "author": {
                         "name": userID,
@@ -127,13 +127,13 @@ async function sendWebhooksNB(userID: string, videoID: string, UUID: string, sta
             "embeds": [{
                 "title": ytData.items[0].snippet.title,
                 "url": `https://www.youtube.com/watch?v=${videoID}&t=${(parseFloat(startTime.toFixed(0)) - 2)}`,
-                "description": "**Submission ID:** " + UUID +
-                    "\n**Timestamp:** " + getFormattedTime(startTime) + " to " + getFormattedTime(endTime) +
-                    "\n**Predicted Probability:** " + probability +
-                    "\n**Category:** " + category +
-                    "\n**Submitted by:** " + submittedBy +
-                    "\n**Total User Submissions:** " + submissionInfoRow.count +
-                    "\n**Ignored User Submissions:** " + submissionInfoRow.disregarded,
+                "description": `**Submission ID:** ${UUID}\
+                    \n**Timestamp:** ${getFormattedTime(startTime)} to ${getFormattedTime(endTime)}\
+                    \n**Predicted Probability:** ${probability}\
+                    \n**Category:** ${category}\
+                    \n**Submitted by:** ${submittedBy}\
+                    \n**Total User Submissions:** ${submissionInfoRow.count}\
+                    \n**Ignored User Submissions:** ${submissionInfoRow.disregarded}`,
                 "color": 10813440,
                 "thumbnail": {
                     "url": ytData.items[0].snippet.thumbnails.maxres ? ytData.items[0].snippet.thumbnails.maxres.url : "",
@@ -419,11 +419,11 @@ export async function postSkipSegments(req: Request, res: Response): Promise<Res
             // TODO: Do something about the fradulent submission
             Logger.warn(`Caught a no-segment submission. userID: '${userID}', videoID: '${videoID}', category: '${segments[i].category}'`);
             return res.status(403).send(
-                "New submissions are not allowed for the following category: '"
-                + segments[i].category + "'. A moderator has decided that no new segments are needed and that all current segments of this category are timed perfectly.\n\n "
-                + (segments[i].category === "sponsor" ? "Maybe the segment you are submitting is a different category that you have not enabled and is not a sponsor. " +
-                "Categories that aren't sponsor, such as self-promotion can be enabled in the options.\n\n" : "")
-                + "If you believe this is incorrect, please contact someone on discord.gg/SponsorBlock or matrix.to/#/+sponsorblock:ajay.app",
+                `New submissions are not allowed for the following category: \
+                '${segments[i].category}'. A moderator has decided that no new segments are needed and that all current segments of this category are timed perfectly.\n\n\
+                ${(segments[i].category === "sponsor" ? "Maybe the segment you are submitting is a different category that you have not enabled and is not a sponsor. "+
+                "Categories that aren't sponsor, such as self-promotion can be enabled in the options.\n\n" : "")}\
+                If you believe this is incorrect, please contact someone on discord.gg/SponsorBlock or matrix.to/#/+sponsorblock:ajay.app`,
             );
         }
 
diff --git a/src/routes/voteOnSponsorTime.ts b/src/routes/voteOnSponsorTime.ts
index 2139e8f..a177385 100644
--- a/src/routes/voteOnSponsorTime.ts
+++ b/src/routes/voteOnSponsorTime.ts
@@ -117,15 +117,15 @@ async function sendWebhooks(voteData: VoteData) {
                         "embeds": [{
                             "title": data?.title,
                             "url": `https://www.youtube.com/watch?v=${submissionInfoRow.videoID}&t=${(submissionInfoRow.startTime.toFixed(0) - 2)}`,
-                            "description": "**" + voteData.row.votes + " Votes Prior | " +
-                                (voteData.row.votes + voteData.incrementAmount - voteData.oldIncrementAmount) + " Votes Now | " + voteData.row.views
-                                + " Views**\n\n**Submission ID:** " + voteData.UUID
-                                + "\n**Category:** " + submissionInfoRow.category
-                                + "\n\n**Submitted by:** " + submissionInfoRow.userName + "\n " + submissionInfoRow.userID
-                                + "\n\n**Total User Submissions:** " + submissionInfoRow.count
-                                + "\n**Ignored User Submissions:** " + submissionInfoRow.disregarded
-                                + "\n\n**Timestamp:** " +
-                                getFormattedTime(submissionInfoRow.startTime) + " to " + getFormattedTime(submissionInfoRow.endTime),
+                            "description": `**${voteData.row.votes} Votes Prior | \
+                                ${(voteData.row.votes + voteData.incrementAmount - voteData.oldIncrementAmount)} Votes Now | ${voteData.row.views} \
+                                Views**\n\n**Submission ID:** ${voteData.UUID}\
+                                \n**Category:** ${submissionInfoRow.category}\
+                                \n\n**Submitted by:** ${submissionInfoRow.userName}\n${submissionInfoRow.userID}\
+                                \n\n**Total User Submissions:** ${submissionInfoRow.count}\
+                                \n**Ignored User Submissions:** ${submissionInfoRow.disregarded}\
+                                \n\n**Timestamp:** \
+                                ${getFormattedTime(submissionInfoRow.startTime)} to ${getFormattedTime(submissionInfoRow.endTime)}`,
                             "color": 10813440,
                             "author": {
                                 "name": voteData.finalResponse?.webhookMessage ??