Mirror/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-12-31 03:48:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change automod check to call YT and NB API a single time per submission

Browse Source
This commit is contained in:
Andrew Lee
2020-09-11 17:08:41 -04:00
parent 137a6dc771
commit 6843e22a7b
1 changed files with 64 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
src/routes/postSkipSegments.js
View File

@@ -169,34 +169,59 @@ async function autoModerateSubmission(submission) {
if (data.pageInfo.totalResults === 0) { if (data.pageInfo.totalResults === 0) {
return "No video exists with id " + submission.videoID; return "No video exists with id " + submission.videoID;
} else { } else {
let duration = data.items[0].contentDetails.duration; let segments = submission.segments;
duration = isoDurations.toSeconds(isoDurations.parse(duration)); let nbString = "";
if (duration == 0) { for (let i = 0; i < segments.length; i++) {
// Allow submission if the duration is 0 (bug in youtube api) let startTime = parseFloat(segments[i].segment[0]);
return false; let endTime = parseFloat(segments[i].segment[1]);
} else if ((submission.endTime - submission.startTime) > (duration/100)*80) {
// Reject submission if over 80% of the video
return "One of your submitted segments is over 80% of the video.";
} else {
// Check NeuralBlock
let neuralBlockURL = config.neuralBlockURL;
if (!neuralBlockURL) return false;
let response = await fetch(neuralBlockURL + "/api/checkSponsorSegments?vid=" + submission.videoID + let duration = data.items[0].contentDetails.duration;
"&segments=" + submission.startTime + "," + submission.endTime); duration = isoDurations.toSeconds(isoDurations.parse(duration));
if (!response.ok) return false; if (duration == 0) {
// Allow submission if the duration is 0 (bug in youtube api)
let nbPredictions = await response.json(); return false;
if (nbPredictions.probabilities[0] >= 0.70){ } else if ((endTime - startTime) > (duration/100)*80) {
return false; // Reject submission if over 80% of the video
return "One of your submitted segments is over 80% of the video.";
} else { } else {
let UUID = getHash("v2-categories" + submission.videoID + submission.startTime + if (segments[i].category === "sponsor") {
submission.endTime + submission.category + submission.userID, 1); //Prepare timestamps to send to NB all at once
// Send to Discord nbString = nbString + segments[i].segment[0] + "," + segments[i].segment[1] + ";";
sendWebhooksNB(submission.userID, submission.videoID, UUID, submission.startTime, submission.endTime, submission.category, nbPredictions.probabilities[0], data); }
return "NB disagreement.";
} }
} }
// Check NeuralBlock
let neuralBlockURL = config.neuralBlockURL;
if (!neuralBlockURL) return false;
let response = await fetch(neuralBlockURL + "/api/checkSponsorSegments?vid=" + submission.videoID +
"&segments=" + nbString.substring(0,nbString.length-1));
if (!response.ok) return false;
let nbPredictions = await response.json();
nbDecision = false;
let predictionIdx = 0; //Keep track because only sponsor categories were submitted
for (let i = 0; i < segments.length; i++){
if (segments[i].category === "sponsor"){
if (nbPredictions.probabilities[predictionIdx] < 0.70){
nbDecision = true; // At least one bad entry
startTime = parseFloat(segments[i].segment[0]);
endTime = parseFloat(segments[i].segment[1]);
let UUID = getHash("v2-categories" + submission.videoID + startTime +
endTime + segments[i].category + submission.userID, 1);
// Send to Discord
// Note, if this is too spammy. Consider sending all the segments as one Webhook
sendWebhooksNB(submission.userID, submission.videoID, UUID, startTime, endTime, segments[i].category, nbPredictions.probabilities[predictionIdx], data);
}
predictionIdx++;
}
}
if (nbDecision){
return "NB disagreement.";
} else {
return false;
}
} }
} }
@@ -288,21 +313,23 @@ module.exports = async function postSkipSegments(req, res) {
res.sendStatus(409); res.sendStatus(409);
return; return;
} }
// Auto moderator check
if (!isVIP) {
let autoModerateResult = await autoModerateSubmission({userID, videoID, startTime, endTime, category: segments[i].category});
if (autoModerateResult == "NB disagreement."){
// If NB automod rejects, the submission will start with -2 votes
//decreaseVotes = -2; //Disable for now
} else if (autoModerateResult) {
//Normal automod behavior
res.status(403).send("Request rejected by auto moderator: " + autoModerateResult + " If this is an issue, send a message on Discord.");
return;
}
}
} }
// Auto moderator check
if (!isVIP) {
let autoModerateResult = await autoModerateSubmission({userID, videoID, segments});//startTime, endTime, category: segments[i].category});
if (autoModerateResult == "NB disagreement."){
// If NB automod rejects, the submission will start with -2 votes.
// Note, if one submission is bad all submissions will be affected.
// However, this behavior is consistent with other automod functions
// already in place.
//decreaseVotes = -2; //Disable for now
} else if (autoModerateResult) {
//Normal automod behavior
res.status(403).send("Request rejected by auto moderator: " + autoModerateResult + " If this is an issue, send a message on Discord.");
return;
}
}
// Will be filled when submitting // Will be filled when submitting
let UUIDs = []; let UUIDs = [];