Increase version number

manifest/manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "2.1.2",
+    "version": "2.1.2.1",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "content_scripts": [{
@@ -41,7 +41,6 @@
         "icons/report.png",
         "icons/close.png",
         "icons/refresh.svg",
-        "icons/lock.svg",
         "icons/beep.ogg",
         "icons/PlayerInfoIconSponsorBlocker.svg",
         "icons/PlayerDeleteIconSponsorBlocker.svg",

public/_locales/en/messages.json

@@ -673,7 +673,7 @@
         "message": "Help prevent this from disappearing"
     },
     "experimentUnlistedText": {
-        "message": "This video is detected as unlisted and uploaded before 2017\nOld unlisted videos are being set to private next month\nWe are collecting *public* videos to back up\nWould you like anonymously to send this video to us?\nhttps://support.google.com/youtube/answer/9230970"
+        "message": "This video is detected as unlisted and uploaded before 2017\nOld unlisted videos are being set to private next month\nWe are collecting *public* videos to back up\nWould you like to anonymously send this video to us?\nhttps://support.google.com/youtube/answer/9230970"
     },
     "experiementOptOut": {
         "message": "Opt-out of all future experiments",

public/icons/lock.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#FFFFFF"><g fill="none"><path d="M0 0h24v24H0V0z"/><path d="M0 0h24v24H0V0z" opacity=".87"/></g><path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zM9 6c0-1.66 1.34-3 3-3s3 1.34 3 3v2H9V6zm9 14H6V10h12v10zm-6-3c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2z"/></svg>

public/popup.html

@@ -21,9 +21,6 @@
         <button class="sbSlimButton" id="refreshSegmentsButton" title="__MSG_refreshSegments__">
           <img id="refreshSegments" src="/icons/refresh.svg"/>
         </button>
-        <button class="sbSlimButton hidden" id="lockSegmentsButton">
-          <img id="LockSegments" src="/icons/lock.svg"/>
-        </button>
       </div>
       <div id="issueReporterContainer">
         <div id="issueReporterTimeButtons"></div>

src/content.ts

@@ -1412,13 +1412,11 @@ function openInfoMenu() {
             const edit = <HTMLImageElement> popup.querySelector("#sbPopupIconEdit");
             const check = <HTMLImageElement> popup.querySelector("#sbPopupIconCheck");
             const refreshSegments = <HTMLImageElement> popup.querySelector("#refreshSegments");
-            const lockSegments = <HTMLImageElement> popup.querySelector("#lockSegments");
             logo.src = chrome.extension.getURL("icons/IconSponsorBlocker256px.png");
             settings.src = chrome.extension.getURL("icons/settings.svg");
             edit.src = chrome.extension.getURL("icons/pencil.svg");
             check.src = chrome.extension.getURL("icons/check.svg");
             refreshSegments.src = chrome.extension.getURL("icons/refresh.svg");
-            lockSegments.src = chrome.extension.getURL("icons/lock.svg");
 
             parentNode.insertBefore(popup, parentNode.firstChild);
 

src/popup.ts

@@ -103,7 +103,6 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
         "sponsorMessageTimes",
         //"downloadedSponsorMessageTimes",
         "refreshSegmentsButton",
-        "lockSegmentsButton",
         "whitelistButton",
         "sbDonate"
     ].forEach(id => PageElements[id] = document.getElementById(id));
@@ -134,7 +133,6 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
     PageElements.optionsButton.addEventListener("click", openOptions);
     PageElements.helpButton.addEventListener("click", openHelp);
     PageElements.refreshSegmentsButton.addEventListener("click", refreshSegments);
-    PageElements.lockSegmentsButton.addEventListener("click", lockSegments);
 
     /** If true, the content script is in the process of creating a new segment. */
     let creatingSegment = false;
@@ -146,68 +144,93 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
     let currentVideoID = null;
 
     //show proper disable skipping button
-    if (Config.config.disableSkipping) {
+    const disableSkipping = Config.config.disableSkipping;
+    if (disableSkipping != undefined && disableSkipping) {
         PageElements.disableSkipping.style.display = "none";
         PageElements.enableSkipping.style.display = "unset";
         PageElements.toggleSwitch.checked = false;
     }
 
-    if (Config.config.dontShowNotice) {
+    //if the don't show notice again variable is true, an option to
+    //  disable should be available
+    const dontShowNotice = Config.config.dontShowNotice;
+    if (dontShowNotice != undefined && dontShowNotice) {
         PageElements.showNoticeAgain.style.display = "unset";
     }
 
-    const userInfoRes = await utils.asyncRequestToServer("GET", "/api/userInfo?userID=" + Config.config.userID);
-    if (userInfoRes.ok) {
-        const userInfo = JSON.parse(userInfoRes.responseText);
+    utils.sendRequestToServer("GET", "/api/getUsername?userID=" + Config.config.userID, (res) => {
+        if (res.status === 200) {
+            PageElements.usernameValue.innerText = JSON.parse(res.responseText).userName
+        }
+    })
 
-        if (userInfo.vip) PageElements.lockSegmentsButton.classList.remove("hidden");
-
-        PageElements.usernameValue.innerText = userInfo.userName;
-
-        PageElements.sponsorTimesContributionsDisplay.innerText = userInfo.segmentCount.toLocaleString();
+    //get the amount of times this user has contributed and display it to thank them
+    if (Config.config.sponsorTimesContributed != undefined) {
+        PageElements.sponsorTimesContributionsDisplay.innerText = Config.config.sponsorTimesContributed.toLocaleString();
         PageElements.sponsorTimesContributionsContainer.classList.remove("hidden");
 
-        const viewCount = userInfo.viewCount;
-        if (viewCount != 0) {
-            if (viewCount > 1) {
-                PageElements.sponsorTimesViewsDisplayEndWord.innerText = chrome.i18n.getMessage("Segments");
-            } else {
-                PageElements.sponsorTimesViewsDisplayEndWord.innerText = chrome.i18n.getMessage("Segment");
-            }
+        //get the userID
+        const userID = Config.config.userID;
+        if (userID != undefined) {
+            //there are probably some views on these submissions then
+            //get the amount of views from the sponsors submitted
+            utils.sendRequestToServer("GET", "/api/getViewsForUser?userID=" + userID, function(response) {
+                if (response.status == 200) {
+                    const viewCount = JSON.parse(response.responseText).viewCount;
+                    if (viewCount != 0) {
+                        if (viewCount > 1) {
+                            PageElements.sponsorTimesViewsDisplayEndWord.innerText = chrome.i18n.getMessage("Segments");
+                        } else {
+                            PageElements.sponsorTimesViewsDisplayEndWord.innerText = chrome.i18n.getMessage("Segment");
+                        }
 
-            PageElements.sponsorTimesViewsDisplay.innerText = viewCount.toLocaleString();
-            PageElements.sponsorTimesViewsContainer.style.display = "unset";
-        }
+                        PageElements.sponsorTimesViewsDisplay.innerText = viewCount.toLocaleString();
+                        PageElements.sponsorTimesViewsContainer.style.display = "unset";
+                    }
+                }
+            });
 
-        const minutesSaved = userInfo.minutesSaved;
-        if (minutesSaved != 0) {
-            if (minutesSaved != 1) {
-                PageElements.sponsorTimesOthersTimeSavedEndWord.innerText = chrome.i18n.getMessage("minsLower");
-            } else {
-                PageElements.sponsorTimesOthersTimeSavedEndWord.innerText = chrome.i18n.getMessage("minLower");
-            }
+            //get this time in minutes
+            utils.sendRequestToServer("GET", "/api/getSavedTimeForUser?userID=" + userID, function(response) {
+                if (response.status == 200) {
+                    const minutesSaved = JSON.parse(response.responseText).timeSaved;
+                    if (minutesSaved != 0) {
+                        if (minutesSaved != 1) {
+                            PageElements.sponsorTimesOthersTimeSavedEndWord.innerText = chrome.i18n.getMessage("minsLower");
+                        } else {
+                            PageElements.sponsorTimesOthersTimeSavedEndWord.innerText = chrome.i18n.getMessage("minLower");
+                        }
 
-            PageElements.sponsorTimesOthersTimeSavedDisplay.innerText = getFormattedHours(minutesSaved);
+                        PageElements.sponsorTimesOthersTimeSavedDisplay.innerText = getFormattedHours(minutesSaved);
+                    }
+                }
+            });
         }
     }
 
-    if (Config.config.skipCount != 1) {
-        PageElements.sponsorTimesSkipsDoneEndWord.innerText = chrome.i18n.getMessage("Segments");
-    } else {
-        PageElements.sponsorTimesSkipsDoneEndWord.innerText = chrome.i18n.getMessage("Segment");
+    //get the amount of times this user has skipped a sponsor
+    if (Config.config.skipCount != undefined) {
+        if (Config.config.skipCount != 1) {
+            PageElements.sponsorTimesSkipsDoneEndWord.innerText = chrome.i18n.getMessage("Segments");
+        } else {
+            PageElements.sponsorTimesSkipsDoneEndWord.innerText = chrome.i18n.getMessage("Segment");
+        }
+
+        PageElements.sponsorTimesSkipsDoneDisplay.innerText = Config.config.skipCount.toLocaleString();
+        PageElements.sponsorTimesSkipsDoneContainer.style.display = "unset";
     }
 
-    PageElements.sponsorTimesSkipsDoneDisplay.innerText = Config.config.skipCount.toLocaleString();
-    PageElements.sponsorTimesSkipsDoneContainer.style.display = "unset";
+    //get the amount of time this user has saved.
+    if (Config.config.minutesSaved != undefined) {
+        if (Config.config.minutesSaved != 1) {
+            PageElements.sponsorTimeSavedEndWord.innerText = chrome.i18n.getMessage("minsLower");
+        } else {
+            PageElements.sponsorTimeSavedEndWord.innerText = chrome.i18n.getMessage("minLower");
+        }
 
-    if (Config.config.minutesSaved != 1) {
-        PageElements.sponsorTimeSavedEndWord.innerText = chrome.i18n.getMessage("minsLower");
-    } else {
-        PageElements.sponsorTimeSavedEndWord.innerText = chrome.i18n.getMessage("minLower");
+        PageElements.sponsorTimeSavedDisplay.innerText = getFormattedHours(Config.config.minutesSaved);
     }
 
-    PageElements.sponsorTimeSavedDisplay.innerText = getFormattedHours(Config.config.minutesSaved);
-
     // Must be delayed so it only happens once loaded
     setTimeout(() => PageElements.sponsorblockPopup.classList.remove("preload"), 250);
 
@@ -667,10 +690,6 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
         );
     }
 
-    function lockSegments() {
-        alert("lock");
-    }
-
     /**
      * Should skipping be disabled (visuals stay)
      */