From cfa80be4c7553bfcd0d095d84207ad8a1239dc6b Mon Sep 17 00:00:00 2001 From: Joe-Dowd Date: Tue, 28 Apr 2020 05:04:51 +0100 Subject: [PATCH 1/5] add user history to discord notification on segment reporting --- src/routes/voteOnSponsorTime.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/routes/voteOnSponsorTime.js b/src/routes/voteOnSponsorTime.js index bc9a326..85d7076 100644 --- a/src/routes/voteOnSponsorTime.js +++ b/src/routes/voteOnSponsorTime.js @@ -86,7 +86,11 @@ module.exports = async function voteOnSponsorTime(req, res) { // Send discord message if (type != 1) { // Get video ID - let submissionInfoRow = db.prepare("SELECT videoID, userID, startTime, endTime FROM sponsorTimes WHERE UUID = ?").get(UUID); + let submissionInfoRow = db.prepare("SELECT s.videoID, s.userID, s.startTime, s.endTime, 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 inner join userNames u on s.userID = u.userID where s.UUID=?" + ).get(UUID); let userSubmissionCountRow = db.prepare("SELECT count(*) as submissionCount FROM sponsorTimes WHERE userID = ?").get(nonAnonUserID); @@ -96,9 +100,11 @@ module.exports = async function voteOnSponsorTime(req, res) { id: submissionInfoRow.videoID }, function (err, data) { if (err || data.items.length === 0) { + console.log('pre-err'); err && console.log(err); return; } + console.log('presend' + submissionInfoRow.count); request.post(config.discordReportChannelWebhookURL, { json: { @@ -107,12 +113,15 @@ module.exports = async function voteOnSponsorTime(req, res) { "url": "https://www.youtube.com/watch?v=" + submissionInfoRow.videoID + "&t=" + (submissionInfoRow.startTime.toFixed(0) - 2), "description": "**" + row.votes + " Votes Prior | " + (row.votes + incrementAmount - oldIncrementAmount) + " Votes Now | " + row.views + - " Views**\n\nSubmission ID: " + UUID + - "\n\nSubmitted by: " + submissionInfoRow.userID + "\n\nTimestamp: " + + " Views**\n\n**Submission ID:** " + UUID + + "\n\n**Submitted by:** "+submissionInfoRow.userName+"\n " + submissionInfoRow.userID + + "\n\n**Total User Submissions:** "+submissionInfoRow.count + + "\n**Disregarded User Submissions:** "+submissionInfoRow.disregarded + +"\n\n**Timestamp:** " + getFormattedTime(submissionInfoRow.startTime) + " to " + getFormattedTime(submissionInfoRow.endTime), "color": 10813440, "author": { - "name": userSubmissionCountRow.submissionCount === 0 ? "Report by New User" : (vipRow.userCount !== 0 ? "Report by VIP User" : "") + "name": userSubmissionCountRow.submissionCount === 0 ? "Report by New User" : (vipRow.userCount !== 0 && "Report by VIP User") }, "thumbnail": { "url": data.items[0].snippet.thumbnails.maxres ? data.items[0].snippet.thumbnails.maxres.url : "", @@ -167,5 +176,6 @@ module.exports = async function voteOnSponsorTime(req, res) { res.sendStatus(200); } catch (err) { console.error(err); + res.status(400).json({error: 'Think of something to return'}); } } \ No newline at end of file From f6df7e5f6f71ed26ae9dcc28dd6f012d6b549516 Mon Sep 17 00:00:00 2001 From: Joe-Dowd Date: Tue, 28 Apr 2020 05:07:39 +0100 Subject: [PATCH 2/5] remove testing logs --- src/routes/voteOnSponsorTime.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/routes/voteOnSponsorTime.js b/src/routes/voteOnSponsorTime.js index 85d7076..c1a1c14 100644 --- a/src/routes/voteOnSponsorTime.js +++ b/src/routes/voteOnSponsorTime.js @@ -100,11 +100,9 @@ module.exports = async function voteOnSponsorTime(req, res) { id: submissionInfoRow.videoID }, function (err, data) { if (err || data.items.length === 0) { - console.log('pre-err'); err && console.log(err); return; } - console.log('presend' + submissionInfoRow.count); request.post(config.discordReportChannelWebhookURL, { json: { From 13aee13f18a07bd3db951b5049a7173195c631e4 Mon Sep 17 00:00:00 2001 From: Joe-Dowd Date: Tue, 28 Apr 2020 05:10:55 +0100 Subject: [PATCH 3/5] Improved phrasing of error responses \n removed debug logs --- src/routes/voteOnSponsorTime.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/voteOnSponsorTime.js b/src/routes/voteOnSponsorTime.js index c1a1c14..d98f7ac 100644 --- a/src/routes/voteOnSponsorTime.js +++ b/src/routes/voteOnSponsorTime.js @@ -174,6 +174,6 @@ module.exports = async function voteOnSponsorTime(req, res) { res.sendStatus(200); } catch (err) { console.error(err); - res.status(400).json({error: 'Think of something to return'}); + res.status(500).json({error: 'Internal error creating segment vote'}); } } \ No newline at end of file From e9e525ec63f0d9e66b993d10dad36043b3d98c34 Mon Sep 17 00:00:00 2001 From: Joe-Dowd Date: Tue, 28 Apr 2020 05:18:54 +0100 Subject: [PATCH 4/5] fixed formatting --- src/routes/voteOnSponsorTime.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/routes/voteOnSponsorTime.js b/src/routes/voteOnSponsorTime.js index d98f7ac..094565e 100644 --- a/src/routes/voteOnSponsorTime.js +++ b/src/routes/voteOnSponsorTime.js @@ -108,10 +108,10 @@ module.exports = async function voteOnSponsorTime(req, res) { json: { "embeds": [{ "title": data.items[0].snippet.title, - "url": "https://www.youtube.com/watch?v=" + submissionInfoRow.videoID + - "&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 + "url": "https://www.youtube.com/watch?v=" + submissionInfoRow.videoID + + "&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\n**Submitted by:** "+submissionInfoRow.userName+"\n " + submissionInfoRow.userID + "\n\n**Total User Submissions:** "+submissionInfoRow.count + "\n**Disregarded User Submissions:** "+submissionInfoRow.disregarded From d930853edfaab704d056b30f3f7db847dbe3edca Mon Sep 17 00:00:00 2001 From: Joe-Dowd Date: Wed, 29 Apr 2020 22:27:38 +0100 Subject: [PATCH 5/5] review changes --- src/routes/voteOnSponsorTime.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/voteOnSponsorTime.js b/src/routes/voteOnSponsorTime.js index 094565e..dda73ac 100644 --- a/src/routes/voteOnSponsorTime.js +++ b/src/routes/voteOnSponsorTime.js @@ -114,12 +114,12 @@ module.exports = async function voteOnSponsorTime(req, res) { + " Views**\n\n**Submission ID:** " + UUID + "\n\n**Submitted by:** "+submissionInfoRow.userName+"\n " + submissionInfoRow.userID + "\n\n**Total User Submissions:** "+submissionInfoRow.count - + "\n**Disregarded User Submissions:** "+submissionInfoRow.disregarded + + "\n**Ignored User Submissions:** "+submissionInfoRow.disregarded +"\n\n**Timestamp:** " + getFormattedTime(submissionInfoRow.startTime) + " to " + getFormattedTime(submissionInfoRow.endTime), "color": 10813440, "author": { - "name": userSubmissionCountRow.submissionCount === 0 ? "Report by New User" : (vipRow.userCount !== 0 && "Report by VIP User") + "name": userSubmissionCountRow.submissionCount === 0 ? "Report by New User" : (vipRow.userCount !== 0 ? "Report by VIP User" : "") }, "thumbnail": { "url": data.items[0].snippet.thumbnails.maxres ? data.items[0].snippet.thumbnails.maxres.url : "",