mirror of
https://github.com/ajayyy/SponsorBlockServer.git
synced 2025-12-30 03:18:23 +03:00
Fix vote webhook not working
This commit is contained in:
@@ -128,82 +128,80 @@ async function sendWebhooks(voteData: VoteData) {
|
|||||||
webhookURL = config.discordCompletelyIncorrectReportWebhookURL;
|
webhookURL = config.discordCompletelyIncorrectReportWebhookURL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config.newLeafURLs !== null) {
|
const videoID = submissionInfoRow.videoID;
|
||||||
const videoID = submissionInfoRow.videoID;
|
const data = await getVideoDetails(videoID);
|
||||||
const data = await getVideoDetails(videoID);
|
|
||||||
|
|
||||||
const isUpvote = voteData.incrementAmount > 0;
|
const isUpvote = voteData.incrementAmount > 0;
|
||||||
// Send custom webhooks
|
// Send custom webhooks
|
||||||
dispatchEvent(isUpvote ? "vote.up" : "vote.down", {
|
dispatchEvent(isUpvote ? "vote.up" : "vote.down", {
|
||||||
|
"user": {
|
||||||
|
"status": getVoteAuthorRaw(userSubmissionCountRow.submissionCount, voteData.isTempVIP, voteData.isVIP, voteData.isOwnSubmission),
|
||||||
|
},
|
||||||
|
"video": {
|
||||||
|
"id": submissionInfoRow.videoID,
|
||||||
|
"title": data?.title,
|
||||||
|
"url": `https://www.youtube.com/watch?v=${videoID}`,
|
||||||
|
"thumbnail": getMaxResThumbnail(videoID),
|
||||||
|
},
|
||||||
|
"submission": {
|
||||||
|
"UUID": voteData.UUID,
|
||||||
|
"views": voteData.row.views,
|
||||||
|
"category": voteData.category,
|
||||||
|
"startTime": submissionInfoRow.startTime,
|
||||||
|
"endTime": submissionInfoRow.endTime,
|
||||||
"user": {
|
"user": {
|
||||||
"status": getVoteAuthorRaw(userSubmissionCountRow.submissionCount, voteData.isTempVIP, voteData.isVIP, voteData.isOwnSubmission),
|
"UUID": submissionInfoRow.userID,
|
||||||
},
|
"username": submissionInfoRow.userName,
|
||||||
"video": {
|
"submissions": {
|
||||||
"id": submissionInfoRow.videoID,
|
"total": submissionInfoRow.count,
|
||||||
"title": data?.title,
|
"ignored": submissionInfoRow.disregarded,
|
||||||
"url": `https://www.youtube.com/watch?v=${videoID}`,
|
|
||||||
"thumbnail": getMaxResThumbnail(videoID),
|
|
||||||
},
|
|
||||||
"submission": {
|
|
||||||
"UUID": voteData.UUID,
|
|
||||||
"views": voteData.row.views,
|
|
||||||
"category": voteData.category,
|
|
||||||
"startTime": submissionInfoRow.startTime,
|
|
||||||
"endTime": submissionInfoRow.endTime,
|
|
||||||
"user": {
|
|
||||||
"UUID": submissionInfoRow.userID,
|
|
||||||
"username": submissionInfoRow.userName,
|
|
||||||
"submissions": {
|
|
||||||
"total": submissionInfoRow.count,
|
|
||||||
"ignored": submissionInfoRow.disregarded,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"votes": {
|
},
|
||||||
"before": voteData.row.votes,
|
"votes": {
|
||||||
"after": (voteData.row.votes + voteData.incrementAmount - voteData.oldIncrementAmount),
|
"before": voteData.row.votes,
|
||||||
},
|
"after": (voteData.row.votes + voteData.incrementAmount - voteData.oldIncrementAmount),
|
||||||
});
|
},
|
||||||
|
});
|
||||||
|
|
||||||
// Send discord message
|
// Send discord message
|
||||||
if (webhookURL !== null && !isUpvote) {
|
if (webhookURL !== null && !isUpvote) {
|
||||||
axios.post(webhookURL, {
|
axios.post(webhookURL, {
|
||||||
"embeds": [{
|
"embeds": [{
|
||||||
"title": data?.title,
|
"title": data?.title,
|
||||||
"url": `https://www.youtube.com/watch?v=${submissionInfoRow.videoID}&t=${(submissionInfoRow.startTime.toFixed(0) - 2)}s#requiredSegment=${voteData.UUID}`,
|
"url": `https://www.youtube.com/watch?v=${submissionInfoRow.videoID}&t=${(submissionInfoRow.startTime.toFixed(0) - 2)}s#requiredSegment=${voteData.UUID}`,
|
||||||
"description": `**${voteData.row.votes} Votes Prior | \
|
"description": `**${voteData.row.votes} Votes Prior | \
|
||||||
${(voteData.row.votes + voteData.incrementAmount - voteData.oldIncrementAmount)} Votes Now | ${voteData.row.views} \
|
${(voteData.row.votes + voteData.incrementAmount - voteData.oldIncrementAmount)} Votes Now | ${voteData.row.views} \
|
||||||
Views**\n\n**Locked**: ${voteData.row.locked}\n\n**Submission ID:** ${voteData.UUID}\
|
Views**\n\n**Locked**: ${voteData.row.locked}\n\n**Submission ID:** ${voteData.UUID}\
|
||||||
\n**Category:** ${submissionInfoRow.category}\
|
\n**Category:** ${submissionInfoRow.category}\
|
||||||
\n\n**Submitted by:** ${submissionInfoRow.userName}\n${submissionInfoRow.userID}\
|
\n\n**Submitted by:** ${submissionInfoRow.userName}\n${submissionInfoRow.userID}\
|
||||||
\n\n**Total User Submissions:** ${submissionInfoRow.count}\
|
\n\n**Total User Submissions:** ${submissionInfoRow.count}\
|
||||||
\n**Ignored User Submissions:** ${submissionInfoRow.disregarded}\
|
\n**Ignored User Submissions:** ${submissionInfoRow.disregarded}\
|
||||||
\n\n**Timestamp:** \
|
\n\n**Timestamp:** \
|
||||||
${getFormattedTime(submissionInfoRow.startTime)} to ${getFormattedTime(submissionInfoRow.endTime)}`,
|
${getFormattedTime(submissionInfoRow.startTime)} to ${getFormattedTime(submissionInfoRow.endTime)}`,
|
||||||
"color": 10813440,
|
"color": 10813440,
|
||||||
"author": {
|
"author": {
|
||||||
"name": voteData.finalResponse?.webhookMessage ??
|
"name": voteData.finalResponse?.webhookMessage ??
|
||||||
voteData.finalResponse?.finalMessage ??
|
voteData.finalResponse?.finalMessage ??
|
||||||
`${getVoteAuthor(userSubmissionCountRow.submissionCount, voteData.isTempVIP, voteData.isVIP, voteData.isOwnSubmission)}${voteData.row.locked ? " (Locked)" : ""}`,
|
`${getVoteAuthor(userSubmissionCountRow.submissionCount, voteData.isTempVIP, voteData.isVIP, voteData.isOwnSubmission)}${voteData.row.locked ? " (Locked)" : ""}`,
|
||||||
},
|
},
|
||||||
"thumbnail": {
|
"thumbnail": {
|
||||||
"url": getMaxResThumbnail(videoID),
|
"url": getMaxResThumbnail(videoID),
|
||||||
},
|
},
|
||||||
}],
|
}],
|
||||||
})
|
})
|
||||||
.then(res => {
|
.then(res => {
|
||||||
if (res.status >= 400) {
|
if (res.status >= 400) {
|
||||||
Logger.error("Error sending reported submission Discord hook");
|
Logger.error("Error sending reported submission Discord hook");
|
||||||
Logger.error(JSON.stringify((res.data)));
|
Logger.error(JSON.stringify((res.data)));
|
||||||
Logger.error("\n");
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch(err => {
|
|
||||||
Logger.error("Failed to send reported submission Discord hook.");
|
|
||||||
Logger.error(JSON.stringify(err));
|
|
||||||
Logger.error("\n");
|
Logger.error("\n");
|
||||||
});
|
}
|
||||||
}
|
})
|
||||||
|
.catch(err => {
|
||||||
|
Logger.error("Failed to send reported submission Discord hook.");
|
||||||
|
Logger.error(JSON.stringify(err));
|
||||||
|
Logger.error("\n");
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user