Merge pull request #179 from ajayyy/experimental-ajay

Added better local stats.

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="icons/LogoSponsorBlocker256px.png" alt="Logo"></img>
+  <a href="https://sponsor.ajay.app"><img src="icons/LogoSponsorBlocker256px.png" alt="Logo"></img></a>
   
   <br/>
   <sub>Logo by <a href="https://github.com/munadikieh">@munadikieh</a></sub>
@@ -8,12 +8,18 @@
 <h1 align="center">SponsorBlock</h1>
 
 <p align="center">
+  <b>Download:</b>
   <a href="https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone">Chrome/Chromium</a> |
   <a href="https://addons.mozilla.org/addon/sponsorblock/?src=external-github">Firefox</a> |
   <a href="https://sponsor.ajay.app">Website</a> |
   <a href="https://sponsor.ajay.app/stats">Stats</a>
 </p>
 
+<p align="center">
+  <b>Unofficial Ports:</b>
+  <a href="https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports#mpv-media-player">MPV</a>
+</p>
+
 <p align="center">
     <a href="https://addons.mozilla.org/addon/sponsorblock/?src=external-github"><img src="https://img.shields.io/amo/users/sponsorblock?label=Firefox%20Users" alt="Badge"></img></a>
     <a href="https://chrome.google.com/webstore/detail/mnjggcdmjocbbbhaepdhchncahnbgone"><img src="https://img.shields.io/chrome-web-store/users/mnjggcdmjocbbbhaepdhchncahnbgone?label=Chome%20Users" alt="Badge"></img></a>

_locales/en/messages.json

@@ -24,9 +24,6 @@
     "409": {
         "message": "This has already been submitted before"
     },
-    "502": {
-        "message": "It seems the server is down. Contact the dev to inform them."
-    },
     "channelWhitelisted": {
         "message": "Channel Whitelisted!"
     },
@@ -100,7 +97,7 @@
         "message": "Sponsorship Ends Now"
     },
     "noVideoID": {
-        "message": "This probably isn't a YouTube tab, or you clicked too early. \n If you know this is a YouTube tab,\n close this popup and open it again.\n\nYou must refresh your YouTube tab after installing or updating (even auto-update) the extension."
+        "message": "No YouTube video found at this tab. If you know this is a YouTube tab, close this popup and open it again. If that does not work, try reloading the tab."
     },
     "success": {
         "message": "Success!"
@@ -141,9 +138,6 @@
     "removeFromWhitelist": {
          "message": "Remove Channel From Whitelist"
     },
-    "whitelistDescription": {
-         "message": "Whitelist the channels who do sponsorships ethically to encourage good behavior, or maybe if they are just entertaining and funny. Or don't, that's your call."
-    },
     "voteOnTime": {
          "message": "Vote On A Sponsor Time"
     },
@@ -193,10 +187,10 @@
         "message": "Options"
     },
     "showButtons": {
-        "message": "Hide Buttons On YouTube Player"
+        "message": "Show Buttons On YouTube Player"
     },
     "hideButtons": {
-        "message": "Show Buttons On YouTube Player"
+        "message": "Hide Buttons On YouTube Player"
     },
     "hideButtonsDescription": {
         "message": "This hides the buttons that appear on the YouTube player to submit sponsors. I can see this being annoying for some\n people. Instead of using the button there, this popup can be used to submit sponsors. To hide the notice that appears, \n use the button that appears on the notice saying \"Don't show this again\". You can always enable these settings again later."
@@ -220,10 +214,10 @@
         "message": "This is the button that allows you to clear all sponsors on the YouTube player."
     },
     "disableViewTracking": {
-        "message": "Disable Sponsor View Tracking"
+        "message": "Disable Sponsor Skip Count Tracking"
     },
     "enableViewTracking": {
-        "message": "Enable Sponsor View Tracking"
+        "message": "Enable Sponsor Skip Count Tracking"
     },
     "whatViewTracking": {
         "message": "This feature tracks which sponsors you have skipped to let users know how much their submission has helped others and\nused as a metric along with upvotes to ensure that spam doesn't get into the database. The extension sends a message\nto the server each time you skip a sponsor. Hopefully most people don't change this setting so that the view numbers are accurate. :)"
@@ -265,5 +259,60 @@
     },
     "0": {
         "message": "Connection Timeout. Check your internet connection. If your internet is working, the server is probably overloaded or down."
+    },
+    "disableSkipping": {
+        "message": "Disable SponsorBlock"
+    },
+    "enableSkipping": {
+        "message": "Enable SponsorBlock"
+    },
+    "yourWork": {
+        "message": "Your Work",
+        "description": "Used to describe the section that will show you the statistics from your submissions."
+    },
+    "502": {
+        "message": "The server seems to be overloaded. Try again in a few seconds."
+    },
+    "errorCode": {
+        "message": "Error Code: "
+    },
+    "noticeTitleNotSkipped": {
+        "message": "Skip Sponsor?"
+    },
+    "skip": {
+        "message": "Skip"
+    },
+    "disableAutoSkip": {
+        "message": "Disable Auto Skip"
+    },
+    "enableAutoSkip": {
+        "message": "Enable Auto Skip"
+    },
+    "autoSkipDescription": {
+        "message": "Auto skip will skip sponsors for you. If disabled, a notice will appear asking if you'd like to skip."
+    },
+    "youHaveSkipped": {
+        "message": "You have skipped "
+    },
+    "youHaveSaved": {
+        "message": "You have saved yourself "
+    },
+    "minLower": {
+        "message": "minute"
+    },
+    "minsLower": {
+        "message": "minutes"
+    },
+    "hourLower": {
+        "message": "hour"
+    },
+    "hoursLower": {
+        "message": "hours"
+    },
+    "youHaveSavedTime": {
+        "message": "You have saved people"
+    },
+    "youHaveSavedTimeEnd": {
+        "message": " of their lives."
     }
 }

_locales/fr/messages.json

@@ -24,9 +24,6 @@
     "409": {
         "message": "Déja soumis"
     },
-    "502": {
-        "message": "Le serveur ne fonctionne pas. Contactez le développeur."
-    },
     "channelWhitelisted": {
         "message": "Cette chaîne est sur la liste blanche !"
     },
@@ -193,10 +190,10 @@
         "message": "Options"
     },
     "showButtons": {
-        "message": "Cacher les boutons sur le lecteur YouTube"
+        "message": "Montrer les boutons sur le lecteur YouTube"
     },
     "hideButtons": {
-        "message": "Montrer les boutons sur le lecteur YouTube"
+        "message": "Cacher les boutons sur le lecteur YouTube"
     },
     "hideButtonsDescription": {
         "message": "Cela permet de cacher du lecteur YouTube les boutons utilisés pour soumettre des segments commerciaux. Je peux \ncomprendre que certaines personnes les trouvent perturbants. Au lieu d'utiliser ces boutons, cette fenêtre peut être utilisée \npour soumettre des segments commerciaux. Pour cacher la notification, utilisez le bouton \"Ne plus montrer\" sur la notification. Vous pouvez toujours réactiver ces paramètres plus tard."

_locales/it/messages.json

@@ -24,9 +24,6 @@
     "409": {
         "message": "Questo spezzone è già stato inviato"
     },
-    "502": {
-        "message": "Sembra che il server non funzioni. Contatta lo sviluppatore."
-    },
     "channelWhitelisted": {
         "message": "Canale aggiunto alla whitelist!"
     },
@@ -194,10 +191,10 @@
         "message": "Opzioni"
     },
     "showButtons": {
-        "message": "Nascondi i Pulsanti nel Lettore di YouTube"
+        "message": "Mostra i Pulsanti nel Lettore di YouTube"
     },
     "hideButtons": {
-        "message": "Mostra i Pulsanti nel Lettore di YouTube"
+        "message": "Nascondi i Pulsanti nel Lettore di YouTube"
     },
     "hideButtonsDescription": {
 		"message": "Nasconde i pulsanti che appaiono nel lettore di YouTube per inviare spezzoni sponsorizzati. Capisco che può essere fastidioso per alcune\n persone. Invece di utilizzare quei pulsanti, è possibile utilizzare questo popup per inviare gli spezzoni sponsorizzati. Per nascondere l'avviso che appare, \nusa il bottone \"Non mostrare più\" nell'avviso. Potrai sempre abilitare nuovamente queste impostazioni in futuro."

_locales/pt_BR/messages.json

@@ -24,9 +24,6 @@
     "409": {
         "message": "Isso já foi enviado antes"
     },
-    "502": {
-        "message": "Parece que o servidor caiu. Contate o desenvolvedor para informá-los."
-    },
     "channelWhitelisted": {
         "message": "Canal adicionado à lista branca!"
     },
@@ -194,10 +191,10 @@
         "message": "Opções"
     },
     "showButtons": {
-        "message": "Esconder botões no player do Youtube"
+        "message": "Mostrar botões no player do Youtube"
     },
     "hideButtons": {
-        "message": "Mostrar botões no player do Youtube"
+        "message": "Esconder botões no player do Youtube"
     },
     "hideButtonsDescription": {
         "message": "Isto esconde os botões que aparecem no player do Youtube para submeter patrocínios. Entendemos que possa ser\n incómodo a algumas pessoas. Em vez de usar esses botões pode usar os do popup. Para esconder a mensagem que aparece, \n ususe o botão na mesma que diz \"Don't show this again\". Pode sempre reactivar estas definições novamente."

_locales/pt_pt/messages.json

@@ -24,9 +24,6 @@
     "409": {
         "message": "Isso já foi enviado antes"
     },
-    "502": {
-        "message": "Parece que o servidor caiu. Contacte o desenvolvedor para o informar."
-    },
     "channelWhitelisted": {
         "message": "Canal adicionado à whitelist!"
     },
@@ -193,10 +190,10 @@
         "message": "Opções"
     },
     "showButtons": {
-        "message": "Esconder botões no player do Youtube"
+        "message": "Mostrar botões no player do Youtube"
     },
     "hideButtons": {
-        "message": "Mostrar botões no player do Youtube"
+        "message": "Esconder botões no player do Youtube"
     },
     "hideButtonsDescription": {
         "message": "Isto esconde os botões que aparecem no player do Youtube para submeter patrocínios. Entendemos que possa ser\n incómodo a algumas pessoas. Em vez de usar esses botões pode usar os do popup. Para esconder a mensagem que aparece, \n ususe o botão na mesma que diz \"Don't show this again\". Pode sempre reactivar estas definições novamente."

_locales/ru/messages.json

@@ -24,9 +24,6 @@
     "409": {
         "message": "Этот запрос был отправлен ранее."
     },
-    "502": {
-        "message": "Сервер недоступен. Свяжитесь с разработчиком и сообщите ему об этом."
-    },
     "channelWhitelisted": {
         "message": "Канал добавлен в белый список!"
     },

content.js

@@ -10,6 +10,9 @@ var sponsorVideoID = null;
 //these are sponsors that have been downvoted
 var hiddenSponsorTimes = [];
 
+/** @type {Array[boolean]} Has the sponsor been skipped */
+var sponsorSkipped = [];
+
 //the video
 var v;
 
@@ -67,6 +70,24 @@ var sponsorTimesSubmitting = [];
 //this is used to close the popup on YouTube when the other popup opens
 var popupInitialised = false;
 
+//should skips happen at all
+var disableSkipping = false;
+chrome.storage.sync.get(["disableSkipping"], function(result) {
+    let disableSkippingStorage = result.disableSkipping;
+    if (disableSkippingStorage != undefined) {
+        disableSkipping = disableSkippingStorage;
+    }
+});
+
+//should skips be manual
+var disableAutoSkip = false;
+chrome.storage.sync.get(["disableAutoSkip"], function(result) {
+    let disableAutoSkipStorage = result.disableAutoSkip;
+    if (disableAutoSkipStorage != undefined) {
+        disableAutoSkip = disableAutoSkipStorage;
+    }
+});
+
 //should view counts be tracked
 var trackViewCount = false;
 chrome.storage.sync.get(["trackViewCount"], function(result) {
@@ -378,6 +399,18 @@ function sponsorsLookup(id, channelIDPromise) {
         v.addEventListener('durationchange', updatePreviewBar);
     }
 
+    if (channelIDPromise != null) {
+        if (channelIDPromise.isFulfilled) {
+            whitelistCheck();
+        } else if (channelIDPromise.isRejected) {
+            //try again
+            wait(getChannelID).then(whitelistCheck).catch();
+        } else {
+            //add it as a then statement
+            channelIDPromise.then(whitelistCheck);
+        }
+    }
+
     //check database for sponsor times
     //made true once a setTimeout has been created to try again after a server error
     let recheckStarted = false;
@@ -388,6 +421,9 @@ function sponsorsLookup(id, channelIDPromise) {
             sponsorTimes = JSON.parse(xmlhttp.responseText).sponsorTimes;
             UUIDs = JSON.parse(xmlhttp.responseText).UUIDs;
 
+            // Reset skip save
+            sponsorSkipped = [];
+
             //update the preview bar
             //leave the type blank for now until categories are added
             if (lastPreviewBarUpdate == id || (lastPreviewBarUpdate == null && !isNaN(v.duration))) {
@@ -396,18 +432,6 @@ function sponsorsLookup(id, channelIDPromise) {
                 updatePreviewBar();
             }
 
-            if (channelIDPromise != null) {
-                if (channelIDPromise.isFulfilled) {
-                    whitelistCheck();
-                } else if (channelIDPromise.isRejected) {
-                    //try again
-                    wait(getChannelID).then(whitelistCheck).catch();
-                } else {
-                    //add it as a then statement
-                    channelIDPromise.then(whitelistCheck);
-                }
-            }
-
             sponsorLookupRetries = 0;
         } else if (xmlhttp.readyState == 4 && xmlhttp.status == 404) {
             sponsorDataFound = false;
@@ -439,9 +463,11 @@ function sponsorsLookup(id, channelIDPromise) {
     });
 
     //add the event to run on the videos "ontimeupdate"
-    v.ontimeupdate = function () { 
-        sponsorCheck();
-    };
+    if (!disableSkipping) {
+        v.ontimeupdate = function () { 
+            sponsorCheck();
+        };
+    }
 }
 
 function updatePreviewBar() {
@@ -525,29 +551,18 @@ function whitelistCheck() {
             UUIDs = [];
 
             channelWhitelisted = true;
-
-            //make sure the whitelistedChannels array isn't broken and full of null entries
-            //TODO: remove this at some point in the future as the bug that caused this should be patched
-            if (whitelistedChannels.some((el) => el === null)) {
-                //remove the entries that are null
-                let cleanWhitelistedChannelsArray = [];
-                for (let i = 0; i < whitelistedChannels.length; i++) {
-                    let channelURL = whitelistedChannels[i];
-                    if (channelURL !== null) {
-                        //add it
-                        cleanWhitelistedChannelsArray.push(channelURL);
-                    }
-                }
-
-                //save this value
-                chrome.storage.sync.set({"whitelistedChannels": cleanWhitelistedChannelsArray});
-            }
         }
     });
 }
 
 //video skipping
 function sponsorCheck() {
+    if (disableSkipping) {
+        // Make sure this isn't called again
+        v.ontimeupdate = null;
+        return;
+    }
+
     let skipHappened = false;
 
     if (sponsorTimes != null) {
@@ -606,7 +621,9 @@ function checkIfTimeToSkip(currentVideoTime, startTime, endTime) {
 
 //skip fromt he start time to the end time for a certain index sponsor time
 function skipToTime(v, index, sponsorTimes, openNotice) {
-    v.currentTime = sponsorTimes[index][1];
+    if (!disableAutoSkip) {
+        v.currentTime = sponsorTimes[index][1];
+    }
 
     lastSponsorTimeSkipped = sponsorTimes[index][0];
   
@@ -616,7 +633,7 @@ function skipToTime(v, index, sponsorTimes, openNotice) {
     if (openNotice) {
         //send out the message saying that a sponsor message was skipped
         if (!dontShowNotice) {
-            let skipNotice = new SkipNotice(this, currentUUID);
+            let skipNotice = new SkipNotice(this, currentUUID, disableAutoSkip);
 
             if (dontShowNoticeOld) {
                 //show why this notice is showing
@@ -628,15 +645,31 @@ function skipToTime(v, index, sponsorTimes, openNotice) {
             }
 
             //auto-upvote this sponsor
-            if (trackViewCount) {
+            if (trackViewCount && !disableAutoSkip) {
                 vote(1, currentUUID, null);
             }
         }
     }
 
     //send telemetry that a this sponsor was skipped happened
-    if (trackViewCount) {
+    if (trackViewCount && !sponsorSkipped[index]) {
         sendRequestToServer("GET", "/api/viewedVideoSponsorTime?UUID=" + currentUUID);
+
+        if (!disableAutoSkip) {
+            // Count this as a skip
+            chrome.storage.sync.get(["minutesSaved"], function(result) {
+                if (result.minutesSaved === undefined) result.minutesSaved = 0;
+
+                chrome.storage.sync.set({"minutesSaved": result.minutesSaved + (sponsorTimes[index][1] - sponsorTimes[index][0]) / 60 });
+            });
+            chrome.storage.sync.get(["skipCount"], function(result) {
+                if (result.skipCount === undefined) result.skipCount = 0;
+
+                chrome.storage.sync.set({"skipCount": result.skipCount + 1 });
+            });
+
+            sponsorSkipped[index] = true;
+        }
     }
 }
 
@@ -905,6 +938,30 @@ function vote(type, UUID, skipNotice) {
         skipNotice.resetNoticeInfoMessage.bind(skipNotice)();
     }
 
+    let sponsorIndex = UUIDs.indexOf(UUID);
+
+    // See if the local time saved count and skip count should be reverted
+    if (type == 0 && sponsorSkipped[sponsorIndex] || type == 1 && !sponsorSkipped[sponsorIndex]) {
+        let factor = 1;
+        if (type == 0) {
+            factor = -1;
+        }
+
+        // Count this as a skip
+        chrome.storage.sync.get(["minutesSaved"], function(result) {
+            if (result.minutesSaved === undefined) result.minutesSaved = 0;
+
+            chrome.storage.sync.set({"minutesSaved": result.minutesSaved + factor * (sponsorTimes[sponsorIndex][1] - sponsorTimes[sponsorIndex][0]) / 60 });
+        });
+        chrome.storage.sync.get(["skipCount"], function(result) {
+            if (result.skipCount === undefined) result.skipCount = 0;
+
+            chrome.storage.sync.set({"skipCount": result.skipCount + factor * 1 });
+        });
+
+        sponsorSkipped[sponsorIndex] = !sponsorSkipped[sponsorIndex];
+    }
+ 
     chrome.runtime.sendMessage({
         message: "submitVote",
         type: type,
@@ -1009,6 +1066,8 @@ function sendSubmitMessage(){
 
     let currentVideoID = sponsorVideoID;
 
+    let currentSponsorTimes = submitSponsorTimes;
+
     chrome.runtime.sendMessage({
         message: "submitTimes",
         videoID: currentVideoID
@@ -1032,10 +1091,11 @@ function sendSubmitMessage(){
 
                 //clear the sponsor times
                 let sponsorTimeKey = "sponsorTimes" + currentVideoID;
-                chrome.storage.sync.set({[sponsorTimeKey]: []});
+                chrome.storage.sync.set({[sponsorTimeKey]: []}, () => void updatePreviewBar());
 
-                //request the sponsors from the server again
-                sponsorsLookup(currentVideoID);
+                //add submissions to current sponsors list
+                sponsorTimes = sponsorTimes.concat(sponsorTimesSubmitting);
+                sponsorTimesSubmitting = [];
             } else {
                 //show that the upload failed
                 document.getElementById("submitButton").style.animation = "unset";
@@ -1045,7 +1105,7 @@ function sendSubmitMessage(){
                     //treat them the same
                     if (response.statusCode == 503) response.statusCode = 502;
 
-                    alert(chrome.i18n.getMessage(response.statusCode + ""));
+                    alert(chrome.i18n.getMessage(response.statusCode + "") + " " + chrome.i18n.getMessage("errorCode") + response.statusCode);
                 } else {
                     alert(chrome.i18n.getMessage("connectionError") + response.statusCode);
                 }

manifest.json

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

popup.css

@@ -35,6 +35,10 @@ sub.popupElement {
 }
 /* end reset */
 
+#sponsorBlockPopupLogo {
+	vertical-align: text-bottom;
+}
+
 .popupElement {
     font-family: 'Source Sans Pro', sans-serif;
 
@@ -43,12 +47,13 @@ sub.popupElement {
 
 h1.popupElement {
 	margin-top: 0px;
+	margin-bottom: 10px;
 }
 
 .popupBody {
 	font-size: 14px;
 	background-color: #ffd9d9;
-	padding: 5px;
+	padding: 0px 5px;
 }
 
 .discreteLink.popupElement {

popup.html

@@ -8,88 +8,35 @@
   <body class="popupBody">
     <center>
       <div id="app" class="popupBody">
-          <img src="icons/LogoSponsorBlocker256px.png" height="64px" id="sponsorBlockPopupLogo"/>
-
-          <h1 class="popupElement">__MSG_Name__</h1>
+          <h1 class="popupElement">
+            <img src="icons/IconSponsorBlocker256px.png" height="32px" id="sponsorBlockPopupLogo"/>
+            __MSG_Name__
+          </h1>
 
           <!-- Loading text -->
-          <p id="loadingIndicator" class="popupElement">__MSG_Loading__</p>
-
+          <p id="loadingIndicator" class="popupElement">__MSG_noVideoID__</p>
+          
           <!-- Hidden until loading complete -->
           <div id="mainControls" class="main popupElement" style="display: none">
             <!-- If the video was found in the database -->
             <div id="videoFound">
-                
+                  
             </div>
 
             <div id="downloadedSponsorMessageTimes" class="popupElement">
-
+  
             </div>
-            
-            <br/>
-
-            <div>
-              <button id="whitelistChannel" class="whitelistButton popupElement">__MSG_whitelistChannel__</button>
-              <button id="unwhitelistChannel" class="whitelistButton popupElement" style="display: none">__MSG_removeFromWhitelist__</button>
-            </div>
-            <sub class="popupElement">
-              __MSG_whitelistDescription__
-            </sub>
-
-            <br/>
-            <br/>
-
-            <button id="reportAnIssue" class="dangerButton popupElement">__MSG_voteOnTime__</button>
-
-            <div id="issueReporterContainer"  class="popupElement" style="display: none">
-
-              <h3 style="margin-top: 0px" class="popupElement">__MSG_voteOnTime__</h3>
-
-              <div id="issueReporterTimeButtons" class="popupElement">
-
-              </div>
-
-            </div>
-
-            <h2 class="recordingSubtitle popupElement">__MSG_recordTimes__</h2>
-
-            <p class="popupElement">
-              <span id=sponsorTimesContributionsContainer  class="popupElement" style="display: none">
-                  __MSG_soFarUHSubmited__
-                  <span id="sponsorTimesContributionsDisplay" class="popupElement">
-                    0
-                  </span>
-                  <span id="sponsorTimesContributionsDisplayEndWord" class="popupElement">
-                    __MSG_Sponsors__.
-                  </span>
-              </span>
-
-              <span id=sponsorTimesViewsContainer  class="popupElement" style="display: none">
-                  __MSG_savedPeopleFrom__
-                  <span id="sponsorTimesViewsDisplay" class="popupElement">
-                    0
-                  </span>
-                  <span id="sponsorTimesViewsDisplayEndWord" class="popupElement">
-                     __MSG_Segments__.
-                     __MSG_savedPeopleFrom__
-                  </span>
-              </span>
-
-              <div class="popupElement">
-                __MSG_viewLeaderboard__ <a class="popupElement discreteLink" href="https://sponsor.ajay.app/stats" target="_blank">__MSG_here__</a>.
-              </div>
-            </p>
 
             <p class="popupElement"> 
               __MSG_recordTimesDescription__
             </p>
-    
+  
             <div>
               <button id="sponsorStart" class="greenButton popupElement">__MSG_sponsorStart__</button>
             </div>
-
+  
             <sub class="popupElement">__MSG_popupHint__</sub>
-    
+
             <div id="submissionSection"  class="popupElement" style="display: none">
               <h3 class="popupElement">__MSG_lastTimes__</h3>
               <b>
@@ -102,10 +49,11 @@
       
               <button id="clearTimes" class="smallButton popupElement">__MSG_clearTimesButton__</button>
       
-              <br/>
-              <br/>
-
               <div id="submitTimesContainer" class="popupElement" style="display: none">
+
+                <br/>
+                <br/>
+
                 <button id="submitTimes" class="smallButton popupElement">__MSG_submitTimesButton__</button>
 
                 <div id="submitTimesInfoMessageContainer" class="popupElement" style="display: none">
@@ -115,36 +63,7 @@
                 </div>
 
               </div>
-      
-            </div>
 
-            <div id="setUsernameContainer" class="popupElement">
-              <br/>
-              <br/>
-    
-              <button id="setUsernameButton" class="warningButton popupElement">__MSG_setUsername__</button>
-              <br/>
-              <sub class="popupElement">
-                __MSG_publicStats__ <a class="popupElement discreteLink" href="https://sponsor.ajay.app/stats" target="_blank">__MSG_here__</a>.
-              </sub>
-            </div>
-
-            <div id="setUsername" class="popupElement" style="display: none">
-                <br/>
-
-                <h3>__MSG_setUsername__</h3>
-
-                <div id="setUsernameStatusContainer" style="display: none">
-                    <h2 id="setUsernameStatus"></h2>
-                </div>
-
-
-                <input id="usernameInput" hint="Username"></input>
-
-                <br/>
-                <br/>
-
-                <button id="submitUsername" class="warningButton popupElement">Submit Username</button>
             </div>
 
             <div id="discordButtonContainer" class="popupElement" style="display: none">
@@ -161,73 +80,190 @@
               <span id="hideDiscordButton" class="smallLink popupElement">__MSG_hideThis__</span>
             </div>
 
-            <div id="optionsButtonContainer" class="popupElement">
-                <br/>
-                <br/>
-      
-                <button id="optionsButton" class="dangerButton popupElement">__MSG_Options__</button>
+            <div>
+              <br/>
+
+              <button id="whitelistChannel" class="whitelistButton popupElement">__MSG_whitelistChannel__</button>
+              <button id="unwhitelistChannel" class="whitelistButton popupElement" style="display: none">__MSG_removeFromWhitelist__</button>
             </div>
 
-            <div id="options" class="popupElement" style="display: none">
-                <br/>
+            <br/>
 
-                <h3>__MSG_Options__</h3>
+            <button id="reportAnIssue" class="dangerButton popupElement">__MSG_voteOnTime__</button>
 
-                <span id="keybindButtons">
-                  <button id="setStartSponsorKeybind" class="warningButton popupElement">__MSG_setStartSponsorShortcut__</button>
-                  <br/>
-                  <br/>
-                  <button id="setSubmitKeybind" class="warningButton popupElement">__MSG_setSubmitKeybind__</button>
-                  <br/>
+            <div id="issueReporterContainer"  class="popupElement" style="display: none">
+
+              <h3 style="margin-top: 0px" class="popupElement">__MSG_voteOnTime__</h3>
+
+              <div id="issueReporterTimeButtons" class="popupElement">
+
+              </div>
+
+            </div>
+
+            <br/>
+            <br/>
+
+          </div>
+
+          <div>
+            <button id="disableSkipping" class="greenButton popupElement">__MSG_disableSkipping__</button>
+            <button id="enableSkipping" class="whitelistButton popupElement" style="display: none">__MSG_enableSkipping__</button>
+          </div>
+
+          <h2 class="recordingSubtitle popupElement">__MSG_yourWork__</h2>
+
+          <p class="popupElement">
+            <span id="sponsorTimesContributionsContainer"  class="popupElement" style="display: none">
+                __MSG_soFarUHSubmited__
+                <span id="sponsorTimesContributionsDisplay" class="popupElement">
+                  0
                 </span>
-                
-                <h2 id="keybindDescription" style="display: none" class="popupElement">__MSG_keybindDescription__</h2>
+                <span id="sponsorTimesContributionsDisplayEndWord" class="popupElement">__MSG_Sponsors__</span>.
+            </span>
 
-                <br/>
-                <br/>
-      
-                <button id="hideVideoPlayerControls" class="warningButton popupElement">__MSG_hideButtons__</button>
-                <button id="showVideoPlayerControls" style="display: none" class="warningButton popupElement">__MSG_showButtons__</button>
-                <br/>
-                <sub class="popupElement">
-                  __MSG_hideButtonsDescription__
-                </sub>
+            <span id="sponsorTimesViewsContainer"  class="popupElement" style="display: none">
+                __MSG_savedPeopleFrom__
+                <span id="sponsorTimesViewsDisplay" class="popupElement">
+                  0
+                </span>
+                <span id="sponsorTimesViewsDisplayEndWord" class="popupElement">__MSG_Segments__</span>.
+            </span>
 
-                <br/>
-                <br/>
+            <span id="sponsorTimesOthersTimeSavedContainer"  class="popupElement" style="display: none">
+              __MSG_youHaveSavedTime__
+              <span id="sponsorTimesOthersTimeSavedDisplay" class="popupElement">
+                0
+              </span>
+              <span id="sponsorTimesOthersTimeSavedEndWord" class="popupElement">__MSG_minsLower__</span>
 
-                <button id="hideInfoButtonPlayerControls" class="warningButton popupElement">__MSG_hideInfoButton__</button>
-                <button id="showInfoButtonPlayerControls" style="display: none" class="warningButton popupElement">__MSG_showInfoButton__</button>
-                <br/>
-                <sub class="popupElement">
-                  __MSG_whatInfoButton__
-                </sub>
+              <span class="popupElement">__MSG_youHaveSavedTimeEnd__</span>
+            </span>
 
-                <br/>
-                <br/>
+            <br/>
+            <br/>
 
-                <button id="hideDeleteButtonPlayerControls" class="warningButton popupElement">__MSG_hideDeleteButton__</button>
-                <button id="showDeleteButtonPlayerControls" style="display: none" class="warningButton popupElement">__MSG_showDeleteButton__</button>
-                <br/>
-                <sub class="popupElement">
-                  __MSG_whatDeleteButton__
-                </sub>
+            <span id="sponsorTimesSkipsDoneContainer"  class="popupElement" style="display: none">
+              __MSG_youHaveSkipped__
+              <span id="sponsorTimesSkipsDoneDisplay" class="popupElement">
+                0
+              </span>
+              <span id="sponsorTimesSkipsDoneEndWord" class="popupElement">__MSG_Segments__</span> since December 5th.
+            </span>
 
-                <br/>
-                <br/>
+            <span id="sponsorTimeSavedContainer"  class="popupElement" style="display: none">
+              __MSG_youHaveSaved__
+              <span id="sponsorTimeSavedDisplay" class="popupElement">
+                0
+              </span>
+              <span id="sponsorTimeSavedEndWord" class="popupElement">__MSG_minsLower__</span> since December 5th.
+            </span>
 
-                <button id="disableSponsorViewTracking" class="warningButton popupElement">__MSG_disableViewTracking__</button>
-                <button id="enableSponsorViewTracking" style="display: none" class="warningButton popupElement">__MSG_enableViewTracking__</button>
-                <br/>
-                <sub class="popupElement">
-                  __MSG_whatViewTracking__
-                </sub>
-      
-                <br/>
-                <br/>
-
-                <button id="showNoticeAgain" style="display: none" class="dangerButton popupElement">__MSG_showNotice__</button>
+            <div class="popupElement">
+              __MSG_viewLeaderboard__ <a class="popupElement discreteLink" href="https://sponsor.ajay.app/stats" target="_blank">__MSG_here__</a>.
             </div>
+          </p>
+
+          <div id="setUsernameContainer" class="popupElement">
+  
+            <button id="setUsernameButton" class="warningButton popupElement">__MSG_setUsername__</button>
+            <br/>
+            <sub class="popupElement">
+              __MSG_publicStats__ <a class="popupElement discreteLink" href="https://sponsor.ajay.app/stats" target="_blank">__MSG_here__</a>.
+            </sub>
+          </div>
+
+          <div id="setUsername" class="popupElement" style="display: none">
+              <h3>__MSG_setUsername__</h3>
+
+              <div id="setUsernameStatusContainer" style="display: none">
+                  <h2 id="setUsernameStatus"></h2>
+              </div>
+
+              <input id="usernameInput" hint="Username"></input>
+
+              <br/>
+              <br/>
+
+              <button id="submitUsername" class="warningButton popupElement">__MSG_setUsername__</button>
+          </div>
+
+          <div id="optionsButtonContainer" class="popupElement">
+              <br/>
+              <br/>
+    
+              <button id="optionsButton" class="dangerButton popupElement">__MSG_Options__</button>
+          </div>
+
+          <div id="options" class="popupElement" style="display: none">
+              <br/>
+
+              <h3>__MSG_Options__</h3>
+
+              <button id="disableAutoSkip" class="warningButton popupElement">__MSG_disableAutoSkip__</button>
+              <button id="enableAutoSkip" style="display: none" class="warningButton popupElement">__MSG_enableAutoSkip__</button>
+              <br/>
+              <sub class="popupElement">
+                __MSG_autoSkipDescription__
+              </sub>
+
+              <br/>
+              <br/>
+
+              <span id="keybindButtons">
+                <button id="setStartSponsorKeybind" class="warningButton popupElement">__MSG_setStartSponsorShortcut__</button>
+                <br/>
+                <br/>
+                <button id="setSubmitKeybind" class="warningButton popupElement">__MSG_setSubmitKeybind__</button>
+                <br/>
+              </span>
+              
+              <h2 id="keybindDescription" style="display: none" class="popupElement">__MSG_keybindDescription__</h2>
+
+              <br/>
+              <br/>
+    
+              <button id="hideVideoPlayerControls" class="warningButton popupElement">__MSG_hideButtons__</button>
+              <button id="showVideoPlayerControls" style="display: none" class="warningButton popupElement">__MSG_showButtons__</button>
+              <br/>
+              <sub class="popupElement">
+                __MSG_hideButtonsDescription__
+              </sub>
+
+              <br/>
+              <br/>
+
+              <button id="hideInfoButtonPlayerControls" class="warningButton popupElement">__MSG_hideInfoButton__</button>
+              <button id="showInfoButtonPlayerControls" style="display: none" class="warningButton popupElement">__MSG_showInfoButton__</button>
+              <br/>
+              <sub class="popupElement">
+                __MSG_whatInfoButton__
+              </sub>
+
+              <br/>
+              <br/>
+
+              <button id="hideDeleteButtonPlayerControls" class="warningButton popupElement">__MSG_hideDeleteButton__</button>
+              <button id="showDeleteButtonPlayerControls" style="display: none" class="warningButton popupElement">__MSG_showDeleteButton__</button>
+              <br/>
+              <sub class="popupElement">
+                __MSG_whatDeleteButton__
+              </sub>
+
+              <br/>
+              <br/>
+
+              <button id="disableSponsorViewTracking" class="warningButton popupElement">__MSG_disableViewTracking__</button>
+              <button id="enableSponsorViewTracking" style="display: none" class="warningButton popupElement">__MSG_enableViewTracking__</button>
+              <br/>
+              <sub class="popupElement">
+                __MSG_whatViewTracking__
+              </sub>
+    
+              <br/>
+              <br/>
+
+              <button id="showNoticeAgain" style="display: none" class="dangerButton popupElement">__MSG_showNotice__</button>
           </div>
         </div>
     </center>

popup.js

@@ -26,11 +26,18 @@ function runThePopup() {
     var SB = {};
 
     ["sponsorStart",
+    // Top toggles
     "whitelistChannel",
     "unwhitelistChannel",
+    "disableSkipping",
+    "enableSkipping",
+    // More controls
     "clearTimes",
     "submitTimes",
+    // options
     "showNoticeAgain",
+    "disableAutoSkip",
+    "enableAutoSkip",
     "hideVideoPlayerControls",
     "showVideoPlayerControls",
     "hideInfoButtonPlayerControls",
@@ -49,6 +56,18 @@ function runThePopup() {
     "sponsorTimesViewsContainer",
     "sponsorTimesViewsDisplay",
     "sponsorTimesViewsDisplayEndWord",
+    // sponsorTimesOthersTimeSaved
+    "sponsorTimesOthersTimeSavedContainer",
+    "sponsorTimesOthersTimeSavedDisplay",
+    "sponsorTimesOthersTimeSavedEndWord",
+    // sponsorTimesSkipsDone
+    "sponsorTimesSkipsDoneContainer",
+    "sponsorTimesSkipsDoneDisplay",
+    "sponsorTimesSkipsDoneEndWord",
+    // sponsorTimeSaved
+    "sponsorTimeSavedContainer",
+    "sponsorTimeSavedDisplay",
+    "sponsorTimeSavedEndWord",
     // discordButtons
     "discordButtonContainer",
     "hideDiscordButton",
@@ -80,9 +99,13 @@ function runThePopup() {
     SB.sponsorStart.addEventListener("click", sendSponsorStartMessage);
     SB.whitelistChannel.addEventListener("click", whitelistChannel);
     SB.unwhitelistChannel.addEventListener("click", unwhitelistChannel);
+    SB.disableSkipping.addEventListener("click", () => toggleSkipping(true));
+    SB.enableSkipping.addEventListener("click", () => toggleSkipping(false));
     SB.clearTimes.addEventListener("click", clearTimes);
     SB.submitTimes.addEventListener("click", submitTimes);
     SB.showNoticeAgain.addEventListener("click", showNoticeAgain);
+    SB.disableAutoSkip.addEventListener("click", () => setAutoSkip(true));
+    SB.enableAutoSkip.addEventListener("click", () => setAutoSkip(false));
     SB.setStartSponsorKeybind.addEventListener("click", () => setKeybind(true));
     SB.setSubmitKeybind.addEventListener("click", () => setKeybind(false));
     SB.hideVideoPlayerControls.addEventListener("click", hideVideoPlayerControls);
@@ -120,21 +143,30 @@ function runThePopup() {
         if (hideDiscordLink == undefined || !hideDiscordLink) {
             chrome.storage.sync.get(["hideDiscordLaunches"], function(result) {
                 let hideDiscordLaunches = result.hideDiscordLaunches;
-                //only if less than 5 launches
+                //only if less than 10 launches
                 if (hideDiscordLaunches == undefined || hideDiscordLaunches < 10) {
                     SB.discordButtonContainer.style.display = null;
           
                     if (hideDiscordLaunches == undefined) {
-                        hideDiscordButton = 1;
+                        hideDiscordLaunches = 1;
                     }
   
-                    chrome.storage.sync.set({"hideDiscordLaunches": hideDiscordButton + 1});
+                    chrome.storage.sync.set({"hideDiscordLaunches": hideDiscordLaunches + 1});
                 }
             });
         }
     });
 
-    //if the don't show notice again letiable is true, an option to 
+    //show proper disable skipping button
+    chrome.storage.sync.get(["disableSkipping"], function(result) {
+        let disableSkipping = result.disableSkipping;
+        if (disableSkipping != undefined && disableSkipping) {
+            SB.disableSkipping.style.display = "none";
+            SB.enableSkipping.style.display = "unset";
+        }
+    });
+
+    //if the don't show notice again variable is true, an option to 
     //  disable should be available
     chrome.storage.sync.get(["dontShowNotice"], function(result) {
         let dontShowNotice = result.dontShowNotice;
@@ -142,6 +174,15 @@ function runThePopup() {
             SB.showNoticeAgain.style.display = "unset";
         }
     });
+
+    //show proper auto skip option
+    chrome.storage.sync.get(["disableAutoSkip"], function(result) {
+        let disableAutoSkip = result.disableAutoSkip;
+        if (disableAutoSkip != undefined && disableAutoSkip) {
+            SB.disableAutoSkip.style.display = "none";
+            SB.enableAutoSkip.style.display = "unset";
+        }
+    });
   
     //show proper video player controls options
     chrome.storage.sync.get(["hideVideoPlayerControls"], function(result) {
@@ -207,10 +248,55 @@ function runThePopup() {
                             }
                         }
                     });
+
+                    //get this time in minutes
+                    sendRequestToServer("GET", "/api/getSavedTimeForUser?userID=" + userID, function(xmlhttp) {
+                        if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+                            let minutesSaved = JSON.parse(xmlhttp.responseText).timeSaved;
+                            if (minutesSaved != 0) {
+                                if (minutesSaved != 1) {
+                                    SB.sponsorTimesOthersTimeSavedEndWord.innerText = chrome.i18n.getMessage("minsLower");
+                                } else {
+                                    SB.sponsorTimesOthersTimeSavedEndWord.innerText = chrome.i18n.getMessage("minLower");
+                                }
+
+                                SB.sponsorTimesOthersTimeSavedDisplay.innerText = getFormattedHours(minutesSaved);
+                                SB.sponsorTimesOthersTimeSavedContainer.style.display = "unset";
+                            }
+                        }
+                    });
                 }
             });
         }
     });
+
+    //get the amount of times this user has skipped a sponsor
+    chrome.storage.sync.get(["skipCount"], function(result) {
+        if (result.skipCount != undefined) {
+            if (result.skipCount != 1) {
+                SB.sponsorTimesSkipsDoneEndWord.innerText = chrome.i18n.getMessage("Sponsors");
+            } else {
+                SB.sponsorTimesSkipsDoneEndWord.innerText = chrome.i18n.getMessage("Sponsor");
+            }
+
+            SB.sponsorTimesSkipsDoneDisplay.innerText = result.skipCount;
+            SB.sponsorTimesSkipsDoneContainer.style.display = "unset";
+        }
+    });
+
+    //get the amount of time this user has saved.
+    chrome.storage.sync.get(["minutesSaved"], function(result) {
+        if (result.minutesSaved != undefined) {
+            if (result.minutesSaved != 1) {
+                SB.sponsorTimeSavedEndWord.innerText = chrome.i18n.getMessage("minsLower");
+            } else {
+                SB.sponsorTimeSavedEndWord.innerText = chrome.i18n.getMessage("minLower");
+            }
+
+            SB.sponsorTimeSavedDisplay.innerText = getFormattedHours(result.minutesSaved);
+            SB.sponsorTimeSavedContainer.style.display = "unset";
+        }
+    });
   
     chrome.tabs.query({
             active: true,
@@ -280,7 +366,7 @@ function runThePopup() {
   
             //remove loading text
             SB.mainControls.style.display = "unset"
-            SB.loadingIndicator.innerHTML = "";
+            SB.loadingIndicator.style.display = "none";
 
             if (request.found) {
                 SB.videoFound.innerHTML = chrome.i18n.getMessage("sponsorFound");
@@ -815,7 +901,7 @@ function runThePopup() {
                             //treat them the same
                             if (response.statusCode == 503) response.statusCode = 502;
         
-                            errorMessage = chrome.i18n.getMessage(response.statusCode + "");
+                            errorMessage = chrome.i18n.getMessage(response.statusCode + "") + " " + chrome.i18n.getMessage("errorCode") + response.statusCode;
                         } else {
                             errorMessage = chrome.i18n.getMessage("connectionError") + response.statusCode;
                         }
@@ -844,6 +930,21 @@ function runThePopup() {
   
         SB.showNoticeAgain.style.display = "none";
     }
+
+    function setAutoSkip(value) {
+        chrome.storage.sync.set({"disableAutoSkip": value});
+
+        if (value) {
+            // If it isn't shown, they can't manually skip
+            showNoticeAgain();
+
+            SB.disableAutoSkip.style.display = "none";
+            SB.enableAutoSkip.style.display = "unset";
+        } else {
+            SB.enableAutoSkip.style.display = "none";
+            SB.disableAutoSkip.style.display = "unset";
+        }
+    }
   
     function hideVideoPlayerControls() {
         chrome.storage.sync.set({"hideVideoPlayerControls": true});
@@ -1135,7 +1236,7 @@ function runThePopup() {
     }
   
     function hideDiscordButton() {
-        chrome.storage.sync.set({"hideDiscordLink": false});
+        chrome.storage.sync.set({"hideDiscordLink": true});
   
         SB.discordButtonContainer.style.display = "none";
     }
@@ -1251,6 +1352,24 @@ function runThePopup() {
         });
     }
 
+    /**
+     * Should skipping be disabled (visuals stay)
+     */
+    function toggleSkipping(disabled) {
+        chrome.storage.sync.set({"disableSkipping": disabled});
+
+        let hiddenButton = SB.disableSkipping;
+        let shownButton = SB.enableSkipping;
+
+        if (!disabled) {
+            hiddenButton = SB.enableSkipping;
+            shownButton = SB.disableSkipping;
+        }
+
+        shownButton.style.display = "unset";
+        hiddenButton.style.display = "none";
+    }
+
     function setKeybind(startSponsorKeybind) {
         document.getElementById("keybindButtons").style.display = "none";
 
@@ -1315,6 +1434,18 @@ function runThePopup() {
         //submit this request
         xmlhttp.send();
     }
+
+    /**
+     * Converts time in hours to 5h 25.1
+     * If less than 1 hour, just returns minutes
+     * 
+     * @param {float} seconds 
+     * @returns {string}
+     */
+    function getFormattedHours(minues) {
+        let hours = Math.floor(minues / 60);
+        return (hours > 0 ? hours + "h " : "") + (minues % 60).toFixed(1);
+    }
   
 //end of function
 }

utils/skipNotice.js

@@ -1,10 +1,25 @@
 'use strict';
 
-//The notice that tells the user that a sponsor was just skipped
+/**
+ * The notice that tells the user that a sponsor was just skipped
+ */
 class SkipNotice {
-	constructor(parent, UUID) {
+    /**
+     * @param {HTMLElement} parent
+     * @param {String} UUID 
+     * @param {String} noticeTitle 
+     * @param {boolean} manualSkip 
+     */
+	constructor(parent, UUID, manualSkip = false) {
         this.parent = parent;
         this.UUID = UUID;
+        this.manualSkip = manualSkip;
+
+        let noticeTitle = chrome.i18n.getMessage("noticeTitle");
+
+        if (manualSkip) {
+            noticeTitle = chrome.i18n.getMessage("noticeTitleNotSkipped");
+        }
 
         this.maxCountdownTime = () => 4;
         //the countdown until this notice closes
@@ -54,7 +69,7 @@ class SkipNotice {
         noticeMessage.id = "sponsorSkipMessage" + this.idSuffix;
         noticeMessage.classList.add("sponsorSkipMessage");
         noticeMessage.classList.add("sponsorSkipObject");
-        noticeMessage.innerText = chrome.i18n.getMessage("noticeTitle");
+        noticeMessage.innerText = noticeTitle;
 
         //create the first column
         logoColumn.appendChild(logoElement);
@@ -136,7 +151,10 @@ class SkipNotice {
         dontShowAgainButton.className = "sponsorSkipObject sponsorSkipNoticeButton sponsorSkipNoticeRightButton";
         dontShowAgainButton.addEventListener("click", dontShowNoticeAgain);
 
-        dontshowContainer.appendChild(dontShowAgainButton);
+        // Don't let them hide it if manually skipping
+        if (!this.manualSkip) {
+            dontshowContainer.appendChild(dontShowAgainButton);
+        }
 
         //add to row
         secondRow.appendChild(voteButtonsContainer);
@@ -165,6 +183,10 @@ class SkipNotice {
 
         referenceNode.prepend(noticeElement);
 
+        if (manualSkip) {
+            this.unskippedMode(chrome.i18n.getMessage("skip"));
+        }
+
         this.startCountdown();
     }
 
@@ -228,10 +250,13 @@ class SkipNotice {
     unskip() {
         unskipSponsorTime(this.UUID);
 
+        this.unskippedMode(chrome.i18n.getMessage("reskip"));
+    }
+
+    /** Sets up notice to be not skipped yet */
+    unskippedMode(buttonText) {
         //change unskip button to a reskip button
-        let unskipButton = document.getElementById("sponsorSkipUnskipButton" + this.idSuffix);
-        unskipButton.innerText = chrome.i18n.getMessage("reskip");
-        unskipButton.removeEventListener("click", this.unskipCallback);
+        let unskipButton = this.changeUnskipButton(buttonText);
 
         //setup new callback
         this.unskipCallback = this.reskip.bind(this);
@@ -252,10 +277,8 @@ class SkipNotice {
     reskip() {
         reskipSponsorTime(this.UUID);
 
-        //change unskip button to a reskip button
-        let unskipButton = document.getElementById("sponsorSkipUnskipButton" + this.idSuffix);
-        unskipButton.innerText = chrome.i18n.getMessage("unskip");
-        unskipButton.removeEventListener("click", this.unskipCallback);
+        //change reskip button to a unskip button
+        let unskipButton = this.changeUnskipButton(chrome.i18n.getMessage("unskip"));
 
         //setup new callback
         this.unskipCallback = this.unskip.bind(this);
@@ -265,6 +288,27 @@ class SkipNotice {
         this.maxCountdownTime = () => 4;
         this.countdownTime = this.maxCountdownTime();
         this.updateTimerDisplay();
+
+        // See if the title should be changed
+        if (this.manualSkip) {
+            this.changeNoticeTitle(chrome.i18n.getMessage("noticeTitle"));
+
+            vote(1, this.UUID, this);
+        }
+    }
+
+    /**
+     * Changes the text on the reskip button
+     * 
+     * @param {string} text 
+     * @returns {HTMLElement} unskipButton
+     */
+    changeUnskipButton(text) {
+        let unskipButton = document.getElementById("sponsorSkipUnskipButton" + this.idSuffix);
+        unskipButton.innerText = text;
+        unskipButton.removeEventListener("click", this.unskipCallback);
+
+        return unskipButton;
     }
 
     afterDownvote() {
@@ -293,6 +337,12 @@ class SkipNotice {
             }
         }
     }
+
+    changeNoticeTitle(title) {
+        let noticeElement = document.getElementById("sponsorSkipMessage" + this.idSuffix);
+
+        noticeElement.innerText = title;
+    }
     
     addNoticeInfoMessage(message, message2) {
         let previousInfoMessage = document.getElementById("sponsorTimesInfoMessage" + this.idSuffix);