Merge pull request #139 from ajayyy/experimental-ajay

Fixed preview bar causing issues

README.md

@@ -14,6 +14,7 @@
   <a href="https://sponsor.ajay.app/stats">Stats</a>
 </p>
 
+[![](https://img.shields.io/amo/users/sponsorblock?label=Firefox%20Users)](https://addons.mozilla.org/addon/sponsorblock/?src=external-github) [![](https://img.shields.io/chrome-web-store/users/mnjggcdmjocbbbhaepdhchncahnbgone?label=Chome%20Users)](https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone)
 
 SponsorBlock is an extension that will skip over sponsored segments of YouTube videos. SponsorBlock is a crowdsourced browser extension that lets anyone submit the start and end times of sponsored segments of YouTube videos. Once one person submits this information, everyone else with this extension will skip right over the sponsored segment.
 

_locales/en/messages.json

@@ -135,5 +135,17 @@
     },
     "submitCheck": {
         "message": "Are you sure you want to submit this?"
+    },
+    "longDescription": {
+        "message": "SponsorBlock is an extension that will skip over sponsored segments of YouTube videos. SponsorBlock is a crowdsourced browser extension that let's anyone submit the start and end time's of sponsored segments of YouTube videos. Once one person submits this information, everyone else with this extension will skip right over the sponsored segment.",
+        "description": "Full description of the extension on the store pages."
+    },
+    "website": {
+        "message": "Website",
+        "description": "Used on Firefox Store Page"
+    },
+    "sourceCode": {
+        "message": "Source Code",
+        "description": "Used on Firefox Store Page"
     }
 }

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",

content.js

@@ -238,8 +238,10 @@ function videoIDChange(id) {
     //setup the preview bar
     if (previewBar == null) {
         //create it
-        let progressBar = document.getElementsByClassName("ytp-progress-bar-container")[0] || document.getElementsByClassName("no-model cue-range-markers")[0];
-        previewBar = new PreviewBar(progressBar);
+        wait(getControls).then(result => {
+            let progressBar = document.getElementsByClassName("ytp-progress-bar-container")[0] || document.getElementsByClassName("no-model cue-range-markers")[0];
+            previewBar = new PreviewBar(progressBar);
+        });
     }
 
     //warn them if they had unsubmitted times
@@ -271,7 +273,7 @@ function videoIDChange(id) {
     sponsorsLookup(id);
 
     //make sure everything is properly added
-    updateVisibilityOfPlayerControlsButton(true);
+    updateVisibilityOfPlayerControlsButton();
 
     //reset sponsor times submitting
     sponsorTimesSubmitting = [];
@@ -412,7 +414,7 @@ function updatePreviewBar() {
         types.push("previewSponsor");
     }
 
-    previewBar.set(allSponsorTimes, types, v.duration);
+    wait(() => previewBar !== null).then((result) => previewBar.set(allSponsorTimes, types, v.duration));
 
     //update last video id
     lastPreviewBarUpdate = sponsorVideoID;
@@ -666,12 +668,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;
@@ -692,7 +697,6 @@ function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) {
         //disable submit button
         document.getElementById("submitButton").style.display = "none";
     }
-	});
 }
 
 function toggleStartSponsorButton() {
@@ -896,7 +900,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 +935,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));

manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_fullName__",
   "short_name": "__MSG_Name__",
-  "version": "1.1.4",
+  "version": "1.1.7",
   "default_locale": "en",
   "description": "__MSG_Description__",
   "content_scripts": [

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;
 }