bump version

Fix #523
Fix #367

.github/workflows/release.yml

@@ -59,7 +59,6 @@ jobs:
         with:
           name: SafariExtension
           path: dist
-      - run: mkdir ./builds
       - name: Zip Artifacts
         run: cd ./dist ; zip -r ../builds/SafariExtension.zip *
       # Create Edge artifacts
@@ -71,7 +70,6 @@ jobs:
         with:
           name: EdgeExtension
           path: dist
-      - run: mkdir ./builds
       - name: Zip Artifacts
         run: cd ./dist ; zip -r ../builds/EdgeExtension.zip *
 

manifest/manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "4.0.3",
+    "version": "4.0.4",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",

manifest/safari-manifest-extra.json

@@ -0,0 +1,5 @@
+{
+  "background": {
+    "persistent": false
+  }
+}

public/_locales/en/messages.json

@@ -440,6 +440,9 @@
     "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?"
     },
+    "liveOrPremiere": {
+        "message": "Submitting on an active livesteam or premiere is not allowed. Please wait until it finishes, then refresh the page and verify that the segments are still valid."
+    },
     "showUploadButton": {
         "message": "Show Upload Button"
     },
@@ -541,10 +544,10 @@
         "message": "Exclusive Access"
     },
     "category_exclusive_access_description": {
-        "message": "Only for labeling entire videos. Used when a video showcases a product, service or location that they've recieved free or subsidized access to."
+        "message": "Only for labeling entire videos. Used when a video showcases a product, service or location that they've received free or subsidized access to."
     },
     "category_exclusive_access_pill": {
-        "message": "This video showcases a product, service or location that they've recieved free or subsidized access to",
+        "message": "This video showcases a product, service or location that they've received free or subsidized access to",
         "description": "Short description for this category"
     },
     "category_interaction": {

src/content.ts

@@ -17,7 +17,7 @@ import { getCategoryActionType } from "./utils/categoryUtils";
 import { SkipButtonControlBar } from "./js-components/skipButtonControlBar";
 import { Tooltip } from "./render/Tooltip";
 import { getStartTimeFromUrl } from "./utils/urlParser";
-import { findValidElement, getControls, isVisible } from "./utils/pageUtils";
+import { findValidElement, getControls, getHashParams, isVisible } from "./utils/pageUtils";
 import { CategoryPill } from "./render/CategoryPill";
 import { AnimationUtils } from "./utils/animationUtils";
 import { GenericUtils } from "./utils/genericUtils";
@@ -692,16 +692,8 @@ async function sponsorsLookup(id: string, keepOldSubmissions = true) {
     }
 
     const extraRequestData: Record<string, unknown> = {};
-    const windowHash = window.location.hash.substr(1);
+    const hashParams = getHashParams();
-    if (windowHash) {
+    if (hashParams.requiredSegment) extraRequestData.requiredSegment = hashParams.requiredSegment;
-        const params: Record<string, unknown> = windowHash.split('&').reduce((acc, param) => {
-            const [key, value] = param.split('=');
-            acc[key] = value;
-            return acc;
-        }, {});
-
-        if (params.requiredSegment) extraRequestData.requiredSegment = params.requiredSegment;
-    }
 
     // Check for hashPrefix setting
     const hashPrefix = (await utils.getHash(id, 1)).substr(0, 4);
@@ -1403,8 +1395,9 @@ function shouldAutoSkip(segment: SponsorTime): boolean {
 }
 
 function shouldSkip(segment: SponsorTime): boolean {
-    return utils.getCategorySelection(segment.category)?.option !== CategorySkipOption.ShowOverlay ||
+    return (segment.actionType !== ActionType.Full 
-            (Config.config.autoSkipOnMusicVideos && sponsorTimes?.some((s) => s.category === "music_offtopic"));
+            && utils.getCategorySelection(segment.category)?.option !== CategorySkipOption.ShowOverlay) 
+            || (Config.config.autoSkipOnMusicVideos && sponsorTimes?.some((s) => s.category === "music_offtopic"));
 }
 
 /** Creates any missing buttons on the YouTube player if possible. */
@@ -1582,6 +1575,8 @@ function updateSponsorTimesSubmitting(getFromConfig = true) {
     if (submissionNotice !== null) {
         submissionNotice.update();
     }
+
+    checkForPreloadedSegment();
 }
 
 function openInfoMenu() {
@@ -1803,6 +1798,12 @@ function submitSponsorTimes() {
 //send the message to the background js
 //called after all the checks have been made that it's okay to do so
 async function sendSubmitMessage() {
+    // Block if submitting on a running livestream or premiere
+    if (isVisible(document.querySelector(".ytp-live-badge"))) {
+        alert(chrome.i18n.getMessage("liveOrPremiere"));
+        return;
+    }
+
     // Add loading animation
     playerButtons.submit.image.src = chrome.extension.getURL("icons/PlayerUploadIconSponsorBlocker.svg");
     const stopAnimation = AnimationUtils.applyLoadingAnimation(playerButtons.submit.button, 1, () => updateEditButtonsOnPlayer());
@@ -2023,3 +2024,24 @@ function showTimeWithoutSkips(skippedDuration: number): void {
 
     duration.innerText = (durationAfterSkips == null || skippedDuration <= 0) ? "" : " (" + durationAfterSkips + ")";
 }
+
+function checkForPreloadedSegment() {
+    const hashParams = getHashParams();
+
+    const segments = hashParams.segments;
+    if (Array.isArray(segments)) {
+        for (const segment of segments) {
+            if (Array.isArray(segment.segment)) {
+                if (!sponsorTimesSubmitting.some((s) => s.segment[0] === segment.segment[0] && s.segment[1] === s.segment[1])) {
+                    sponsorTimesSubmitting.push({
+                        segment: segment.segment,
+                        UUID: utils.generateUserID() as SegmentUUID,
+                        category: segment.category ? segment.category : Config.config.defaultCategory,
+                        actionType: segment.actionType ? segment.actionType : ActionType.Skip,
+                        source: SponsorSourceType.Local
+                    });
+                }
+            }
+        }
+    }
+}

src/utils.ts

@@ -343,13 +343,15 @@ export default class Utils {
             //for embeds
             const player = document.getElementById("player");
             referenceNode = player.firstChild as HTMLElement;
-            let index = 1;
+            if (referenceNode) {
+                let index = 1;
 
-            //find the child that is the video player (sometimes it is not the first)
+                //find the child that is the video player (sometimes it is not the first)
-            while (index < player.children.length && (!referenceNode.classList.contains("html5-video-player") || !referenceNode.classList.contains("ytp-embed"))) {
+                while (index < player.children.length && (!referenceNode.classList.contains("html5-video-player") || !referenceNode.classList.contains("ytp-embed"))) {
-                referenceNode = player.children[index] as HTMLElement;
+                    referenceNode = player.children[index] as HTMLElement;
 
-                index++;
+                    index++;
+                }
             }
         }
 

src/utils/pageUtils.ts

@@ -41,3 +41,24 @@ function findValidElementFromGenerator<T>(objects: T[] | NodeListOf<HTMLElement>
 
     return null;
 }
+
+export function getHashParams(): Record<string, unknown> {
+    const windowHash = window.location.hash.substr(1);
+    if (windowHash) {
+        const params: Record<string, unknown> = windowHash.split('&').reduce((acc, param) => {
+            const [key, value] = param.split('=');
+            const decoded = decodeURIComponent(value);
+            try {
+                acc[key] = decoded?.match(/{|\[/) ? JSON.parse(decoded) : value;
+            } catch (e) {
+                console.error(`Failed to parse hash parameter ${key}: ${value}`);
+            }
+
+            return acc;
+        }, {});
+
+        return params;
+    }
+
+    return {};
+}

webpack/webpack.manifest.js

@@ -8,6 +8,7 @@ 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 safariManifestExtra = require("../manifest/safari-manifest-extra.json");
 const betaManifestExtra = require("../manifest/beta-manifest-extra.json");
 const firefoxBetaManifestExtra = require("../manifest/firefox-beta-manifest-extra.json");
 
@@ -41,8 +42,12 @@ class BuildManifest {
         // Add missing manifest elements
         if (this.options.browser.toLowerCase() === "firefox") {
             mergeObjects(manifest, firefoxManifestExtra);
-        } else if (this.options.browser.toLowerCase() === "chrome" || this.options.browser.toLowerCase() === "chromium") {
+        } else if (this.options.browser.toLowerCase() === "chrome" 
+                || this.options.browser.toLowerCase() === "chromium"
+                || this.options.browser.toLowerCase() === "edge") {
             mergeObjects(manifest, chromeManifestExtra);
+        }  else if (this.options.browser.toLowerCase() === "safari") {
+            mergeObjects(manifest, safariManifestExtra);
         }
 
         if (this.options.stream === "beta") {