Renamed SB.js and setup types for the config.

1 files changed, 35 insertions, 35 deletions

diff --git a/src/content.ts b/src/content.ts
index ca8dcb29..31e11f3d 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -1,4 +1,4 @@
-import SB from "./SB";
+import Config from "./config";
 
 import Utils from "./utils";
 var utils = new Utils();
@@ -50,7 +50,7 @@ var previewBar = null;
 var controls = null;
 
 // Direct Links after the config is loaded
-utils.wait(() => SB.config !== null).then(() => videoIDChange(getYouTubeVideoID(document.URL)));
+utils.wait(() => Config.config !== null).then(() => videoIDChange(getYouTubeVideoID(document.URL)));
 
 //the last time looked at (used to see if this time is in the interval)
 var lastTime = -1;
@@ -183,8 +183,8 @@ function contentConfigUpdateListener(changes) {
     }
 }
 
-if (!SB.configListeners.includes(contentConfigUpdateListener)) {
-    SB.configListeners.push(contentConfigUpdateListener);
+if (!Config.configListeners.includes(contentConfigUpdateListener)) {
+    Config.configListeners.push(contentConfigUpdateListener);
 }
 
 //check for hotkey pressed
@@ -193,9 +193,9 @@ document.onkeydown = function(e: KeyboardEvent){
 
     let video = document.getElementById("movie_player");
 
-    let startSponsorKey = SB.config.startSponsorKeybind;
+    let startSponsorKey = Config.config.startSponsorKeybind;
 
-    let submitKey = SB.config.submitKeybind;
+    let submitKey = Config.config.submitKeybind;
 
     //is the video in focus, otherwise they could be typing a comment
     if (document.activeElement === video) {
@@ -270,7 +270,7 @@ function videoIDChange(id) {
     //warn them if they had unsubmitted times
     if (previousVideoID != null) {
         //get the sponsor times from storage
-        let sponsorTimes = SB.config.sponsorTimes.get(previousVideoID);
+        let sponsorTimes = Config.config.sponsorTimes.get(previousVideoID);
         if (sponsorTimes != undefined && sponsorTimes.length > 0) {
             //warn them that they have unsubmitted sponsor times
                 chrome.runtime.sendMessage({
@@ -408,7 +408,7 @@ function sponsorsLookup(id: string, channelIDPromise?) {
     });
 
     //add the event to run on the videos "ontimeupdate"
-    if (!SB.config.disableSkipping) {
+    if (!Config.config.disableSkipping) {
         v.ontimeupdate = function () { 
             sponsorCheck();
         };
@@ -429,12 +429,12 @@ function getYouTubeVideoID(url: string) {
     }
 
     // Check if valid hostname
-    if (SB.config && SB.config.invidiousInstances.includes(urlObject.host)) {
+    if (Config.config && Config.config.invidiousInstances.includes(urlObject.host)) {
         onInvidious = true;
     } else if (!["www.youtube.com", "www.youtube-nocookie.com"].includes(urlObject.host)) {
-        if (!SB.config) {
+        if (!Config.config) {
             // Call this later, in case this is an Invidious tab
-            utils.wait(() => SB.config !== null).then(() => videoIDChange(getYouTubeVideoID(url)));
+            utils.wait(() => Config.config !== null).then(() => videoIDChange(getYouTubeVideoID(url)));
         }
 
         return false
@@ -533,7 +533,7 @@ function updatePreviewBar() {
 //checks if this channel is whitelisted, should be done only after the channelID has been loaded
 function whitelistCheck() {
     //see if this is a whitelisted channel
-    let whitelistedChannels = SB.config.whitelistedChannels;
+    let whitelistedChannels = Config.config.whitelistedChannels;
 
     if (whitelistedChannels != undefined && whitelistedChannels.includes(channelURL)) {
         channelWhitelisted = true;
@@ -542,7 +542,7 @@ function whitelistCheck() {
 
 //video skipping
 function sponsorCheck() {
-    if (SB.config.disableSkipping) {
+    if (Config.config.disableSkipping) {
         // Make sure this isn't called again
         v.ontimeupdate = null;
         return;
@@ -608,7 +608,7 @@ 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) {
-    if (!SB.config.disableAutoSkip) {
+    if (!Config.config.disableAutoSkip) {
         v.currentTime = sponsorTimes[index][1];
     }
 
@@ -619,24 +619,24 @@ function skipToTime(v, index, sponsorTimes, openNotice) {
 
     if (openNotice) {
         //send out the message saying that a sponsor message was skipped
-        if (!SB.config.dontShowNotice) {
-            let skipNotice = new SkipNotice(this, currentUUID, SB.config.disableAutoSkip, skipNoticeContentContainer);
+        if (!Config.config.dontShowNotice) {
+            let skipNotice = new SkipNotice(this, currentUUID, Config.config.disableAutoSkip, skipNoticeContentContainer);
 
             //auto-upvote this sponsor
-            if (SB.config.trackViewCount && !SB.config.disableAutoSkip && SB.config.autoUpvote) {
+            if (Config.config.trackViewCount && !Config.config.disableAutoSkip && Config.config.autoUpvote) {
                 vote(1, currentUUID, null);
             }
         }
     }
 
     //send telemetry that a this sponsor was skipped
-    if (SB.config.trackViewCount && !sponsorSkipped[index]) {
+    if (Config.config.trackViewCount && !sponsorSkipped[index]) {
         utils.sendRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + currentUUID);
 
-        if (!SB.config.disableAutoSkip) {
+        if (!Config.config.disableAutoSkip) {
             // Count this as a skip
-            SB.config.minutesSaved = SB.config.minutesSaved + (sponsorTimes[index][1] - sponsorTimes[index][0]) / 60;
-            SB.config.skipCount = SB.config.skipCount + 1;
+            Config.config.minutesSaved = Config.config.minutesSaved + (sponsorTimes[index][1] - sponsorTimes[index][0]) / 60;
+            Config.config.skipCount = Config.config.skipCount + 1;
             sponsorSkipped[index] = true;
         }
     }
@@ -713,7 +713,7 @@ async function updateVisibilityOfPlayerControlsButton() {
 
     await createButtons();
 	
-    if (SB.config.hideVideoPlayerControls || onInvidious) {
+    if (Config.config.hideVideoPlayerControls || onInvidious) {
         document.getElementById("startSponsorButton").style.display = "none";
         document.getElementById("submitButton").style.display = "none";
     } else {
@@ -721,13 +721,13 @@ async function updateVisibilityOfPlayerControlsButton() {
     }
 
     //don't show the info button on embeds
-    if (SB.config.hideInfoButtonPlayerControls || document.URL.includes("/embed/") || onInvidious) {
+    if (Config.config.hideInfoButtonPlayerControls || document.URL.includes("/embed/") || onInvidious) {
         document.getElementById("infoButton").style.display = "none";
     } else {
         document.getElementById("infoButton").style.removeProperty("display");
     }
     
-    if (SB.config.hideDeleteButtonPlayerControls || onInvidious) {
+    if (Config.config.hideDeleteButtonPlayerControls || onInvidious) {
         document.getElementById("deleteButton").style.display = "none";
     }
 }
@@ -779,7 +779,7 @@ async function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) {
     await utils.wait(isSubmitButtonLoaded);
     
     //if it isn't visible, there is no data
-    let shouldHide = (uploadButtonVisible && !(SB.config.hideDeleteButtonPlayerControls || onInvidious)) ? "unset" : "none"
+    let shouldHide = (uploadButtonVisible && !(Config.config.hideDeleteButtonPlayerControls || onInvidious)) ? "unset" : "none"
     document.getElementById("deleteButton").style.display = shouldHide;
 
     if (showStartSponsor) {
@@ -787,7 +787,7 @@ async function changeStartSponsorButton(showStartSponsor, uploadButtonVisible) {
         (<HTMLImageElement> document.getElementById("startSponsorImage")).src = chrome.extension.getURL("icons/PlayerStartIconSponsorBlocker256px.png");
         document.getElementById("startSponsorButton").setAttribute("title", chrome.i18n.getMessage("sponsorStart"));
 
-        if (document.getElementById("startSponsorImage").style.display != "none" && uploadButtonVisible && !SB.config.hideInfoButtonPlayerControls) {
+        if (document.getElementById("startSponsorImage").style.display != "none" && uploadButtonVisible && !Config.config.hideInfoButtonPlayerControls) {
             document.getElementById("submitButton").style.display = "unset";
         } else if (!uploadButtonVisible) {
             //disable submit button
@@ -882,7 +882,7 @@ function clearSponsorTimes() {
 
     let currentVideoID = sponsorVideoID;
 
-    let sponsorTimes = SB.config.sponsorTimes.get(currentVideoID);
+    let sponsorTimes = Config.config.sponsorTimes.get(currentVideoID);
 
     if (sponsorTimes != undefined && sponsorTimes.length > 0) {
         let confirmMessage = chrome.i18n.getMessage("clearThis") + getSponsorTimesMessage(sponsorTimes)
@@ -890,7 +890,7 @@ function clearSponsorTimes() {
         if(!confirm(confirmMessage)) return;
 
         //clear the sponsor times
-        SB.config.sponsorTimes.delete(currentVideoID);
+        Config.config.sponsorTimes.delete(currentVideoID);
 
         //clear sponsor times submitting
         sponsorTimesSubmitting = [];
@@ -922,11 +922,11 @@ function vote(type, UUID, skipNotice) {
         }
 
             // Count this as a skip
-            SB.config.minutesSaved = SB.config.minutesSaved + factor * (sponsorTimes[sponsorIndex][1] - sponsorTimes[sponsorIndex][0]) / 60;
+            Config.config.minutesSaved = Config.config.minutesSaved + factor * (sponsorTimes[sponsorIndex][1] - sponsorTimes[sponsorIndex][0]) / 60;
 		
-            SB.config.skipCount = 0;
+            Config.config.skipCount = 0;
 
-            SB.config.skipCount = SB.config.skipCount + factor * 1;
+            Config.config.skipCount = Config.config.skipCount + factor * 1;
     }
  
     chrome.runtime.sendMessage({
@@ -964,7 +964,7 @@ function closeAllSkipNotices(){
 }
 
 function dontShowNoticeAgain() {
-    SB.config.dontShowNotice = true;
+    Config.config.dontShowNotice = true;
     closeAllSkipNotices();
 }
 
@@ -991,7 +991,7 @@ function submitSponsorTimes() {
 
     let currentVideoID = sponsorVideoID;
 
-    let sponsorTimes =  SB.config.sponsorTimes.get(currentVideoID);
+    let sponsorTimes =  Config.config.sponsorTimes.get(currentVideoID);
 
     if (sponsorTimes != undefined && sponsorTimes.length > 0) {
         //check if a sponsor exceeds the duration of the video
@@ -1001,7 +1001,7 @@ function submitSponsorTimes() {
             }
         }
         //update sponsorTimes
-        SB.config.sponsorTimes.set(currentVideoID, sponsorTimes);
+        Config.config.sponsorTimes.set(currentVideoID, sponsorTimes);
 
         //update sponsorTimesSubmitting
         sponsorTimesSubmitting = sponsorTimes;
@@ -1046,7 +1046,7 @@ function sendSubmitMessage(){
                 submitButton.addEventListener("animationend", animationEndListener);
 
                 //clear the sponsor times
-                SB.config.sponsorTimes.delete(currentVideoID);
+                Config.config.sponsorTimes.delete(currentVideoID);
 
                 //add submissions to current sponsors list
                 sponsorTimes = sponsorTimes.concat(sponsorTimesSubmitting);