mirror of
https://github.com/ajayyy/SponsorBlock.git
synced 2025-12-06 19:47:04 +03:00
Fix submission count not being counted
This commit is contained in:
@@ -31,11 +31,6 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
|
|||||||
case "openConfig":
|
case "openConfig":
|
||||||
chrome.runtime.openOptionsPage();
|
chrome.runtime.openOptionsPage();
|
||||||
return
|
return
|
||||||
case "submitTimes":
|
|
||||||
submitTimes(request.videoID, callback);
|
|
||||||
|
|
||||||
//this allows the callback to be called later by the submitTimes function
|
|
||||||
return true;
|
|
||||||
case "addSponsorTime":
|
case "addSponsorTime":
|
||||||
addSponsorTime(request.time, request.videoID, callback);
|
addSponsorTime(request.time, request.videoID, callback);
|
||||||
|
|
||||||
@@ -183,60 +178,3 @@ function submitVote(type, UUID, callback) {
|
|||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function submitTimes(videoID: string, callback) {
|
|
||||||
//get the video times from storage
|
|
||||||
let sponsorTimes = Config.config.sponsorTimes.get(videoID);
|
|
||||||
let userID = Config.config.userID;
|
|
||||||
|
|
||||||
if (sponsorTimes != undefined && sponsorTimes.length > 0) {
|
|
||||||
let durationResult = <Types.VideoDurationResponse> await new Promise((resolve, reject) => {
|
|
||||||
chrome.tabs.query({
|
|
||||||
active: true,
|
|
||||||
currentWindow: true
|
|
||||||
}, function(tabs) {
|
|
||||||
chrome.tabs.sendMessage(tabs[0].id, {
|
|
||||||
message: "getVideoDuration"
|
|
||||||
}, (response) => resolve(response));
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
//check if a sponsor exceeds the duration of the video
|
|
||||||
for (let i = 0; i < sponsorTimes.length; i++) {
|
|
||||||
if (sponsorTimes[i][1] > durationResult.duration) {
|
|
||||||
sponsorTimes[i][1] = durationResult.duration;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//submit these times
|
|
||||||
for (let i = 0; i < sponsorTimes.length; i++) {
|
|
||||||
//to prevent it from happeneing twice
|
|
||||||
let increasedContributionAmount = false;
|
|
||||||
|
|
||||||
//submit the sponsorTime
|
|
||||||
utils.sendRequestToServer("GET", "/api/postVideoSponsorTimes?videoID=" + videoID + "&startTime=" + sponsorTimes[i][0] + "&endTime=" + sponsorTimes[i][1]
|
|
||||||
+ "&userID=" + userID, function(xmlhttp, error) {
|
|
||||||
if (xmlhttp.readyState == 4 && !error) {
|
|
||||||
callback({
|
|
||||||
statusCode: xmlhttp.status,
|
|
||||||
responseText: xmlhttp.responseText
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (xmlhttp.status == 200) {
|
|
||||||
//save the amount contributed
|
|
||||||
if (!increasedContributionAmount) {
|
|
||||||
increasedContributionAmount = true;
|
|
||||||
Config.config.sponsorTimesContributed = Config.config.sponsorTimesContributed + sponsorTimes.length;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (error) {
|
|
||||||
callback({
|
|
||||||
statusCode: -1
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1490,6 +1490,9 @@ async function sendSubmitMessage(){
|
|||||||
|
|
||||||
sponsorTimes = sponsorTimes.concat(sponsorTimesSubmitting);
|
sponsorTimes = sponsorTimes.concat(sponsorTimesSubmitting);
|
||||||
|
|
||||||
|
// Increase contribution count
|
||||||
|
Config.config.sponsorTimesContributed = Config.config.sponsorTimesContributed + sponsorTimesSubmitting.length;
|
||||||
|
|
||||||
// Empty the submitting times
|
// Empty the submitting times
|
||||||
sponsorTimesSubmitting = [];
|
sponsorTimesSubmitting = [];
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user