Merge pull request #304 from ajayyy/experimental

Scheduling fixes

.github/workflows/release.yml

@@ -67,12 +67,10 @@ jobs:
         uses: Shopify/upload-to-release@master
         with:
           args: builds/ChromeExtension.zip
-        env:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload to release
         uses: Shopify/upload-to-release@master
         with:
           args: builds/FirefoxExtension.zip
-        env:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 

src/content.ts

@@ -452,6 +452,7 @@ function cancelSponsorSchedule(): void {
  */
 function startSponsorSchedule(currentTime?: number): void {
     cancelSponsorSchedule();
+    if (video.paused) return;
 
     if (Config.config.disableSkipping || channelWhitelisted){
         return;
@@ -587,25 +588,25 @@ function sponsorsLookup(id: string, channelIDPromise?) {
                 UUIDs = smallUUIDs;
             }
 
-            // See if there are any zero second sponsors
+            if (!video.paused && !switchingVideos) {
-            let zeroSecondSponsor = false;
+                // See if there are any starting sponsors
+                let startingSponsor: number = -1;
                 for (const time of sponsorTimes) {
-                if (time[0] <= 0) {
+                    if (time[0] <= video.currentTime && time[0] > startingSponsor) {
-                    zeroSecondSponsor = true;
+                        startingSponsor = time[0];
                         break;
                     }
                 }
-            if (!zeroSecondSponsor) {
+                if (!startingSponsor) {
                     for (const time of sponsorTimesSubmitting) {
-                    if (time[0] <= 0) {
+                        if (time[0] <= video.currentTime && time[0] > startingSponsor) {
-                        zeroSecondSponsor = true;
+                            startingSponsor = time[0];
                             break;
                         }
                     }
                 }
 
-            if (!video.paused && !switchingVideos) {
+                if (startingSponsor !== -1) {
-                if (zeroSecondSponsor) {
                     startSponsorSchedule(0);
                 } else {
                     startSponsorSchedule();