Merge pull request #212 from ajayyy/experimental-ajay

UserID import, ID fixes, view count fix, embed error fix

_locales/de/messages.json

@@ -0,0 +1,318 @@
+{
+    "Name": {
+        "message": "SponsorBlock",
+        "description": "Name of the extension."
+    },
+    "fullName": {
+        "message": "SponsorBlock for YouTube - Skip Sponsorships",
+        "description": "Name of the extension."
+    },
+
+    "Description": {
+        "message": "Überspringe die gesponserten Inhalte in YouTube-Videos. Melde gesponsorte Inhalte in den von dir angesehenen Videos und erspare anderen die Zeit.",
+        "description": "Description of the extension."
+    },
+    "helpPage": {
+        "message": "index_en.html"
+    },
+    "400": {
+        "message": "Ungültige Anforderung"
+    },
+    "429": {
+        "message": "Du hast zu viele Segmente in diesem Video eingereicht. Bist du dir sicher?"
+    },
+    "409": {
+        "message": "Dieser Inhalt wurde bereits eingereicht."
+    },
+    "channelWhitelisted": {
+        "message": "Kanal auf Whitelist gesetzt!"
+    },
+    "Sponsor": {
+        "message": "Sponsor"
+    },
+    "Sponsors": {
+        "message": "Sponsoren"
+    },
+   "Segment": {
+        "message": "gesponsorter Inhalt"
+    },
+    "Segments": {
+        "message": "gesponsorte Inhalte"
+    },
+    "noticeTitle": {
+        "message": "Sponsor übersprungen"
+    },
+    "reportButtonTitle": {
+        "message": "Melden"
+    },
+    "reportButtonInfo": {
+        "message": "Melde dieses Segment als unzulässig."
+    },
+    "Dismiss": {
+        "message": "Abbrechen"
+    },
+    "Loading": {
+        "message": "Laden..."
+    },
+    "Mins": {
+        "message": "Minuten"
+    },
+    "Secs": {
+        "message": "Sekunden"
+    },
+    "Hide": {
+        "message": "Verstecken"
+    },
+    "hitGoBack": {
+        "message": "Klicke Zurück um die Aktion rückgängig zu machen."
+    },
+    "unskip": {
+        "message": "Zurück"
+    },
+    "reskip": {
+        "message": "Vorwärts"
+    },
+    "paused": {
+        "message": "Pausiert"
+    },
+    "confirmMSG": {
+        "message": "\n\nUm einzelne Werte zu löschen oder zu ändern, klicke auf den Info-Button, oder öffne die Erweiterungs-Übersicht, indem du das Erweiterungssymbol in der rechten oberen Ecke anklickst."
+    },
+    "clearThis": {
+        "message": "Bist du sicher, dass du Folgendes löschen möchtest?\n\n"
+    },
+    "Unknown": {
+        "message": "Deine Segmente konnten nicht gesendet werden, bitte versuche es später erneut."
+    },
+    "sponsorFound": {
+        "message": "Die gesponsorten Inhalte dieses Videos befinden sich bereits in der Datenbank!"
+    },
+    "sponsor404": {
+        "message": "Keine Sponsoren gefunden"
+    },
+    "sponsorStart": {
+        "message": "Gesponserter Inhalt beginnt"
+    },
+    "sponsorEnd": {
+        "message": "Gesponserter Inhalt endet"
+    },
+    "noVideoID": {
+        "message": "Keine YouTube-Videos in diesem Tab gefunden. Wenn dies ein Youtube-Tab ist, schließe dieses Pop-up und öffne es erneut. Wenn das nicht hilft, versuche den Tab neu zu laden."
+    },
+    "success": {
+        "message": "Erfolg!"
+    },
+    "voted": {
+        "message": "Abgestimmt!"
+    },
+    "voteFail": {
+        "message": "Du hast bereits so abgestimmt."
+    },
+    "serverDown": {
+        "message": "Der Server ist scheinbar offline. Bitte unverzüglich dem Entwickler melden."
+    },
+    "connectionError": {
+        "message": "Ein Verbindungsfehler ist aufgetreten. Fehlermeldung: "
+    },
+    "wantToSubmit": {
+        "message": "Möchtest du die Segmente für die Video ID senden?"
+    },
+    "leftTimes": {
+        "message": "Scheinbar hast du einige Segmente noch nicht gesendet. Kehre zur Seite zurück um sie zu senden (sie sind noch gespeichert)."
+    },
+    "clearTimes": {
+        "message": "Lösche Auswahl"
+    },
+    "openPopup": {
+        "message": "Öffne SponsorBlock-Popup"
+    },
+    "SubmitTimes": {
+        "message": "Sende Auswahl"
+    },
+    "submitCheck": {
+        "message": "Bist du sicher, dass die Auswahl abgeschickt werden soll?"
+    },
+    "whitelistChannel": {
+         "message": "Kanal auf Whitelist setzen "
+    },
+    "removeFromWhitelist": {
+         "message": "Kanal von Whitelist entfernen"
+    },
+    "voteOnTime": {
+         "message": "Stimme für Zeiten ab"
+    },
+    "recordTimes": {
+         "message": "Lege das Zeitfenster eines gesponsorten Inhalts fest"
+    },
+    "soFarUHSubmited": {
+         "message": "Gemeldet wurden von dir bisher"
+    },
+    "savedPeopleFrom": {
+         "message": "Du hast andere Benutzer bewahrt vor"
+    },
+    "viewLeaderboard": {
+         "message": "Siehe Rangliste"
+    },
+    "here": {
+        "message": "hier"
+    },
+    "recordTimesDescription": {
+         "message": "Klicke den Knopf unten, wenn der gesponsorte Inhalt beginnt und endet, um aufzunehmen und\n einzusenden"
+    },
+    "popupHint": {
+         "message": "Hinweis: In den Optionen lässt sich eine Taste für das Festlegen von Anfang/Ende des gesponsorten Inhalts, sowie für das Einsenden festlegen"
+    },
+    "lastTimes": {
+         "message": "Letzte ausgewählte Zeitabschnitte"
+    },
+    "clearTimesButton": {
+        "message": "Zeiten löschen"
+    },
+    "submitTimesButton": {
+        "message": "Zeiten einsenden"
+    },
+    "publicStats": {
+        "message": "Dies ist wichtig für die öffentliche Nutzerstatistik. Siehe"
+    },
+    "setUsername": {
+        "message": "Alias festlegen"
+    },
+    "discordAdvert": {
+        "message": "Tritt dem offiziellen Discord-Kanal bei und teile Anregungen und Feedback!"
+    },
+    "hideThis": {
+        "message": "Verstecken"
+    },
+    "Options": {
+        "message": "Optionen"
+    },
+    "showButtons": {
+        "message": "Knöpfe in YouTube-Leiste zeigen"
+    },
+    "hideButtons": {
+        "message": "Knöpfe in YouTube-Leiste verstecken"
+    },
+    "hideButtonsDescription": {
+        "message": "Die Einstellung versteckt den Einsende-Knopf in der Youtube-Leiste. Ich kann verstehen, weshalb manchen diese Funktion\n an dieser Stelle stört. Stattdessen kann dafür dieses Pop-up genutzt werden. Um die transparente Benachrichtigung zu verstecken, klicke auf den \"Verstecken\"-Knopf \n der Benachrichtigung. Diese Einstellungen können wieder rückgängig gemacht werden."
+    },
+    "showInfoButton": {
+        "message": "Zeige Info-Knopf in Youtube-Leiste"
+    },
+    "hideInfoButton": {
+        "message": "Verstecke Info-Knopf in Youtube-Leiste"
+    },
+    "whatInfoButton": {
+        "message": "Dieser Knopf öffnet ein Pop-up auf der Youtube-Seite."
+    },
+    "hideDeleteButton": {
+        "message": "Verstecke Löschen-Knopf in Youtube Leiste"
+    },
+    "showDeleteButton": {
+        "message": "Zeige Löschen-Knopf in Youtube Leiste"
+    },
+    "whatDeleteButton": {
+        "message": "Dieser Knopf entfernt sämtlich Segmente in der Youtube-Zeitleiste."
+    },
+    "disableViewTracking": {
+        "message": "Deaktiviere das Mitzählen übersprungener Sponsoren"
+    },
+    "enableViewTracking": {
+        "message": "Aktiviere das Mitzählen übersprungener Sponsoren"
+    },
+    "whatViewTracking": {
+        "message": "Diese Funktion hält fest, welche Sponsoren von dir übersprungen wurden und hilft anderen zu erfahren, was ihre Einsendungen bewirkt haben.\n Außerdem dienen die Werte zusammen mit positiven Rückmeldungen als Anti-Spam-Schutz. \n Wenn ein gesponsorter Inhalt übersprungen wird, sendet die Erweiterung eine Nachricht an den Server. \n Hoffentlich wird diese Funktion auch weiterhin genutzt, damit der Algorithmus funktioniert. :)"
+    },
+    "showNotice": {
+        "message": "Benachrichtigung wieder zeigen"
+    },
+    "longDescription": {
+        "message": "SponsorBlock ist eine Erweiterung, die gesponsorte Segmente in YouTube-Videos überspringt. SponsorBlock ist ein Benutzernetzwerk, bei dem jeder Anfang und Ende eines Werbeblocks einreichen kann. Sobald die Information von einem Nutzer eingereicht wurde, überspringen die Erweiterungen der anderen dieses Segment automatisch.",
+        "description": "Full description of the extension on the store pages."
+    },
+    "website": {
+        "message": "Webseite",
+        "description": "Used on Firefox Store Page"
+    },
+    "sourceCode": {
+        "message": "Quellcode",
+        "description": "Used on Firefox Store Page"
+    },
+    "noticeUpdate": {
+        "message": "Die Benachrichtigung wurde verbessert!",
+        "description": "The first line of the message displayed after the notice was upgraded."
+    },
+    "noticeUpdate2": {
+        "message": "Gefällt dir immer noch nicht? Dann klicke den Verstecken-Knopf.",
+        "description": "The second line of the message displayed after the notice was upgraded."
+    },
+    "setStartSponsorShortcut": {
+        "message": "Segment aufnehmen Taste festlegen"
+    },
+    "setSubmitKeybind": {
+        "message": "Segment einsenden Taste festlegen"
+    },
+    "keybindDescription": {
+        "message": "Taste drücken, um festzulegen"
+    },
+    "keybindDescriptionComplete": {
+        "message": "Die Taste wurde festgelegt auf: "
+    },
+    "0": {
+        "message": "Verbindungsüberschreibung. Überprüfe deine Internetverbindung. Bist du mit dem Internet verbunden, ist der Server wahrscheinlich offline."
+    },
+    "disableSkipping": {
+        "message": "SponsorBlock ausschalten"
+    },
+    "enableSkipping": {
+        "message": "SponsorBlock einschalten"
+    },
+    "yourWork": {
+        "message": "Deine Statistik",
+        "description": "Used to describe the section that will show you the statistics from your submissions."
+    },
+    "502": {
+        "message": "Der Server scheint überlastet zu sein. Probiere es in ein paar Sekunden erneut."
+    },
+    "errorCode": {
+        "message": "Fehlermeldung: "
+    },
+    "noticeTitleNotSkipped": {
+        "message": "Sponsor überspringen?"
+    },
+    "skip": {
+        "message": "Überspringen"
+    },
+    "disableAutoSkip": {
+        "message": "Auto-Überspringen deaktivieren"
+    },
+    "enableAutoSkip": {
+        "message": "Auto-Überspringen aktivieren"
+    },
+    "autoSkipDescription": {
+        "message": "Auto-Überspringen überspringt gesponsorte Inhalte für dich. Wenn deaktiviert, fragt die Benachrichtigung, ob übersprungen werden soll."
+    },
+    "youHaveSkipped": {
+        "message": "Du übersprangst "
+    },
+    "youHaveSaved": {
+        "message": "Du erspartest dir "
+    },
+    "minLower": {
+        "message": "Minute"
+    },
+    "minsLower": {
+        "message": "Minuten"
+    },
+    "hourLower": {
+        "message": "Stunde"
+    },
+    "hoursLower": {
+        "message": "Stunden"
+    },
+    "youHaveSavedTime": {
+        "message": "Du erspartest anderen"
+    },
+    "youHaveSavedTimeEnd": {
+        "message": " ihrer Zeit."
+    }
+}

_locales/en/messages.json

@@ -76,7 +76,7 @@
         "message": "Paused"
     },
     "confirmMSG": {
-        "message": "\n\nTo edit or delete individual values, click the info button or open the extension popup by clicking the extension icon in the top right corner."
+        "message": "To edit or delete individual values, click the info button or open the extension popup by clicking the extension icon in the top right corner."
     },
     "clearThis": {
         "message": "Are you sure you want to clear this?\n\n"
@@ -314,5 +314,23 @@
     },
     "youHaveSavedTimeEnd": {
         "message": " of their lives."
+    },
+    "guildlinesSummary": {
+        "message": "- Make sure your segment only contains paid promotion segment, nothing else.\n- Make sure skipping this segment will not skip valuable content\n- If the whole video is a sponsor, please do not report it. A full video reporting system will come out soon.\n- Please do not report disclaimers that could show bias (if a review video is sponsored, don't skip when they mention that)."
+    },
+    "statusReminder": {
+        "message": "Check status.sponsor.ajay.app for server status."
+    },
+    "changeUserID": {
+        "message": "Import/Export Your UserID"
+    },
+    "whatChangeUserID": {
+        "message": "This should be kept private. This is like a password and should not be shared with anyone. If someone has this, they can impersonate you."
+    },
+    "setUserID": {
+        "message": "Set UserID"
+    },
+    "userIDChangeWarning": {
+        "message": "Warning: Changing the UserID is permanent. Are you sure you would like to do this? Make sure to backup your old one just in case."
     }
 }

background.js

@@ -33,7 +33,7 @@ chrome.runtime.onMessage.addListener(function (request, sender, callback) {
     case "alertPrevious":
 			chrome.notifications.create("stillThere" + Math.random(), {
         type: "basic",
-        title: chrome.i18n.getMessage("wantToSubmit") + request.previousVideoID + "?",
+        title: chrome.i18n.getMessage("wantToSubmit") + " " + request.previousVideoID + "?",
         message: chrome.i18n.getMessage("leftTimes"),
         iconUrl: "./icons/LogoSponsorBlocker256px.png"
 			});
@@ -109,7 +109,7 @@ function submitVote(type, UUID, callback) {
         }
 
         //publish this vote
-        sendRequestToServer("GET", "/api/voteOnSponsorTime?UUID=" + UUID + "&userID=" + userID + "&type=" + type, function(xmlhttp, error) {
+        sendRequestToServer("POST", "/api/voteOnSponsorTime?UUID=" + UUID + "&userID=" + userID + "&type=" + type, function(xmlhttp, error) {
             if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
                 callback({
                     successType: 1
@@ -215,22 +215,4 @@ function sendRequestToServer(type, address, callback) {
 
     //submit this request
     xmlhttp.send();
-}
-
-function generateUserID(length = 36) {
-        let charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-        let result = "";
-        if (window.crypto && window.crypto.getRandomValues) {
-                values = new Uint32Array(length);
-                window.crypto.getRandomValues(values);
-                for (i = 0; i < length; i++) {
-                        result += charset[values[i] % charset.length];
-                }
-                return result;
-        } else {
-                for (let i = 0; i < length; i++) {
-                    result += charset[Math.floor(Math.random() * charset.length)];
-                }
-                return result;
-        }
-}
+}

content.js

@@ -479,7 +479,12 @@ function updatePreviewBar() {
     //create an array of the sponsor types
     let types = [];
     for (let i = 0; i < localSponsorTimes.length; i++) {
-        types.push("sponsor");
+        if (!hiddenSponsorTimes.includes(i)) {
+            types.push("sponsor");
+        } else {
+            // Don't show this sponsor
+            types.push(null);
+        }
     }
     for (let i = 0; i < sponsorTimesSubmitting.length; i++) {
         types.push("previewSponsor");
@@ -493,25 +498,20 @@ function updatePreviewBar() {
 
 function getChannelID() {
     //get channel id
-    let channelContainers = document.querySelectorAll(".ytd-channel-name#text");
     let channelURLContainer = null;
 
-    for (let i = 0; i < channelContainers.length; i++) {
-        let child = channelContainers[i].firstElementChild;
-        if (child != null && child.getAttribute("href") != "") {
-            channelURLContainer = child;
-        }
-    }
-
-    if (channelContainers.length == 0) {
+    channelURLContainer = document.querySelector("#channel-name > #container > #text-container > #text");
+    if (channelURLContainer !== null) {
+        channelURLContainer = channelURLContainer.firstElementChild;
+    } else {
         //old YouTube theme
-        channelContainers = document.getElementsByClassName("yt-user-info");
+        let channelContainers = document.getElementsByClassName("yt-user-info");
         if (channelContainers.length != 0) {
             channelURLContainer = channelContainers[0].firstElementChild;
         }
     }
 
-    if (channelURLContainer == null) {
+    if (channelURLContainer === null) {
         //try later
         return false;
     }
@@ -545,11 +545,9 @@ function whitelistCheck() {
     chrome.storage.sync.get(["whitelistedChannels"], function(result) {
         let whitelistedChannels = result.whitelistedChannels;
 
-        if (whitelistedChannels != undefined && whitelistedChannels.includes(channelURL)) {
-            //reset sponsor times to nothing
-            sponsorTimes = [];
-            UUIDs = [];
+        console.log(channelURL)
 
+        if (whitelistedChannels != undefined && whitelistedChannels.includes(channelURL)) {
             channelWhitelisted = true;
         }
     });
@@ -561,6 +559,8 @@ function sponsorCheck() {
         // Make sure this isn't called again
         v.ontimeupdate = null;
         return;
+    } else if (channelWhitelisted) {
+        return;
     }
 
     let skipHappened = false;
@@ -651,9 +651,9 @@ function skipToTime(v, index, sponsorTimes, openNotice) {
         }
     }
 
-    //send telemetry that a this sponsor was skipped happened
+    //send telemetry that a this sponsor was skipped
     if (trackViewCount && !sponsorSkipped[index]) {
-        sendRequestToServer("GET", "/api/viewedVideoSponsorTime?UUID=" + currentUUID);
+        sendRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + currentUUID);
 
         if (!disableAutoSkip) {
             // Count this as a skip
@@ -940,11 +940,13 @@ function vote(type, UUID, skipNotice) {
 
     let sponsorIndex = UUIDs.indexOf(UUID);
 
-    // See if the local time saved count and skip count should be reverted
+    // See if the local time saved count and skip count should be saved
     if (type == 0 && sponsorSkipped[sponsorIndex] || type == 1 && !sponsorSkipped[sponsorIndex]) {
         let factor = 1;
         if (type == 0) {
             factor = -1;
+
+            sponsorSkipped[sponsorIndex] = false;
         }
 
         // Count this as a skip
@@ -958,8 +960,6 @@ function vote(type, UUID, skipNotice) {
 
             chrome.storage.sync.set({"skipCount": result.skipCount + factor * 1 });
         });
-
-        sponsorSkipped[sponsorIndex] = !sponsorSkipped[sponsorIndex];
     }
  
     chrome.runtime.sendMessage({
@@ -980,14 +980,8 @@ function vote(type, UUID, skipNotice) {
                     skipNotice.addNoticeInfoMessage.bind(skipNotice)(chrome.i18n.getMessage("voteFail"))
                     skipNotice.resetVoteButtonInfo.bind(skipNotice)();
                 } else if (response.successType == -1) {
-                    if (response.statusCode == 502) {
-                        skipNotice.addNoticeInfoMessage.bind(skipNotice)(chrome.i18n.getMessage("serverDown"))
-                        skipNotice.resetVoteButtonInfo.bind(skipNotice)();
-                    } else {
-                        //failure: unknown error
-                        skipNotice.addNoticeInfoMessage.bind(skipNotice)(chrome.i18n.getMessage("connectionError") + response.statusCode);
-                        skipNotice.resetVoteButtonInfo.bind(skipNotice)();
-                    }
+                    skipNotice.addNoticeInfoMessage.bind(skipNotice)(getErrorMessage(response.statusCode))
+                    skipNotice.resetVoteButtonInfo.bind(skipNotice)();
                 }
             }
         }
@@ -1047,8 +1041,11 @@ function submitSponsorTimes() {
             //update sponsorTimes
             chrome.storage.sync.set({[sponsorTimeKey]: sponsorTimes});
 
-            let confirmMessage = chrome.i18n.getMessage("submitCheck") + "\n\n" + getSponsorTimesMessage(sponsorTimes);
-            confirmMessage += "\n\n" + chrome.i18n.getMessage("confirmMSG");
+            //update sponsorTimesSubmitting
+            sponsorTimesSubmitting = sponsorTimes;
+
+            let confirmMessage = chrome.i18n.getMessage("submitCheck") + "\n\n" + getSponsorTimesMessage(sponsorTimes)
+                                    + "\n\n" + chrome.i18n.getMessage("confirmMSG")  + "\n\n" + chrome.i18n.getMessage("guildlinesSummary");
             if(!confirm(confirmMessage)) return;
 
             sendSubmitMessage();
@@ -1066,8 +1063,6 @@ function sendSubmitMessage(){
 
     let currentVideoID = sponsorVideoID;
 
-    let currentSponsorTimes = submitSponsorTimes;
-
     chrome.runtime.sendMessage({
         message: "submitTimes",
         videoID: currentVideoID
@@ -1091,24 +1086,25 @@ function sendSubmitMessage(){
 
                 //clear the sponsor times
                 let sponsorTimeKey = "sponsorTimes" + currentVideoID;
-                chrome.storage.sync.set({[sponsorTimeKey]: []}, () => void updatePreviewBar());
+                chrome.storage.sync.set({[sponsorTimeKey]: []});
 
                 //add submissions to current sponsors list
                 sponsorTimes = sponsorTimes.concat(sponsorTimesSubmitting);
+                for (let i = 0; i < sponsorTimesSubmitting.length; i++) {
+                    // Add some random IDs
+                    UUIDs.push(generateUserID());
+                }
+
+                // Empty the submitting times
                 sponsorTimesSubmitting = [];
+
+                updatePreviewBar();
             } else {
                 //show that the upload failed
                 document.getElementById("submitButton").style.animation = "unset";
                 document.getElementById("submitImage").src = chrome.extension.getURL("icons/PlayerUploadFailedIconSponsorBlocker256px.png");
 
-                if([400, 429, 409, 502, 0].includes(response.statusCode)) {
-                    //treat them the same
-                    if (response.statusCode == 503) response.statusCode = 502;
-
-                    alert(chrome.i18n.getMessage(response.statusCode + "") + " " + chrome.i18n.getMessage("errorCode") + response.statusCode);
-                } else {
-                    alert(chrome.i18n.getMessage("connectionError") + response.statusCode);
-                }
+                alert(getErrorMessage(response.statusCode));
             }
         }
     });

crowdin.yml

@@ -0,0 +1,9 @@
+files:
+  - source: /_locales/en/*
+    translation: /_locales/%two_letters_code%/%original_file_name%
+    languages_mapping:
+        two_letters_code:
+           pr-BR: "pt_BR"
+           pr-PT: "pt_PT"
+           zh-CN: "zh_CH"
+           zh-TW: "zh_TW"

help/index_en.html

@@ -39,7 +39,7 @@
       <br/>
       <br/>
 
-      Whenever you skip a video, you will get a notice report that submission. If the timing seems wrong, report it! You can also vote in the popup. The extension auto upvotes it if you don't report it, so make sure to report when necessary.
+      Whenever you skip a video, you will get a notice report that submission. If the timing seems wrong, report it! You can also vote in the popup. The extension auto upvotes it if you don't report it, so make sure to report when necessary (this can be disabled in the options).
     </p>
 
     <center><img height="120px" src="https://user-images.githubusercontent.com/12688112/63067735-5a638700-bede-11e9-8147-f321b57527ec.gif"></center>

manifest.json

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

popup.html

@@ -140,24 +140,24 @@
               <span class="popupElement">__MSG_youHaveSavedTimeEnd__</span>
             </span>
 
-            <br/>
-            <br/>
-
-            <span id="sponsorTimesSkipsDoneContainer"  class="popupElement" style="display: none">
+            <div 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>
+            </div>
 
-            <span id="sponsorTimeSavedContainer"  class="popupElement" style="display: none">
+            <div 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>
+
+              </br/>
+              </br/>
+            </div>
 
             <div class="popupElement">
               __MSG_viewLeaderboard__ <a class="popupElement discreteLink" href="https://sponsor.ajay.app/stats" target="_blank">__MSG_here__</a>.
@@ -253,6 +253,28 @@
               <br/>
               <br/>
 
+
+              <button id="changeUserIDButton" class="warningButton popupElement">__MSG_changeUserID__</button>
+              <br/>
+              <sub class="popupElement">
+                __MSG_whatChangeUserID__
+              </sub>
+
+              <div id="changeUserID" class="popupElement" style="display: none">
+                  <br/>
+                  <br/>
+
+                  <input id="userIDInput" hint="userID"></input>
+    
+                  <br/>
+                  <br/>
+    
+                  <button id="setUserID" class="warningButton popupElement">__MSG_setUserID__</button>
+              </div>
+              
+              <br/>
+              <br/>
+
               <button id="disableSponsorViewTracking" class="warningButton popupElement">__MSG_disableViewTracking__</button>
               <button id="enableSponsorViewTracking" style="display: none" class="warningButton popupElement">__MSG_enableViewTracking__</button>
               <br/>

popup.js

@@ -82,6 +82,11 @@ function runThePopup() {
     "setUsername",
     "usernameInput",
     "submitUsername",
+    // UserID
+    "changeUserID",
+    "changeUserIDButton",
+    "userIDInput",
+    "setUserID",
     // More
     "submissionSection",
     "mainControls",
@@ -118,6 +123,8 @@ function runThePopup() {
     SB.enableSponsorViewTracking.addEventListener("click", enableSponsorViewTracking);
     SB.setUsernameButton.addEventListener("click", setUsernameButton);
     SB.submitUsername.addEventListener("click", submitUsername);
+    SB.changeUserIDButton.addEventListener("click", changeUserIDButton);
+    SB.setUserID.addEventListener("click", setUserID);
     SB.optionsButton.addEventListener("click", openOptions);
     SB.reportAnIssue.addEventListener("click", reportAnIssue);
     SB.hideDiscordButton.addEventListener("click", hideDiscordButton);
@@ -390,7 +397,7 @@ function runThePopup() {
                         SB.whitelistChannel.style.display = "none";
                         SB.unwhitelistChannel.style.display = "unset";
 
-                        SB.downloadedSponsorMessageTimes.innerText = "Channel Whitelisted!";
+                        SB.downloadedSponsorMessageTimes.innerText = chrome.i18n.getMessage("channelWhitelisted");
                         SB.downloadedSponsorMessageTimes.style.fontWeight = "bold";
                     }
                 });
@@ -740,8 +747,8 @@ function runThePopup() {
                 tabs[0].id,
                 {message: "getCurrentTime"},
                 function (response) {
-                    let minutes = document.getElementById(idStartName + chrome.i18n.getMessage("Mins") + index);
-                    let seconds = document.getElementById(idStartName + chrome.i18n.getMessage("Secs") + index);
+                    let minutes = document.getElementById(idStartName + "Minutes" + index);
+                    let seconds = document.getElementById(idStartName + "Seconds" + index);
     
                     minutes.value = getTimeInMinutes(response.currentTime);
                     seconds.value = getTimeInFormattedSeconds(response.currentTime);
@@ -752,8 +759,8 @@ function runThePopup() {
     //id start name is whether it is the startTime or endTime
     //gives back the time in seconds
     function getSponsorTimeEditTimes(idStartName, index) {
-        let minutes = document.getElementById(idStartName + chrome.i18n.getMessage("Mins") + index);
-        let seconds = document.getElementById(idStartName + chrome.i18n.getMessage("Secs") + index);
+        let minutes = document.getElementById(idStartName + "Minutes" + index);
+        let seconds = document.getElementById(idStartName + "Seconds" + index);
 
         return parseInt(minutes.value) * 60 + parseFloat(seconds.value);
     }
@@ -895,18 +902,7 @@ function runThePopup() {
 
                         clearTimes();
                     } else {
-                        let errorMessage = "";
-                        
-                        if([400, 429, 409, 502, 0].includes(response.statusCode)) {
-                            //treat them the same
-                            if (response.statusCode == 503) response.statusCode = 502;
-        
-                            errorMessage = chrome.i18n.getMessage(response.statusCode + "") + " " + chrome.i18n.getMessage("errorCode") + response.statusCode;
-                        } else {
-                            errorMessage = chrome.i18n.getMessage("connectionError") + response.statusCode;
-                        }
-
-                        document.getElementById("submitTimesInfoMessage").innerText = errorMessage;
+                        document.getElementById("submitTimesInfoMessage").innerText = getErrorMessage(response.statusCode);
                         document.getElementById("submitTimesInfoMessageContainer").style.display = "unset";
 
                         SB.submitTimesInfoMessageContainer.style.display = "unset";
@@ -1138,7 +1134,7 @@ function runThePopup() {
                     SB.usernameInput.style.display = "none";
 
                     SB.setUsernameStatusContainer.style.display = "unset";
-                    SB.setUsernameStatus.innerText = "Couldn't connect to server. Error code: " + xmlhttp.status;
+                    SB.setUsernameStatus.innerText = getErrorMessage(xmlhttp.status);
                 }
             });
         });
@@ -1160,15 +1156,7 @@ function runThePopup() {
 
                     SB.setUsernameStatus.innerText = chrome.i18n.getMessage("success");
                 } else if (xmlhttp.readyState == 4) {
-                    let errorMessage = "";
-                        
-                    if([400, 429, 409, 502].includes(xmlhttp.status)) {
-                        errorMessage = chrome.i18n.getMessage(xmlhttp.status);
-                    } else {
-                        errorMessage = chrome.i18n.getMessage("connectionError") + xmlhttp.status;
-                    }
-
-                    SB.setUsernameStatus.innerText = errorMessage;
+                    SB.setUsernameStatus.innerText = getErrorMessageI(xmlhttp.status);
                 }
             });
         });
@@ -1177,6 +1165,22 @@ function runThePopup() {
         SB.setUsernameContainer.style.display = "none";
         SB.setUsername.style.display = "unset";
     }
+
+    function changeUserIDButton() {
+        //get the user  ID
+        chrome.storage.sync.get(["userID"], function(result) {
+                SB.userIDInput.value = result.userID;
+                SB.setUserID.style.display = "unset";
+                SB.userIDInput.style.display = "unset";
+                SB.changeUserID.style.display = "unset";
+        });
+    }
+
+    function setUserID() {
+        if (!confirm(chrome.i18n.getMessage("userIDChangeWarning"))) return;
+
+        chrome.storage.sync.set({"userID": SB.userIDInput.value});
+    }
   
     //this is not a YouTube video page
     function displayNoVideo() {
@@ -1224,12 +1228,7 @@ function runThePopup() {
                     //failure: duplicate vote
                     addVoteMessage(chrome.i18n.getMessage("voteFail"), UUID)
                 } else if (response.successType == -1) {
-                    if (response.statusCode == 502) {
-                        addVoteMessage(chrome.i18n.getMessage("serverDown"), UUID)
-                    } else {
-                        //failure: unknown error
-                        addVoteMessage(chrome.i18n.getMessage("connectionError") + response.statusCode, UUID)
-                    }
+                    addVoteMessage(getErrorMessage(response.statusCode), UUID)
                 }
             }
         });
@@ -1279,7 +1278,7 @@ function runThePopup() {
                         SB.whitelistChannel.style.display = "none";
                         SB.unwhitelistChannel.style.display = "unset";
 
-                        SB.downloadedSponsorMessageTimes.innerText = "Channel Whitelisted!";
+                        SB.downloadedSponsorMessageTimes.innerText = chrome.i18n.getMessage("channelWhitelisted");
                         SB.downloadedSponsorMessageTimes.style.fontWeight = "bold";
 
                         //save this

utils.js

@@ -66,3 +66,42 @@ function localizeHtmlPage() {
     }
 }
 
+function generateUserID(length = 36) {
+    let charset = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+    let result = "";
+    if (window.crypto && window.crypto.getRandomValues) {
+            values = new Uint32Array(length);
+            window.crypto.getRandomValues(values);
+            for (i = 0; i < length; i++) {
+                    result += charset[values[i] % charset.length];
+            }
+            return result;
+    } else {
+            for (let i = 0; i < length; i++) {
+                result += charset[Math.floor(Math.random() * charset.length)];
+            }
+            return result;
+    }
+}
+
+/**
+ * Gets the error message in a nice string
+ * 
+ * @param {int} statusCode 
+ * @returns {string} errorMessage
+ */
+function getErrorMessage(statusCode) {
+    let errorMessage = "";
+                        
+    if([400, 429, 409, 502, 0].includes(statusCode)) {
+        //treat them the same
+        if (statusCode == 503) statusCode = 502;
+
+        errorMessage = chrome.i18n.getMessage(statusCode + "") + " " + chrome.i18n.getMessage("errorCode") + statusCode
+                        + "\n\n" + chrome.i18n.getMessage("statusReminder");
+    } else {
+        errorMessage = chrome.i18n.getMessage("connectionError") + statusCode;
+    }
+
+    return errorMessage;
+}

utils/previewBar.js

@@ -59,6 +59,8 @@ class PreviewBar {
 		duration = Math.floor(duration * 100) / 100;
 		let width;
 		for (let i = 0; i < timestamps.length; i++) {
+			if (types[i] == null) continue;
+
 			width = (timestamps[i][1] - timestamps[i][0]) / duration * 100;
 			width = Math.floor(width * 100) / 100;
 

utils/skipNotice.js

@@ -324,15 +324,7 @@ class SkipNotice {
                 //add this as a hidden sponsorTime
                 hiddenSponsorTimes.push(i);
             
-                let sponsorTimesLeft = sponsorTimes.slice();
-                for (let j = 0; j < hiddenSponsorTimes.length; j++) {
-                    //remove this sponsor time
-                    sponsorTimesLeft.splice(hiddenSponsorTimes[j], 1);
-                }
-            
-                //update the preview
-                previewBar.set(sponsorTimesLeft, [], v.duration);
-            
+                updatePreviewBar();
                 break;
             }
         }