From c1efe02614257bbac64a174ffac655f7467599cf Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Fri, 23 Aug 2019 21:06:00 -0400 Subject: [PATCH 1/5] Improved promise calling in button updating function. --- content.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/content.js b/content.js index 0951ab29..1d1c6c3b 100644 --- a/content.js +++ b/content.js @@ -655,12 +655,15 @@ function isSubmitButtonLoaded() { return document.getElementById("submitButton") !== null; } -function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) { - if(!sponsorVideoID) return false; - wait(isSubmitButtonLoaded).then(result => { +async function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) { + if(!sponsorVideoID) return false; + + //make sure submit button is loaded + await wait(isSubmitButtonLoaded); + //if it isn't visible, there is no data - let shouldHide = (uploadButtonVisible && !hideDeleteButtonPlayerControls) ? "unset":"none" - document.getElementById("deleteButton").style.display = shouldHide; + let shouldHide = (uploadButtonVisible && !hideDeleteButtonPlayerControls) ? "unset" : "none" + document.getElementById("deleteButton").style.display = shouldHide; if (showStartSponsor) { showingStartSponsor = true; @@ -681,7 +684,6 @@ function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) { //disable submit button document.getElementById("submitButton").style.display = "none"; } - }); } function toggleStartSponsorButton() { From 2d12f957bca25248a3461ed1d2862b2eda2ecee7 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Fri, 23 Aug 2019 21:10:28 -0400 Subject: [PATCH 2/5] Improved await function. --- utils.js | 55 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/utils.js b/utils.js index 5fa60564..a3d1ac68 100644 --- a/utils.js +++ b/utils.js @@ -1,41 +1,48 @@ // Function that can be used to wait for a condition before returning async function wait(condition, timeout = 5000, check = 100) { - return await new Promise((resolve, reject) => { - setTimeout(() => {reject("TIMEOUT")}, timeout); - const interval = setInterval(() => { - let result = condition(); - if (result !== false) { - resolve(result); - clearInterval(interval); - }; - }, check); - }); + return await new Promise((resolve, reject) => { + setTimeout(() => reject("TIMEOUT"), timeout); + + let intervalCheck = () => { + let result = condition(); + if (result !== false) { + resolve(result); + clearInterval(interval); + }; + }; + + let interval = setInterval(intervalCheck, check); + + //run the check once first, this speeds it up a lot + intervalCheck(); + }); } function getYouTubeVideoID(url) { //Attempt to parse url let urlObject = null; try { - urlObject = new URL(url); + urlObject = new URL(url); } catch (e) { - console.error("[SB] Unable to parse URL: " + url); - return false; + console.error("[SB] Unable to parse URL: " + url); + return false; } - + //Check if valid hostname if(!["www.youtube.com","www.youtube-nocookie.com"].includes(urlObject.host)) return false; - + //Get ID from searchParam if ((urlObject.pathname == "/watch" || urlObject.pathname == "/watch/") && urlObject.searchParams.has("v")) { - id = urlObject.searchParams.get("v"); - return id.length == 11 ? id : false; + id = urlObject.searchParams.get("v"); + return id.length == 11 ? id : false; } else if (urlObject.pathname.startsWith("/embed/")) { - try { - return urlObject.pathname.substr(7, 11); - } catch (e) { - console.error("[SB] Video ID not valid for " + url); - return false; - } + try { + return urlObject.pathname.substr(7, 11); + } catch (e) { + console.error("[SB] Video ID not valid for " + url); + return false; + } } - return false; + + return false; } \ No newline at end of file From 1753f58120e9664a399d44a8bce836eecaa11f3c Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Sat, 24 Aug 2019 12:29:51 -0400 Subject: [PATCH 3/5] Fixed submissions being broken. --- background.js | 40 ++++++++++++++++++++-------------------- content.js | 4 ++-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/background.js b/background.js index aa25e379..28fd6bb0 100644 --- a/background.js +++ b/background.js @@ -7,29 +7,29 @@ chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) { chrome.runtime.onMessage.addListener(function (request, sender, callback) { switch(request.message) { case "submitTimes": - submitTimes(request.videoID, callback); - - //this allows the callback to be called later by the submitTimes function - return true; + submitTimes(request.videoID, callback); + + //this allows the callback to be called later by the submitTimes function + return true; case "addSponsorTime": - addSponsorTime(request.time, request.videoID, callback); - - //this allows the callback to be called later - return true; + addSponsorTime(request.time, request.videoID, callback); + + //this allows the callback to be called later + return true; case "getSponsorTimes": - getSponsorTimes(request.videoID, function(sponsorTimes) { - callback({ - sponsorTimes: sponsorTimes - }) - }); - - //this allows the callback to be called later - return true; + getSponsorTimes(request.videoID, function(sponsorTimes) { + callback({ + sponsorTimes: sponsorTimes + }) + }); + + //this allows the callback to be called later + return true; case "submitVote": - submitVote(request.type, request.UUID, callback); - - //this allows the callback to be called later - return true; + submitVote(request.type, request.UUID, callback); + + //this allows the callback to be called later + return true; case "alertPrevious": chrome.notifications.create("stillThere" + Math.random(), { type: "basic", diff --git a/content.js b/content.js index 2be7ce4d..708809cd 100644 --- a/content.js +++ b/content.js @@ -896,7 +896,7 @@ function submitSponsorTimes() { //called after all the checks have been made that it's okay to do so function sendSubmitMessage(){ //add loading animation - document.getElementById("submitButtonImage").src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker256px.png"); + document.getElementById("submitImage").src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker256px.png"); document.getElementById("submitButton").style.animation = "rotate 1s 0s infinite"; let currentVideoID = sponsorVideoID; @@ -931,7 +931,7 @@ function sendSubmitMessage(){ } else { //show that the upload failed document.getElementById("submitButton").style.animation = "unset"; - document.getElementById("submitButtonImage").src = chrome.extension.getURL("icons/PlayerUploadFailedIconSponsorBlocker256px.png"); + document.getElementById("submitImage").src = chrome.extension.getURL("icons/PlayerUploadFailedIconSponsorBlocker256px.png"); if([400,429,409,502].includes(response.statusCode)) { alert(chrome.i18n.getMessage(response.statusCode)); From 2d96c24b13a9a6b3d3c565a22701e6e721688ab0 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Sat, 24 Aug 2019 12:30:03 -0400 Subject: [PATCH 4/5] Update version number --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index d9dc24d5..3b02bca2 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_fullName__", "short_name": "__MSG_Name__", - "version": "1.1.4", + "version": "1.1.5", "default_locale": "en", "description": "__MSG_Description__", "content_scripts": [ From fef31c399b9e1ae178f02961dc0294ccf43daff3 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Sat, 24 Aug 2019 14:00:15 -0400 Subject: [PATCH 5/5] Update version number. --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 3b02bca2..2e883ddf 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_fullName__", "short_name": "__MSG_Name__", - "version": "1.1.5", + "version": "1.1.6", "default_locale": "en", "description": "__MSG_Description__", "content_scripts": [