mirror of
https://github.com/ajayyy/SponsorBlock.git
synced 2025-12-09 04:57:09 +03:00
Added duration check to popup as well.
This commit is contained in:
@@ -147,11 +147,29 @@ function submitVote(type, UUID, callback) {
|
|||||||
function submitTimes(videoID, callback) {
|
function submitTimes(videoID, callback) {
|
||||||
//get the video times from storage
|
//get the video times from storage
|
||||||
let sponsorTimeKey = 'sponsorTimes' + videoID;
|
let sponsorTimeKey = 'sponsorTimes' + videoID;
|
||||||
chrome.storage.sync.get([sponsorTimeKey, "userID"], function(result) {
|
chrome.storage.sync.get([sponsorTimeKey, "userID"], async function(result) {
|
||||||
let sponsorTimes = result[sponsorTimeKey];
|
let sponsorTimes = result[sponsorTimeKey];
|
||||||
let userID = result.userID;
|
let userID = result.userID;
|
||||||
|
|
||||||
if (sponsorTimes != undefined && sponsorTimes.length > 0) {
|
if (sponsorTimes != undefined && sponsorTimes.length > 0) {
|
||||||
|
let durationResult = 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
|
//submit these times
|
||||||
for (let i = 0; i < sponsorTimes.length; i++) {
|
for (let i = 0; i < sponsorTimes.length; i++) {
|
||||||
//submit the sponsorTime
|
//submit the sponsorTime
|
||||||
|
|||||||
@@ -128,6 +128,12 @@ function messageListener(request, sender, sendResponse) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (request.message == "getVideoDuration") {
|
||||||
|
sendResponse({
|
||||||
|
duration: v.duration
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (request.message == "skipToTime") {
|
if (request.message == "skipToTime") {
|
||||||
v.currentTime = request.time;
|
v.currentTime = request.time;
|
||||||
}
|
}
|
||||||
@@ -964,6 +970,8 @@ function submitSponsorTimes() {
|
|||||||
sponsorTimes[i][1] = v.duration;
|
sponsorTimes[i][1] = v.duration;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//update sponsorTimes
|
||||||
|
chrome.storage.sync.set({[sponsorTimeKey]: sponsorTimes});
|
||||||
|
|
||||||
let confirmMessage = chrome.i18n.getMessage("submitCheck") + "\n\n" + getSponsorTimesMessage(sponsorTimes);
|
let confirmMessage = chrome.i18n.getMessage("submitCheck") + "\n\n" + getSponsorTimesMessage(sponsorTimes);
|
||||||
confirmMessage += "\n\n" + chrome.i18n.getMessage("confirmMSG");
|
confirmMessage += "\n\n" + chrome.i18n.getMessage("confirmMSG");
|
||||||
|
|||||||
Reference in New Issue
Block a user