From ce3680616933d18acfaf824a5d93383ab85ac75f Mon Sep 17 00:00:00 2001
From: Andrew Lee <leezandrew@gmail.com>
Date: Mon, 7 Sep 2020 12:29:13 -0400
Subject: [PATCH] Added usernames to NB Discord webhooks

---
 src/routes/postSkipSegments.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/routes/postSkipSegments.js b/src/routes/postSkipSegments.js
index e3f94e9..b6e10cc 100644
--- a/src/routes/postSkipSegments.js
+++ b/src/routes/postSkipSegments.js
@@ -106,14 +106,20 @@ function sendWebhooksNB(userID, videoID, UUID, startTime, endTime, category, pro
     //[userID]);
     let submissionCount = db.prepare('get', "SELECT COUNT(*) count FROM sponsorTimes WHERE userID=?", [userID]);
     let disregardedCount = db.prepare('get', "SELECT COUNT(*) disregarded FROM sponsorTimes WHERE userID=? and votes <= -2", [userID]);
-    //let uName = db.prepare('get', "SELECT userName FROM userNames WHERE userID=?", [userID]);
-    let submittedBy = userID;//"";
-    // If there's no userName then just show the userID
-    // if (uName.userName == userID){
-    //   submittedBy = userID;
-    // } else { // else show both
-    //   submittedBy = uName.userName + "\n " + userID;
-    // }
+    let uName = db.prepare('get', "SELECT userName FROM userNames WHERE userID=?", [userID]);
+
+    let submittedBy = "";
+    try {
+        // If a userName was created then show both
+        if (uName.userName !== userID){
+            submittedBy = uName.userName + "\n " + userID;
+        } else {
+            submittedBy = userID;
+        }
+    } catch {
+        //Catch in case User is not in userNames table
+        submittedBy = userID;
+    }
 
     // Send discord message
     if (config.discordNeuralBlockRejectWebhookURL === null) return;