Merge pull request #290 from ajayyy/experimental

Potentially fixed zero second skip spam

.github/workflows/ci.yml

@@ -23,6 +23,10 @@ jobs:
         with:
           name: ChromeExtension
           path: dist
+      - run: mkdir ./builds
+      - uses: montudor/action-zip@v0.1.0
+        with:
+          args: zip -qq -r ./builds/ChromeExtension.zip ./dist
 
       # Create Firefox artifacts
       - name: Create Firefox artifacts
@@ -31,4 +35,28 @@ jobs:
         with:
           name: FirefoxExtension
           path: dist
+      - uses: montudor/action-zip@v0.1.0
+        with:
+          args: zip -qq -r ./builds/FirefoxExtension.zip ./dist
+
+      # Create Beta artifacts (Builds with the name changed to beta)
+      - name: Create Chrome Beta artifacts
+        run: npm run build:chrome -- --env.stream=beta
+      - uses: actions/upload-artifact@v1
+        with:
+          name: ChromeExtensionBeta
+          path: dist
+      - uses: montudor/action-zip@v0.1.0
+        with:
+          args: zip -qq -r ./builds/ChromeExtensionBeta.zip ./dist
+
+      - name: Create Firefox Beta artifacts
+        run: npm run build:firefox -- --env.stream=beta
+      - uses: actions/upload-artifact@v1
+        with:
+          name: FirefoxExtensionBeta
+          path: dist
+      - uses: montudor/action-zip@v0.1.0
+        with:
+          args: zip -qq -r ./builds/FirefoxExtensionBeta.zip ./dist
 

.github/workflows/release.yml

@@ -0,0 +1,29 @@
+name: Upload Release Build
+
+on: release
+
+jobs:
+
+  build:
+    name: Upload Release
+    runs-on: ubuntu-latest
+
+    steps:
+      # Build Artifacts
+      - name: Build Artifacts
+        uses: ./.github/workflows/ci.yml
+
+      # Upload each release asset
+      - name: Upload to release
+        uses: JasonEtco/upload-to-release@master
+        with:
+          args: ./builds/ChromeExtension.zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload to release
+        uses: JasonEtco/upload-to-release@master
+        with:
+          args: ./builds/FirefoxExtension.zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

README.md

@@ -68,9 +68,9 @@ The result is in `dist`.
 
 # Credit
 
-The awesome [Invidious API](https://github.com/omarroth/invidious/wiki/API) used to be used.
+The awesome [Invidious API](https://github.com/omarroth/invidious/wiki/API) previously was used.
 
-Original code from [YTSponsorSkip](https://github.com/OfficialNoob/YTSponsorSkip), but not much of the code is left.
+Originally forked from [YTSponsorSkip](https://github.com/OfficialNoob/YTSponsorSkip), but zero code remains.
 
 Some icons made by <a href="https://www.flaticon.com/authors/gregor-cresnar" title="Gregor Cresnar">Gregor Cresnar</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a> and are licensed by <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a>
 

manifest/beta-manifest-extra.json

@@ -0,0 +1,4 @@
+{
+    "name": "BETA - SponsorBlock"
+}
+  

manifest/firefox-beta-manifest-extra.json

@@ -0,0 +1,8 @@
+{
+    "browser_specific_settings": {
+        "gecko": {
+            "id": "sponsorBlockerBETA@ajay.app"
+        }
+    }
+}
+  

manifest/manifest.json

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

package.json

@@ -24,16 +24,19 @@
   },
   "scripts": {
     "web-run": "npm run web-run:chrome",
-    "web-run:firefox": "cd dist && web-ext run --start-url https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm",
+    "web-run:firefox": "cd dist && web-ext run --start-url https://addons.mozilla.org/firefox/addon/ublock-origin/",
     "web-run:chrome": "cd dist && web-ext run --start-url https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm -t chromium",
     "build": "npm run build:chrome",
     "build:chrome": "webpack --env.browser=chrome --config webpack/webpack.prod.js",
     "build:firefox": "webpack --env.browser=firefox --config webpack/webpack.prod.js",
+    "build:dev": "npm run build:dev:chrome",
+    "build:dev:chrome": "webpack --env.browser=chrome --config webpack/webpack.dev.js",
+    "build:dev:firefox": "webpack --env.browser=firefox --config webpack/webpack.dev.js",
     "build:watch": "npm run build:watch:chrome",
     "build:watch:chrome": "webpack --env.browser=chrome --config webpack/webpack.dev.js --watch",
     "build:watch:firefox": "webpack --env.browser=firefox --config webpack/webpack.dev.js --watch",
-    "dev": "npm run build && concurrently \"npm run web-run\" \"npm run build:watch\"",
+    "dev": "npm run build:dev && concurrently \"npm run web-run\" \"npm run build:watch\"",
-    "dev:firefox": "npm run build:firefox && concurrently \"npm run web-run:firefox\" \"npm run build:watch:firefox\"",
+    "dev:firefox": "npm run build:dev:firefox && concurrently \"npm run web-run:firefox\" \"npm run build:watch:firefox\"",
     "clean": "rimraf dist",
     "test": "npx jest"
   },

public/_locales/en/messages.json

@@ -381,17 +381,11 @@
     "whatAutoUpvote": {
         "message": "With this enabled, the extension will upvote all submissions you view if you do not report them. If the notice is disabled, this will not occur."
     },
-    "invidiousInfo1": {
-        "message": "Invidious (the 3rd party YouTube site) support has been added!"
-    },
-    "invidiousInfo2": {
-        "message": "You MUST enable it in the options for it to work."
-    },
     "minDuration": {
         "message": "Minimum duration (seconds):"
     },
     "minDurationDescription": {
-        "message": "Sponsor segments shorter than the set value will not be skipeed or show in the player."
+        "message": "Sponsor segments shorter than the set value will not be skipped or show in the player."
      },
     "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?"
@@ -428,5 +422,8 @@
     },
     "whatUnlistedCheck": {
         "message": "This setting will significantly slow down SponsorBlock. Sponsor lookups require sending the video ID to the server. If you are concerned about unlisted video IDs being sent over the internet, enable this option."
+    },
+    "mobileUpdateInfo": {
+        "message": "m.youtube.com is now supported"
     }
 }

src/background.ts

@@ -86,9 +86,9 @@ chrome.runtime.onInstalled.addListener(function (object) {
             //save this UUID
             Config.config.userID = newUserID;
             
-            //TODO: Remove when invidious support is old
+            //TODO: Remove when mobile support is old
             // Don't show this to new users
-            Config.config.invidiousUpdateInfoShowCount = 6;
+            // Config.config.mobileUpdateShowCount = 1;
         }
     }, 1500);
 });

src/config.ts

@@ -20,12 +20,12 @@ interface SBConfig {
     hideDiscordLaunches: number,
     hideDiscordLink: boolean,
     invidiousInstances: string[],
-    invidiousUpdateInfoShowCount: number,
     autoUpvote: boolean,
     supportInvidious: boolean,
     serverAddress: string,
     minDuration: number,
-    checkForUnlistedVideos: boolean
+    checkForUnlistedVideos: boolean,
+    mobileUpdateShowCount: number
 }
 
 interface SBObject {
@@ -116,12 +116,12 @@ var Config: SBObject = {
         hideDiscordLaunches: 0,
         hideDiscordLink: false,
         invidiousInstances: ["invidio.us", "invidiou.sh", "invidious.snopyta.org"],
-        invidiousUpdateInfoShowCount: 0,
         autoUpvote: true,
         supportInvidious: false,
         serverAddress: CompileConfig.serverAddress,
         minDuration: 0,
-        checkForUnlistedVideos: false
+        checkForUnlistedVideos: false,
+        mobileUpdateShowCount: 0
     },
     localConfig: null,
     config: null

src/content.ts

@@ -43,8 +43,9 @@ var lastPreviewBarUpdate;
 
 //whether the duration listener listening for the duration changes of the video has been setup yet
 var durationListenerSetUp = false;
-// Timestamp of the last duration change
+
-var lastDurationChange = 0;
+// Has a zero second sponsor been skipped yet
+var skippedZeroSecond = false;
 
 //the channel this video is about
 var channelURL;
@@ -66,10 +67,7 @@ var previewResetter: NodeJS.Timeout = null;
 var controls = null;
 
 // Direct Links after the config is loaded
-utils.wait(() => Config.config !== null).then(() => videoIDChange(getYouTubeVideoID(document.URL)));
+utils.wait(() => Config.config !== null, 1000, 1).then(() => videoIDChange(getYouTubeVideoID(document.URL)));
-
-//the last time looked at (used to see if this time is in the interval)
-var lastTime = -1;
 
 //the amount of times the sponsor lookup has retried
 //this only happens if there is an error
@@ -240,9 +238,6 @@ document.onkeydown = function(e: KeyboardEvent){
 }
 
 function resetValues() {
-    //reset last sponsor times
-    lastTime = -1;
-
     //reset sponsor times
     sponsorTimes = null;
     UUIDs = [];
@@ -255,6 +250,8 @@ function resetValues() {
 
     //reset sponsor data found check
     sponsorDataFound = false;
+
+    skippedZeroSecond = false;
 }
 
 async function videoIDChange(id) {
@@ -430,14 +427,14 @@ function createPreviewBar(): void {
  * This happens when the resolution changes or at random time to clear memory.
  */
 function durationChangeListener() {
-    lastDurationChange = Date.now();
-
     updatePreviewBar();
 }
 
 function cancelSponsorSchedule(): void {
     if (currentSkipSchedule !== null) {
         clearTimeout(currentSkipSchedule);
+
+        currentSkipSchedule = null;
     }
 }
 
@@ -448,7 +445,7 @@ function cancelSponsorSchedule(): void {
 function startSponsorSchedule(currentTime?: number): void {
     cancelSponsorSchedule();
 
-    if (sponsorTimes === null || Config.config.disableSkipping || channelWhitelisted){
+    if (Config.config.disableSkipping || channelWhitelisted){
         return;
     }
 
@@ -456,18 +453,26 @@ function startSponsorSchedule(currentTime?: number): void {
 
     let skipInfo = getNextSkipIndex(currentTime);
 
+    if (skipInfo.index === -1) return;
+
     let skipTime = skipInfo.array[skipInfo.index];
     let timeUntilSponsor = skipTime[0] - currentTime;
 
-    currentSkipSchedule = setTimeout(() => {
+    let skippingFunction = () => {
         if (video.currentTime >= skipTime[0] && video.currentTime < skipTime[1]) {
+            if (currentTime == 0) skippedZeroSecond = true;
+
             skipToTime(video, skipInfo.index, skipInfo.array, skipInfo.openNotice);
+        }
 
         startSponsorSchedule();
+    };
+
+    if (timeUntilSponsor <= 0) {
+        skippingFunction();
     } else {
-            startSponsorSchedule();
+        currentSkipSchedule = setTimeout(skippingFunction, timeUntilSponsor * 1000 * (1 / video.playbackRate));
     }
-    }, timeUntilSponsor * 1000 * (1 / video.playbackRate));
 }
 
 function sponsorsLookup(id: string, channelIDPromise?) {
@@ -493,6 +498,8 @@ function sponsorsLookup(id: string, channelIDPromise?) {
         video.addEventListener('ratechange', () => startSponsorSchedule());
         video.addEventListener('seeking', cancelSponsorSchedule);
         video.addEventListener('pause', cancelSponsorSchedule);
+
+        startSponsorSchedule();
     }
 
     if (channelIDPromise !== undefined) {
@@ -562,7 +569,7 @@ function sponsorsLookup(id: string, channelIDPromise?) {
                 }
             }
 
-            if (zeroSecondSponsor) {
+            if (zeroSecondSponsor && !skippedZeroSecond) {
                 startSponsorSchedule(0);
             } else {
                 startSponsorSchedule();
@@ -767,7 +774,8 @@ function getNextSkipIndex(currentTime: number): {array: number[][], index: numbe
 
     let minPreviewSponsorTimeIndex = previewSponsorStartTimes.indexOf(Math.min(...previewSponsorStartTimesAfterCurrentTime));
 
-    if (minPreviewSponsorTimeIndex == -1 || sponsorStartTimes[minSponsorTimeIndex] < previewSponsorStartTimes[minPreviewSponsorTimeIndex]) {
+    if ((minPreviewSponsorTimeIndex === -1 && minSponsorTimeIndex !== -1) || 
+            sponsorStartTimes[minSponsorTimeIndex] < previewSponsorStartTimes[minPreviewSponsorTimeIndex]) {
         return {
             array: sponsorTimes,
             index: minSponsorTimeIndex,
@@ -791,6 +799,8 @@ function getNextSkipIndex(currentTime: number): {array: number[][], index: numbe
  * @param hideHiddenSponsors
  */
 function getStartTimes(sponsorTimes: number[][], minimum?: number, hideHiddenSponsors: boolean = false): number[] {
+    if (sponsorTimes === null) return [];
+
     let startTimes: number[] = [];
 
     for (let i = 0; i < sponsorTimes.length; i++) {
@@ -802,7 +812,7 @@ function getStartTimes(sponsorTimes: number[][], minimum?: number, hideHiddenSpo
     return startTimes;
 }
 
-//skip from fhe start time to the end time for a certain index sponsor time
+//skip from the start time to the end time for a certain index sponsor time
 function skipToTime(v, index, sponsorTimes, openNotice) {
     if (!Config.config.disableAutoSkip || previewResetter !== null) {
         v.currentTime = sponsorTimes[index][1];
@@ -816,8 +826,16 @@ function skipToTime(v, index, sponsorTimes, openNotice) {
     if (openNotice) {
         //send out the message saying that a sponsor message was skipped
         if (!Config.config.dontShowNotice) {
+            
             let skipNotice = new SkipNotice(this, currentUUID, Config.config.disableAutoSkip, skipNoticeContentContainer);
 
+            //TODO: Remove this when Mobile support is old	
+            if (Config.config.mobileUpdateShowCount < 1) {	
+                skipNotice.addNoticeInfoMessage(chrome.i18n.getMessage("mobileUpdateInfo"));	
+
+                Config.config.mobileUpdateShowCount += 1;	
+            }
+
             //auto-upvote this sponsor
             if (Config.config.trackViewCount && !Config.config.disableAutoSkip && Config.config.autoUpvote) {
                 vote(1, currentUUID, null);

src/js-components/skipNotice.ts

@@ -58,7 +58,7 @@ class SkipNotice {
         noticeElement.style.zIndex = String(50 + amountOfPreviousNotices);
         if (contentContainer().onMobileYouTube) {
             noticeElement.style.bottom = "4em";
-            noticeElement.style.zoom = "0.8";
+            noticeElement.style.transform = "scale(0.8) translate(10%, 10%)";
         }
 
         //add mouse enter and leave listeners

src/popup.ts

@@ -157,7 +157,7 @@ async function runThePopup(messageListener?: MessageListener) {
 
     //get the amount of times this user has contributed and display it to thank them
     if (Config.config.sponsorTimesContributed != undefined) {
-        if (Config.config.sponsorTimesContributed > 1) {
+        if (Config.config.sponsorTimesContributed !== 1) {
             PageElements.sponsorTimesContributionsDisplayEndWord.innerText = chrome.i18n.getMessage("Sponsors");
         } else {
             PageElements.sponsorTimesContributionsDisplayEndWord.innerText = chrome.i18n.getMessage("Sponsor");

webpack/webpack.common.js

@@ -42,7 +42,8 @@ module.exports = env => ({
         ),
         new BuildManifest({
             browser: env.browser,
-            pretty: env.mode === "production"
+            pretty: env.mode === "production",
+            stream: env.stream
         })
     ]
 });

webpack/webpack.manifest.js

@@ -8,6 +8,8 @@ const fs = require('fs');
 const manifest = require("../manifest/manifest.json");
 const firefoxManifestExtra = require("../manifest/firefox-manifest-extra.json");
 const chromeManifestExtra = require("../manifest/chrome-manifest-extra.json");
+const betaManifestExtra = require("../manifest/beta-manifest-extra.json");
+const firefoxBetaManifestExtra = require("../manifest/firefox-beta-manifest-extra.json");
 
 // schema for options object
 const schema = {
@@ -18,6 +20,9 @@ const schema = {
         },
         pretty: {
             type: 'boolean'
+        },
+        steam: {
+            type: 'string'
         }
     }  
 };
@@ -40,6 +45,14 @@ class BuildManifest {
             mergeObjects(manifest, chromeManifestExtra);
         }
 
+        if (this.options.stream === "beta") {
+            mergeObjects(manifest, betaManifestExtra);
+
+            if (this.options.browser.toLowerCase() === "firefox") {
+                mergeObjects(manifest, firefoxBetaManifestExtra);
+            }
+        }
+
         let result = JSON.stringify(manifest);
         if (this.options.pretty) result = JSON.stringify(manifest, null, 2);