Add custom webhooks

config.json.example

@@ -17,5 +17,6 @@
     "dbSchema": "./databases/_sponsorTimes.db.sql",
     "privateDBSchema": "./databases/_private.db.sql",
     "mode": "development",
-    "readOnly": false
+    "readOnly": false,
+    "webhooks": []
 }

src/routes/voteOnSponsorTime.js

@@ -4,7 +4,10 @@ var config = require('../config.js');
 var getHash = require('../utils/getHash.js');
 var getIP = require('../utils/getIP.js');
 var getFormattedTime = require('../utils/getFormattedTime.js');
-var isUserTrustworthy = require('../utils/isUserTrustworthy.js')
+var isUserTrustworthy = require('../utils/isUserTrustworthy.js');
+const dispatchWebhooks = require('../utils/dispatchWebhooks.js');
+const {getVoteAuthor, getVoteAuthorRaw} = require('../utils/webhookUtils.js');
+
 
 var databases = require('../databases/databases.js');
 var db = databases.db;
@@ -13,17 +16,6 @@ var YouTubeAPI = require('../utils/youtubeAPI.js');
 var request = require('request');
 const logger = require('../utils/logger.js');
 
-function getVoteAuthor(submissionCount, isVIP, isOwnSubmission) {
-    if (submissionCount === 0) {
-        return "Report by New User";
-    } else if (isVIP) {
-        return "Report by VIP User";
-    } else if (isOwnSubmission) {
-        return "Report by Submitter";
-    }
-
-    return "";
-}
 
 function categoryVote(UUID, userID, isVIP, category, hashedIP, res) {
     // Check if they've already made a vote
@@ -194,41 +186,72 @@ async function voteOnSponsorTime(req, res) {
             }
         }
 
-        // Send discord message
-        if (incrementAmount < 0) {
-            // Get video ID
-            let submissionInfoRow = db.prepare('get', "SELECT s.videoID, s.userID, s.startTime, s.endTime, s.category, u.userName, " +
-                "(select count(1) from sponsorTimes where userID = s.userID) count, " +
-                "(select count(1) from sponsorTimes where userID = s.userID and votes <= -2) disregarded " +
-                "FROM sponsorTimes s left join userNames u on s.userID = u.userID where s.UUID=?",
-            [UUID]);
-
-            let userSubmissionCountRow = db.prepare('get', "SELECT count(*) as submissionCount FROM sponsorTimes WHERE userID = ?", [nonAnonUserID]);
-
-            if (submissionInfoRow !== undefined && userSubmissionCountRow != undefined) {
-                let webhookURL = null;
-                if (voteTypeEnum === voteTypes.normal) {
-                    webhookURL = config.discordReportChannelWebhookURL;
-                } else if (voteTypeEnum === voteTypes.incorrect) {
-                    webhookURL = config.discordCompletelyIncorrectReportWebhookURL;
-                }
-
-                if (config.youtubeAPIKey !== null && webhookURL !== null) {
-                    YouTubeAPI.videos.list({
-                        part: "snippet",
-                        id: submissionInfoRow.videoID
-                    }, function (err, data) {
-                        if (err || data.items.length === 0) {
-                            err && logger.error(err);
-                            return;
+        // Get video ID
+        let submissionInfoRow = db.prepare('get', "SELECT s.videoID, s.userID, s.startTime, s.endTime, s.category, u.userName, " +
+            "(select count(1) from sponsorTimes where userID = s.userID) count, " +
+            "(select count(1) from sponsorTimes where userID = s.userID and votes <= -2) disregarded " +
+            "FROM sponsorTimes s left join userNames u on s.userID = u.userID where s.UUID=?",
+        [UUID]);
+
+        let userSubmissionCountRow = db.prepare('get', "SELECT count(*) as submissionCount FROM sponsorTimes WHERE userID = ?", [nonAnonUserID]);
+
+        if (submissionInfoRow !== undefined && userSubmissionCountRow != undefined) {
+            let webhookURL = null;
+            if (voteTypeEnum === voteTypes.normal) {
+                webhookURL = config.discordReportChannelWebhookURL;
+            } else if (voteTypeEnum === voteTypes.incorrect) {
+                webhookURL = config.discordCompletelyIncorrectReportWebhookURL;
+            }
+
+            if (config.youtubeAPIKey !== null) {
+                YouTubeAPI.videos.list({
+                    part: "snippet",
+                    id: submissionInfoRow.videoID
+                }, function (err, data) {
+                    if (err || data.items.length === 0) {
+                        err && logger.error(err);
+                        return;
+                    }
+                    let isUpvote = incrementAmount > 0;
+                    // Send custom webhooks
+                    dispatchWebhooks(isUpvote ? "vote.up" : "vote.down", {
+                        "user": {
+                            "status": getVoteAuthorRaw(userSubmissionCountRow.submissionCount, isVIP, isOwnSubmission)
+                        },
+                        "video": {
+                            "id": submissionInfoRow.videoID,
+                            "title": data.items[0].snippet.title,
+                            "url": "https://www.youtube.com/watch?v=" + submissionInfoRow.videoID,
+                            "thumbnail": data.items[0].snippet.thumbnails.maxres ? data.items[0].snippet.thumbnails.maxres.url : ""
+                        },
+                        "submission": {
+                            "UUID": UUID,
+                            "views": row.views,
+                            "category": category,
+                            "startTime": submissionInfoRow.startTime,
+                            "endTime": submissionInfoRow.endTime,
+                            "user": {
+                                "UUID": submissionInfoRow.userID,
+                                "username": submissionInfoRow.userName,
+                                "submissions": {
+                                    "total": submissionInfoRow.count,
+                                    "ignored": submissionInfoRow.disregarded
+                                }
+                            }
+                        },
+                        "votes": {
+                            "before": row.votes,
+                            "after": (row.votes + incrementAmount - oldIncrementAmount)
                         }
-
+                    });
+                    // Send discord message
+                    if (webhookURL !== null && !isUpvote) {
                         request.post(webhookURL, {
                             json: {
                                 "embeds": [{
                                     "title": data.items[0].snippet.title,
                                     "url": "https://www.youtube.com/watch?v=" + submissionInfoRow.videoID 
-                                      + "&t=" + (submissionInfoRow.startTime.toFixed(0) - 2),
+                                        + "&t=" + (submissionInfoRow.startTime.toFixed(0) - 2),
                                     "description": "**" + row.votes + " Votes Prior | " + (row.votes + incrementAmount - oldIncrementAmount) + " Votes Now | " + row.views 
                                         + " Views**\n\n**Submission ID:** " + UUID 
                                         + "\n**Category:** " + submissionInfoRow.category
@@ -257,8 +280,9 @@ async function voteOnSponsorTime(req, res) {
                                 logger.error("\n");
                             }
                         });
-                    });
-                }
+                    }
+
+                });
             }
         }
 

src/utils/dispatchWebhooks.js

@@ -0,0 +1,22 @@
+const config = require("../config.js");
+const logger = require('../utils/logger.js');
+const request = require('request');
+
+
+function dispatchEvent(scope, data) {
+    let webhooks = config.webhooks;
+    if (webhooks === undefined || webhooks.length === 0) return;
+    logger.debug("Dispatching webhooks");
+    webhooks.forEach(webhook => {
+        let webhookURL = webhook.url;
+        let authKey = webhook.key;
+        let scopes = webhook.scopes || [];
+        if (!scopes.includes(scope.toLowerCase())) return;
+        request.post(webhookURL, {json: data, headers: {
+            "Authorization": authKey,
+            "Event-Type": scope // Maybe change this in the future? 
+        }});
+    });
+}
+
+module.exports = dispatchEvent;

src/utils/webhookUtils.js

@@ -0,0 +1,26 @@
+function getVoteAuthorRaw(submissionCount, isVIP, isOwnSubmission) {
+    if (isOwnSubmission) {
+        return "self";
+    } else if (isVIP) {
+        return "vip";
+    } else if (submissionCount === 0) {
+        return "new";
+    } else {
+        return "other";
+    };
+};
+
+function getVoteAuthor(submissionCount, isVIP, isOwnSubmission) {
+    if (submissionCount === 0) {
+        return "Report by New User";
+    } else if (isVIP) {
+        return "Report by VIP User";
+    } else if (isOwnSubmission) {
+        return "Report by Submitter";
+    }
+
+    return "";
+}
+
+module.exports.getVoteAuthorRaw = getVoteAuthorRaw;
+module.exports.getVoteAuthor = getVoteAuthor;

test.json

@@ -15,5 +15,6 @@
     "dbSchema": "./databases/_sponsorTimes.db.sql",
     "privateDBSchema": "./databases/_private.db.sql",
     "mode": "test",
-    "readOnly": false
+    "readOnly": false,
+    "webhooks": []
 }