Merge branch 'experimental' of https://github.com/ajayyy/SponsorBlock into experimental-ajay

content.js

@@ -93,20 +93,20 @@ chrome.runtime.onMessage.addListener(messageListener);
   
 function messageListener(request, sender, sendResponse) {
         //messages from popup script
-  
-        if (request.message == "update") {
+        switch(request.message){
+            case "update":
                 videoIDChange(getYouTubeVideoID(document.URL));
-        }
 
-        if (request.message == "sponsorStart") {
+                break;
+            case "sponsorStart":
                 sponsorMessageStarted(sendResponse);
-        }
 
-        if (request.message == "sponsorDataChanged") {
+                break;
+            case "sponsorDataChanged":
                 updateSponsorTimesSubmitting();
-        }
 
-        if (request.message == "isInfoFound") {
+                break;
+            case "isInfoFound":
                 //send the sponsor times along with if it's found
                 sendResponse({
                     found: sponsorDataFound,
@@ -121,71 +121,76 @@ function messageListener(request, sender, sendResponse) {
                 }
 
                 popupInitialised = true;
-        }
-
-        if (request.message == "getVideoID") {
+                break;
+            case "getVideoID":
                 sendResponse({
                     videoID: sponsorVideoID
-            })
-        }
+                });
 
-        if (request.message == "getVideoDuration") {
+                break;
+            case "getVideoDuration":
                 sendResponse({
                 duration: v.duration
                 });
-        }
 
-        if (request.message == "skipToTime") {
+                break;
+            case "skipToTime":
                 v.currentTime = request.time;
-        }
-
-        if (request.message == "getCurrentTime") {
+                return
+            case "getCurrentTime":
                 sendResponse({
                     currentTime: v.currentTime
                 });
-        }
 
-        if (request.message == "getChannelURL") {
+                break;
+            case "getChannelURL":
                 sendResponse({
                 channelURL: channelURL
-            })
-        }
+                });
 
-        if (request.message == "isChannelWhitelisted") {
+                break;
+            case "isChannelWhitelisted":
                 sendResponse({
                     value: channelWhitelisted
-            })
-        }
+                });
 
-        if (request.message == "whitelistChange") {
+                break;
+            case "whitelistChange":
                 channelWhitelisted = request.value;
                 sponsorsLookup(sponsorVideoID);
-        }
 
-        if (request.message == "showNoticeAgain") {
+                break;
+            case "dontShowNotice":
                 dontShowNotice = false;
-        }
 
-        if (request.message == "changeStartSponsorButton") {
+                break;
+            case "changeStartSponsorButton":
                 changeStartSponsorButton(request.showStartSponsor, request.uploadButtonVisible);
-        }
 
-        if (request.message == "changeVideoPlayerControlsVisibility") {
+                break;
+            case "showNoticeAgain":
+                dontShowNotice = false;
+                
+                break;
+            case "changeVideoPlayerControlsVisibility":
                 hideVideoPlayerControls = request.value;
-
                 updateVisibilityOfPlayerControlsButton();
-        } else if (request.message == "changeInfoButtonPlayerControlsVisibility") {
+
+                break;
+            case "changeInfoButtonPlayerControlsVisibility":
                 hideInfoButtonPlayerControls = request.value;
-
                 updateVisibilityOfPlayerControlsButton();
-        } else if (request.message == "changeDeleteButtonPlayerControlsVisibility") {
+
+                break;
+            case "changeDeleteButtonPlayerControlsVisibility":
                 hideDeleteButtonPlayerControls = request.value;
-
                 updateVisibilityOfPlayerControlsButton();
-        }
 
-        if (request.message == "trackViewCount") {
+                break;
+            case "trackViewCount":
                 trackViewCount = request.value;
+
+                break;
         }
 }
 
@@ -386,7 +391,7 @@ function sponsorsLookup(id, channelIDPromise) {
 
             //check if this video was uploaded recently
             //use the invidious api to get the time published
-            sendRequestToCustomServer('GET', "https://invidio.us/api/v1/videos/" + id, function(xmlhttp, error) {
+            sendRequestToCustomServer('GET', "https://invidio.us/api/v1/videos/" + id + '?fields=published', function(xmlhttp, error) {
                 if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
                     let unixTimePublished = JSON.parse(xmlhttp.responseText).published;
 
@@ -615,6 +620,7 @@ function createButton(baseID, title, callback, imageName, isDraggable=false) {
     newButton.className = "ytp-button playerButton";
     newButton.setAttribute("title", chrome.i18n.getMessage(title));
     newButton.addEventListener("click", callback);
+    newButton.addEventListener("mouseover", getEventListeners(document.getElementsByClassName("ytp-play-button")[0]).mouseover[0].listener);
 
     // Image HTML
     let newButtonImage = document.createElement("img");