From 158b76c17e33bc78a169477257c6f4830abe5453 Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Thu, 6 Feb 2020 20:10:35 -0500
Subject: [PATCH 1/9] Fixed incorrect type.

---
 src/config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config.ts b/src/config.ts
index a77a3807..d9fbed7a 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -19,7 +19,7 @@ interface SBConfig {
     invidiousInstances: string[],
     invidiousUpdateInfoShowCount: number,
     autoUpvote: boolean,
-    supportInvidious: false
+    supportInvidious: boolean
 }
 
 interface SBObject {

From 5f21d3f96fe84a3c9a4b36689a9bda362ad8c894 Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Sat, 8 Feb 2020 17:45:22 -0500
Subject: [PATCH 2/9] Default UUIDs to an empty list instead of null.

Resolves https://github.com/ajayyy/SponsorBlock/issues/252.
---
 src/content.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/content.ts b/src/content.ts
index 31e11f3d..48ab5afb 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -13,7 +13,7 @@ var sponsorDataFound = false;
 var previousVideoID = null;
 //the actual sponsorTimes if loaded and UUIDs associated with them
 var sponsorTimes = null;
-var UUIDs = null;
+var UUIDs = [];
 //what video id are these sponsors for
 var sponsorVideoID = null;
 
@@ -215,7 +215,7 @@ function resetValues() {
 
     //reset sponsor times
     sponsorTimes = null;
-    UUIDs = null;
+    UUIDs = [];
     sponsorLookupRetries = 0;
 
     //empty the preview bar
@@ -613,7 +613,7 @@ function skipToTime(v, index, sponsorTimes, openNotice) {
     }
 
     lastSponsorTimeSkipped = sponsorTimes[index][0];
-  
+
     let currentUUID =  UUIDs[index];
     lastSponsorTimeSkippedUUID = currentUUID; 
 
@@ -627,17 +627,17 @@ function skipToTime(v, index, sponsorTimes, openNotice) {
                 vote(1, currentUUID, null);
             }
         }
-    }
 
-    //send telemetry that a this sponsor was skipped
-    if (Config.config.trackViewCount && !sponsorSkipped[index]) {
-        utils.sendRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + currentUUID);
+        //send telemetry that a this sponsor was skipped
+        if (Config.config.trackViewCount && !sponsorSkipped[index]) {
+            utils.sendRequestToServer("POST", "/api/viewedVideoSponsorTime?UUID=" + currentUUID);
 
-        if (!Config.config.disableAutoSkip) {
-            // Count this as a skip
-            Config.config.minutesSaved = Config.config.minutesSaved + (sponsorTimes[index][1] - sponsorTimes[index][0]) / 60;
-            Config.config.skipCount = Config.config.skipCount + 1;
-            sponsorSkipped[index] = true;
+            if (!Config.config.disableAutoSkip) {
+                // Count this as a skip
+                Config.config.minutesSaved = Config.config.minutesSaved + (sponsorTimes[index][1] - sponsorTimes[index][0]) / 60;
+                Config.config.skipCount = Config.config.skipCount + 1;
+                sponsorSkipped[index] = true;
+            }
         }
     }
 }

From 08c7754f291650d5b6265eb0f75ed8387cd7ca64 Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Sat, 8 Feb 2020 17:50:06 -0500
Subject: [PATCH 3/9] Fixed skip count resetting.

Resolves https://github.com/ajayyy/SponsorBlock/issues/256
---
 src/content.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/content.ts b/src/content.ts
index 48ab5afb..9bbf4477 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -636,6 +636,7 @@ function skipToTime(v, index, sponsorTimes, openNotice) {
                 // Count this as a skip
                 Config.config.minutesSaved = Config.config.minutesSaved + (sponsorTimes[index][1] - sponsorTimes[index][0]) / 60;
                 Config.config.skipCount = Config.config.skipCount + 1;
+                
                 sponsorSkipped[index] = true;
             }
         }
@@ -921,12 +922,10 @@ function vote(type, UUID, skipNotice) {
             sponsorSkipped[sponsorIndex] = false;
         }
 
-            // Count this as a skip
-            Config.config.minutesSaved = Config.config.minutesSaved + factor * (sponsorTimes[sponsorIndex][1] - sponsorTimes[sponsorIndex][0]) / 60;
-		
-            Config.config.skipCount = 0;
-
-            Config.config.skipCount = Config.config.skipCount + factor * 1;
+        // Count this as a skip
+        Config.config.minutesSaved = Config.config.minutesSaved + factor * (sponsorTimes[sponsorIndex][1] - sponsorTimes[sponsorIndex][0]) / 60;
+    
+        Config.config.skipCount = Config.config.skipCount + factor;
     }
  
     chrome.runtime.sendMessage({

From 0c891e0a0971add54a7d79315224530b2080735f Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Sat, 8 Feb 2020 17:51:16 -0500
Subject: [PATCH 4/9] Changed time saved date to updated time.

---
 public/popup.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/popup.html b/public/popup.html
index 81dcf62c..9132ec32 100644
--- a/public/popup.html
+++ b/public/popup.html
@@ -145,7 +145,7 @@
               <span id="sponsorTimesSkipsDoneDisplay" class="popupElement">
                 0
               </span>
-              <span id="sponsorTimesSkipsDoneEndWord" class="popupElement">__MSG_Segments__</span> (since December).
+              <span id="sponsorTimesSkipsDoneEndWord" class="popupElement">__MSG_Segments__</span> (since February).
             </div>
 
             <div id="sponsorTimeSavedContainer"  class="popupElement" style="display: none">
@@ -153,7 +153,7 @@
               <span id="sponsorTimeSavedDisplay" class="popupElement">
                 0
               </span>
-              <span id="sponsorTimeSavedEndWord" class="popupElement">__MSG_minsLower__</span> (since December).
+              <span id="sponsorTimeSavedEndWord" class="popupElement">__MSG_minsLower__</span>.
 
               </br/>
               </br/>

From 1cd84d8a2ccc669856c01efb96e88e5248c87473 Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Sat, 8 Feb 2020 18:23:08 -0500
Subject: [PATCH 5/9] Fixed Chrome Invidious CSS issues.

Apparently the chrome API doesn't work well with CSS.

Resolves https://github.com/ajayyy/SponsorBlock/issues/241
---
 manifest/manifest.json |  3 ++-
 src/content.ts         | 26 +++++++++++++++++++++++++-
 src/utils.ts           | 29 +++++++++++++++--------------
 3 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/manifest/manifest.json b/manifest/manifest.json
index b0d094be..4f391a48 100644
--- a/manifest/manifest.json
+++ b/manifest/manifest.json
@@ -36,7 +36,8 @@
         "icons/close.png",
         "icons/PlayerInfoIconSponsorBlocker256px.png",
         "icons/PlayerDeleteIconSponsorBlocker256px.png",
-        "popup.html"
+        "popup.html",
+        "content.css"
     ],
     "permissions": [
         "storage",
diff --git a/src/content.ts b/src/content.ts
index 9bbf4477..5851f89b 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -8,6 +8,9 @@ import runThePopup from "./popup";
 import PreviewBar from "./js-components/previewBar";
 import SkipNotice from "./js-components/skipNotice";
 
+// Hack to get the CSS loaded on permission-based sites (Invidious)
+utils.wait(() => Config.config !== null, 5000, 10).then(addCSS);
+
 //was sponsor data found when doing SponsorsLookup
 var sponsorDataFound = false;
 var previousVideoID = null;
@@ -636,7 +639,7 @@ function skipToTime(v, index, sponsorTimes, openNotice) {
                 // Count this as a skip
                 Config.config.minutesSaved = Config.config.minutesSaved + (sponsorTimes[index][1] - sponsorTimes[index][0]) / 60;
                 Config.config.skipCount = Config.config.skipCount + 1;
-                
+
                 sponsorSkipped[index] = true;
             }
         }
@@ -1091,6 +1094,27 @@ function getSponsorTimesMessage(sponsorTimes) {
     return sponsorTimesMessage;
 }
 
+/**
+ * Adds the CSS to the page if needed. Required on optional sites with Chrome.
+ */
+function addCSS() {
+    if (!utils.isFirefox() && Config.config.invidiousInstances.includes(new URL(document.URL).host)) {
+        window.addEventListener("DOMContentLoaded", () => {
+            let head = document.getElementsByTagName("head")[0];
+
+            for (const file of utils.css) {
+                let fileref = document.createElement("link");
+
+                fileref.rel = "stylesheet";
+                fileref.type = "text/css";
+                fileref.href = chrome.extension.getURL(file);
+
+                head.appendChild(fileref);
+            }
+        });
+    }
+}
+
 //converts time in seconds to minutes:seconds
 function getFormattedTime(seconds) {
     let minutes = Math.floor(seconds / 60);
diff --git a/src/utils.ts b/src/utils.ts
index e19e4ca9..7e156469 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -6,6 +6,17 @@ class Utils {
     // Contains functions needed from the background script
     backgroundScriptContainer: any = null;
 
+    // Used to add content scripts and CSS required
+    js = [
+        "./js/vendor.js",
+        "./js/content.js"
+    ];
+    css = [
+        "content.css",
+        "./libs/Source+Sans+Pro.css",
+        "popup.css"
+    ];
+
     constructor(backgroundScriptContainer?: any) {
         this.backgroundScriptContainer = backgroundScriptContainer;
     }
@@ -67,25 +78,15 @@ class Utils {
      * For now, it is just SB.config.invidiousInstances.
      */
     setupExtraSiteContentScripts() {
-        let js = [
-            "./js/vendor.js",
-            "./js/content.js"
-        ];
-        let css = [
-            "content.css",
-            "./libs/Source+Sans+Pro.css",
-            "popup.css"
-        ];
-
         let self = this;
 
         if (this.isFirefox()) {
             let firefoxJS = [];
-            for (const file of js) {
+            for (const file of this.js) {
                 firefoxJS.push({file});
             }
             let firefoxCSS = [];
-            for (const file of css) {
+            for (const file of this.css) {
                 firefoxCSS.push({file});
             }
 
@@ -119,8 +120,8 @@ class Utils {
                     // This API is experimental and not visible by the TypeScript compiler
                     actions: [new (<any> chrome.declarativeContent).RequestContentScript({
                         allFrames: true,
-                        js,
-                        css
+                        js: self.js,
+                        css: self.css
                     })]
                 };
                 

From 3791c5c78b0d9b1674a6e53336d9bff353df2f9f Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Sat, 8 Feb 2020 20:05:31 -0500
Subject: [PATCH 6/9] Fixed JSON conversion iterator

---
 src/config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config.ts b/src/config.ts
index 56e5f0e1..59356dc8 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -225,7 +225,7 @@ function resetConfig() {
 };
 
 function convertJSON() {
-    Object.keys(Config.defaults).forEach(key => {
+    Object.keys(Config.localConfig).forEach(key => {
         Config.localConfig[key] = decodeStoredItem(key, Config.localConfig[key]);
     });
 }

From f8532d39eba5374a277dc60c06daf31c9cf66851 Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Sat, 8 Feb 2020 22:07:51 -0500
Subject: [PATCH 7/9] Improved invidious warning on the help page.

---
 public/help/index_en.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/help/index_en.html b/public/help/index_en.html
index 43d43c2c..e0de8149 100644
--- a/public/help/index_en.html
+++ b/public/help/index_en.html
@@ -30,10 +30,11 @@
 	  Come contribute, make some suggestions and help out in the Discord: <a href="https://discord.gg/QnmVMpU">https://discord.gg/QnmVMpU</a>
     </p>
 
-    <a class="bigText" href="/options/options.html">Enable Invidious Support</a>
+    <a class="bigText" href="/options/options.html">Enable optional features</a>
 
     <p>
-      Invidious is a third-party YouTube viewer. SponsorBlock now supports invidious along with YouTube. Please visit the options page to make sure everything is how you want it to be.
+      Some features, such as support for non third-party YouTube sites, are disabled by default and can be enabled in the options. These can be enabled or disabled at any time.
+      You can also hide/show all UI elements added to the YouTube page.
     </p>
 
     <h1>How skipping works</h1>

From c2eb973a28599566c60840df1488d14b755805c7 Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Sat, 8 Feb 2020 22:13:36 -0500
Subject: [PATCH 8/9] Fixed centering and added some more notes to the help
 page.

---
 public/help/index_en.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/public/help/index_en.html b/public/help/index_en.html
index e0de8149..163e26e5 100644
--- a/public/help/index_en.html
+++ b/public/help/index_en.html
@@ -19,7 +19,7 @@
     <p class="createdBy">Created By <a href="https://ajay.app">Ajay Ramachandran</a> <img src="https://ajay.app/newprofilepic.jpg" height="30" class="profilepiccircle"/></p>
 
     <p>
-        Thanks for installing SponsorBlock. Here are some quick tips for getting started. Please join the Discord if you have any questions or suggestions.
+        Thanks for installing SponsorBlock. Here are some quick tips for getting started. Feel free to contact me if you have any questions. 
     </p>
 
     <p class="projectPreview">
@@ -30,7 +30,9 @@
 	  Come contribute, make some suggestions and help out in the Discord: <a href="https://discord.gg/QnmVMpU">https://discord.gg/QnmVMpU</a>
     </p>
 
-    <a class="bigText" href="/options/options.html">Enable optional features</a>
+    <div class="center">
+      <a class="bigText" href="/options/options.html">Enable optional features</a>
+    </div>
 
     <p>
       Some features, such as support for non third-party YouTube sites, are disabled by default and can be enabled in the options. These can be enabled or disabled at any time.
@@ -84,6 +86,7 @@
 
     <p>
       There are hotkeys if you want to use them. You must be focused on the YouTube player to use them. Press the semicolon key to indicate the start/end of a sponsor segment and click the appostrophe to submit.
+      These can be changed in the options. If you don't use QWERTY, you should probably change the keybinds.
     </p>
 
     <h1>I hate these buttons, they are so ugly</h1>

From 51d2886f701b30c2255241af0037f4e939ecb849 Mon Sep 17 00:00:00 2001
From: Ajay Ramachandran <dev@ajay.app>
Date: Sat, 8 Feb 2020 22:18:03 -0500
Subject: [PATCH 9/9] Seperated show upload button option from info button.

---
 public/_locales/en/messages.json |  6 ++++++
 public/options/options.html      | 17 +++++++++++++++++
 src/config.ts                    |  2 ++
 src/content.ts                   |  2 +-
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json
index 0900962e..7daaea3b 100644
--- a/public/_locales/en/messages.json
+++ b/public/_locales/en/messages.json
@@ -395,5 +395,11 @@
      },
     "shortCheck": {
         "message": "The following submission is shorter than your minimum duration option. This could mean that this is already submitted, and just being ignored due to this option. Are you sure you would like to submit?"
+    },
+    "showUploadButton": {
+        "message": "Show Upload Button"
+    },
+    "whatUploadButton": {
+        "message": "This button appears on the YouTube player after you have selected a timestamp and are ready to submit."
     }
 }
diff --git a/public/options/options.html b/public/options/options.html
index 37aac281..e537ae29 100644
--- a/public/options/options.html
+++ b/public/options/options.html
@@ -201,6 +201,23 @@
 			<br/>
 			<br/>
 	
+			<div option-type="toggle" toggle-type="reverse" sync-option="hideUploadButtonPlayerControls">
+				<label class="switch-container" label-name="__MSG_showUploadButton__">
+					<label class="switch">
+						<input type="checkbox" checked>
+						<span class="slider round"></span>
+					</label>
+				</label>
+	
+				<br/>
+				<br/>
+	
+				<div class="small-description">__MSG_whatUploadButton__</div>
+			</div>
+
+			<br/>
+			<br/>
+	
 			<div option-type="toggle" sync-option="autoUpvote">
 				<label class="switch-container" label-name="__MSG_enableAutoUpvote__">
 					<label class="switch">
diff --git a/src/config.ts b/src/config.ts
index 59356dc8..1e56d5d6 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -14,6 +14,7 @@ interface SBConfig {
     hideVideoPlayerControls: boolean,
     hideInfoButtonPlayerControls: boolean,
     hideDeleteButtonPlayerControls: boolean,
+    hideUploadButtonPlayerControls: boolean,
     hideDiscordLaunches: number,
     hideDiscordLink: boolean,
     invidiousInstances: string[],
@@ -107,6 +108,7 @@ var Config: SBObject = {
         hideVideoPlayerControls: false,
         hideInfoButtonPlayerControls: false,
         hideDeleteButtonPlayerControls: false,
+        hideUploadButtonPlayerControls: false,
         hideDiscordLaunches: 0,
         hideDiscordLink: false,
         invidiousInstances: ["invidio.us", "invidiou.sh", "invidious.snopyta.org"],
diff --git a/src/content.ts b/src/content.ts
index 87fea5cd..4ca4f1e5 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -807,7 +807,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 && !Config.config.hideInfoButtonPlayerControls) {
+        if (document.getElementById("startSponsorImage").style.display != "none" && uploadButtonVisible && !Config.config.hideUploadButtonPlayerControls) {
             document.getElementById("submitButton").style.display = "unset";
         } else if (!uploadButtonVisible) {
             //disable submit button