From 557c6ad05a44b710922f9ea87051a4bb5b43d86d Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Mon, 6 Apr 2020 20:12:12 -0400 Subject: [PATCH] Fixed discord tests --- src/routes/postSkipSegments.js | 9 +++++---- test/mocks.js | 2 -- test/youtubeMock.js | 8 ++++++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/routes/postSkipSegments.js b/src/routes/postSkipSegments.js index 08a5c7f..afa26f5 100644 --- a/src/routes/postSkipSegments.js +++ b/src/routes/postSkipSegments.js @@ -45,15 +45,18 @@ function sendDiscordNotification(userID, videoID, UUID, segmentInfo) { err && console.log(err); return; } + + let startTime = parseFloat(segmentInfo.segment[0]); + let endTime = parseFloat(segmentInfo.segment[1]); request.post(config.discordFirstTimeSubmissionsWebhookURL, { json: { "embeds": [{ "title": data.items[0].snippet.title, - "url": "https://www.youtube.com/watch?v=" + videoID + "&t=" + (segmentInfo.segment.toFixed(0) - 2), + "url": "https://www.youtube.com/watch?v=" + videoID + "&t=" + (startTime.toFixed(0) - 2), "description": "Submission ID: " + UUID + "\n\nTimestamp: " + - getFormattedTime(segmentInfo.segment[0]) + " to " + getFormattedTime(segmentInfo.segment[1]) + + getFormattedTime(startTime) + " to " + getFormattedTime(endTime) + "\n\nCategory: " + segmentInfo.category, "color": 10813440, "author": { @@ -234,8 +237,6 @@ module.exports = async function postSkipSegments(req, res) { let UUID = getHash("v2-categories" + videoID + segmentInfo.segment[0] + segmentInfo.segment[1] + segmentInfo.category + userID, 1); - console.log(UUID) - try { db.prepare("INSERT INTO sponsorTimes VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run(videoID, segmentInfo.segment[0], segmentInfo.segment[1], startingVotes, UUID, userID, timeSubmitted, 0, segmentInfo.category, shadowBanned); diff --git a/test/mocks.js b/test/mocks.js index df19c8a..a124646 100644 --- a/test/mocks.js +++ b/test/mocks.js @@ -4,12 +4,10 @@ var app = express(); var config = require('../src/config.js'); app.post('/ReportChannelWebhook', (req, res) => { - console.log("report mock hit"); res.status(200); }); app.post('/FirstTimeSubmissionsWebhook', (req, res) => { - console.log("first time submisson mock hit"); res.status(200); }); diff --git a/test/youtubeMock.js b/test/youtubeMock.js index 56300fd..0a9998d 100644 --- a/test/youtubeMock.js +++ b/test/youtubeMock.js @@ -26,6 +26,14 @@ const YouTubeAPI = { { contentDetails: { duration: "PT1H23M30S" + }, + snippet: { + title: "Example Title", + thumbnails: { + maxres: { + url: "https://sponsor.ajay.app/LogoSponsorBlockSimple256px.png" + } + } } } ]