Merge pull request #293 from ajayyy/experimental

Fixed double sponsor skip for zero second sponsors

.github/workflows/release.yml

@@ -10,6 +10,7 @@ jobs:
 
     steps:
       # Build Artifacts
+      - uses: actions/checkout@v1
       - name: Build Artifacts
         uses: ./.github/workflows/ci.yml
 

manifest/manifest.json

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

src/content.ts

@@ -44,8 +44,8 @@ var lastPreviewBarUpdate;
 //whether the duration listener listening for the duration changes of the video has been setup yet
 var durationListenerSetUp = false;
 
-// Has a zero second sponsor been skipped yet
-var skippedZeroSecond = false;
+// Is the video currently being switched
+var switchingVideos = false;
 
 //the channel this video is about
 var channelURL;
@@ -250,8 +250,6 @@ function resetValues() {
 
     //reset sponsor data found check
     sponsorDataFound = false;
-
-    skippedZeroSecond = false;
 }
 
 async function videoIDChange(id) {
@@ -266,6 +264,8 @@ async function videoIDChange(id) {
 	//id is not valid
     if (!id) return;
 
+    switchingVideos = true;
+
     // Wait for options to be ready
     await utils.wait(() => Config.config !== null, 5000, 1);
 
@@ -460,8 +460,6 @@ function startSponsorSchedule(currentTime?: number): void {
 
     let skippingFunction = () => {
         if (video.currentTime >= skipTime[0] && video.currentTime < skipTime[1]) {
-            if (currentTime == 0) skippedZeroSecond = true;
-
             skipToTime(video, skipInfo.index, skipInfo.array, skipInfo.openNotice);
         }
 
@@ -493,8 +491,13 @@ function sponsorsLookup(id: string, channelIDPromise?) {
     if (!seekListenerSetUp && !Config.config.disableSkipping) {
         seekListenerSetUp = true;
 
-        video.addEventListener('seeked', () => startSponsorSchedule());
-        video.addEventListener('play', () => startSponsorSchedule());
+        video.addEventListener('play', () => {
+            switchingVideos = false;
+            startSponsorSchedule();
+        });
+        video.addEventListener('seeked', () => {
+            if (!video.paused) startSponsorSchedule();
+        });
         video.addEventListener('ratechange', () => startSponsorSchedule());
         video.addEventListener('seeking', cancelSponsorSchedule);
         video.addEventListener('pause', cancelSponsorSchedule);
@@ -569,10 +572,12 @@ function sponsorsLookup(id: string, channelIDPromise?) {
                 }
             }
 
-            if (zeroSecondSponsor && !skippedZeroSecond) {
-                startSponsorSchedule(0);
-            } else {
-                startSponsorSchedule();
+            if (!video.paused && !switchingVideos) {
+                if (zeroSecondSponsor) {
+                    startSponsorSchedule(0);
+                } else {
+                    startSponsorSchedule();
+                }
             }
 
             // Reset skip save