[pull] master from ajayyy:master

manifest/firefox-manifest-extra.json

@@ -13,8 +13,5 @@
   },
   "browser_action": {
     "default_area": "navbar"
-  },
-  "permissions": [
-    "unlimitedStorage"
-  ]
+  }
 }

manifest/manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "5.14",
+    "version": "6.0",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",
@@ -16,7 +16,8 @@
     },
     "permissions": [
         "storage",
-        "scripting"
+        "scripting",
+        "unlimitedStorage"
     ],
     "options_ui": {
         "page": "options/options.html",

public/popup.css

@@ -197,9 +197,7 @@
  * <details> wrapper around each segment
  */
 .votingButtons {
-  font-family: Arial, Helvetica, sans-serif;
   border-radius: 8px;
-  margin: 4px 16px;
 }
 .votingButtons[open] {
   padding-bottom: 5px;
@@ -208,6 +206,29 @@
   background-color: var(--sb-grey-bg-color);
 }
 
+/*
+ * Nested chapters
+ */ 
+.innerChapterList {
+  border-radius: 8px;
+}
+
+.innerChapterList > summary {
+  font-weight: bold;
+  padding: 4px;
+  cursor: pointer;
+}
+
+.segmentWrapper:has(> .innerChapterList > summary:hover) {
+  background-color: var(--sb-grey-bg-color);
+}
+
+.segmentWrapper{
+  font-family: Arial, Helvetica, sans-serif;
+  border-radius: 8px;
+  margin: 4px 16px;
+}
+
 /*
  * Individual segments summaries (clickable <summary>)
  */
@@ -293,6 +314,12 @@
   padding: 10px 15px;
   transition: background-color 0.2s ease-in-out;
 }
+.sbControlsMenu-item:first-child {
+  border-radius: 8px 0px 0px 8px;
+}
+.sbControlsMenu-item:last-child {
+  border-radius: 0px 8px 8px 0px;
+}
 .sbControlsMenu-item:hover, .sbControlsMenu-item:focus {
   background-color: #444;
 }

src/content.ts

@@ -147,8 +147,6 @@ let lastCheckVideoTime = -1;
 // To determine if a video resolution change is happening
 let firstPlay = true;
 
-let channelWhitelisted = false;
-
 let previewBar: PreviewBar = null;
 // Skip to highlight button
 let skipButtonControlBar: SkipButtonControlBar = null;
@@ -245,11 +243,6 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
                 isYTTV: (document.location.host === "tv.youtube.com")
             });
 
-            break;
-        case "whitelistChange":
-            channelWhitelisted = request.value;
-            sponsorsLookup();
-
             break;
         case "submitTimes":
             openSubmissionMenu();
@@ -402,12 +395,14 @@ function contentLocalConfigUpdateListener(changes: StorageChangesObject) {
     }
 }
 
-if (!Config.configSyncListeners.includes(contentConfigUpdateListener)) {
-    Config.configSyncListeners.push(contentConfigUpdateListener);
-}
+if (!window.location.href.includes("youtube.com/live_chat")) {
+    if (!Config.configSyncListeners.includes(contentConfigUpdateListener)) {
+        Config.configSyncListeners.push(contentConfigUpdateListener);
+    }
 
-if (!Config.configLocalListeners.includes(contentLocalConfigUpdateListener)) {
-    Config.configLocalListeners.push(contentLocalConfigUpdateListener);
+    if (!Config.configLocalListeners.includes(contentLocalConfigUpdateListener)) {
+        Config.configLocalListeners.push(contentLocalConfigUpdateListener);
+    }
 }
 
 function resetValues() {
@@ -424,7 +419,6 @@ function resetValues() {
     shownSegmentFailedToFetchWarning = false;
 
     videoInfo = null;
-    channelWhitelisted = false;
     lockedCategories = [];
 
     //empty the preview bar
@@ -704,7 +698,7 @@ async function startSponsorSchedule(includeIntersectingSegments = false, current
     logDebug(`Ready to start skipping: ${skipInfo.index} at ${currentTime}`);
     if (skipInfo.index === -1) return;
 
-    if (Config.config.disableSkipping || channelWhitelisted || (getChannelIDInfo().status === ChannelIDStatus.Fetching && Config.config.forceChannelCheck)){
+    if (Config.config.disableSkipping || (getChannelIDInfo().status === ChannelIDStatus.Fetching && Config.config.forceChannelCheck)){
         return;
     }
 

src/js-components/previewBar.ts

@@ -132,10 +132,11 @@ class PreviewBar {
         // global chapter tooltip or duration tooltip
         // YT, Vorapis, unknown, YTTV
         const tooltipTextWrapper = document.querySelector(".ytp-tooltip-text-wrapper, .ytp-progress-tooltip-text-container, .yssi-slider .ys-seek-details .time-info-bar") ?? document.querySelector("#progress-bar-container.ytk-player > #hover-time-info");
+        const defaultTooltipSelector = ".ytp-tooltip-title:not(.sponsorCategoryTooltip), .ytp-tooltip-title:not(.sponsorCategoryTooltip) span, .ytp-progress-tooltip-text:not(.sponsorCategoryTooltip), .current-time:not(.sponsorCategoryTooltip)";
         const originalTooltip = findNonEmptyElement([
-            ".ytp-tooltip-title:not(.sponsorCategoryTooltip), .ytp-progress-tooltip-text:not(.sponsorCategoryTooltip), .current-time:not(.sponsorCategoryTooltip)",
+            defaultTooltipSelector,
             ".ytp-tooltip-progress-bar-pill-title"
-        ]);
+        ]) ?? document.querySelector(defaultTooltipSelector);
         if (!tooltipTextWrapper || !tooltipTextWrapper.parentElement) return;
 
         // Grab the tooltip from the text wrapper as the tooltip doesn't have its classes on init

src/messageTypes.ts

@@ -20,11 +20,6 @@ interface DefaultMessage {
         | "getLogs";
 }
 
-interface BoolValueMessage {
-    message: "whitelistChange";
-    value: boolean;
-}
-
 interface IsInfoFoundMessage {
     message: "isInfoFound";
     updating: boolean;
@@ -79,7 +74,7 @@ interface SetCurrentTabSkipProfileResponse {
     configID: ConfigurationID | null;
 }
 
-export type Message = BaseMessage & (DefaultMessage | BoolValueMessage | IsInfoFoundMessage | SkipMessage | SubmitVoteMessage | HideSegmentMessage | CopyToClipboardMessage | ImportSegmentsMessage | KeyDownMessage | LoopChapterMessage | SetCurrentTabSkipProfileResponse);
+export type Message = BaseMessage & (DefaultMessage | IsInfoFoundMessage | SkipMessage | SubmitVoteMessage | HideSegmentMessage | CopyToClipboardMessage | ImportSegmentsMessage | KeyDownMessage | LoopChapterMessage | SetCurrentTabSkipProfileResponse);
 
 export interface IsInfoFoundMessageResponse {
     found: boolean;

src/popup/PopupComponent.tsx

@@ -163,10 +163,13 @@ export const PopupComponent = () => {
 
             {/* Toggle Box */}
             <div className="sbControlsMenu">
-                <SkipProfileButton
-                    videoID={videoID}
-                    setShowForceChannelCheckWarning={setShowForceChannelCheckWarning}
-                />
+                {
+                    videoID &&
+                        <SkipProfileButton
+                            videoID={videoID}
+                            setShowForceChannelCheckWarning={setShowForceChannelCheckWarning}
+                        />
+                }
                 <label id="disableExtension" htmlFor="toggleSwitch" className="toggleSwitchContainer sbControlsMenu-item" role="button" tabIndex={0}>
                     <span className="toggleSwitchContainer-switch">
                         <input type="checkbox" 
@@ -445,7 +448,8 @@ window.addEventListener("message", async (e): Promise<void> => {
 
 function SkipProfileButton(props: {videoID: string; setShowForceChannelCheckWarning: (v: boolean) => void}): JSX.Element {
     const [menuOpen, setMenuOpen] = React.useState(false);
-    const skipProfileSet = getSkipProfileIDForChannel() !== null;
+    const channelSkipProfileSet = getSkipProfileIDForChannel() !== null;
+    const skipProfileSet = getSkipProfileID() !== null;
 
     React.useEffect(() => {
         setMenuOpen(false);
@@ -468,12 +472,15 @@ function SkipProfileButton(props: {videoID: string; setShowForceChannelCheckWarn
                 <svg viewBox="0 0 24 24" width="23" height="23" className={"SBWhitelistIcon sbControlsMenu-itemIcon " + (menuOpen ? " rotated" : "")}>
                     <path d="M24 10H14V0h-4v10H0v4h10v10h4V14h10z" />
                 </svg>
-                <span id="whitelistChannel" className={(menuOpen || skipProfileSet) ? " hidden" : ""}>
+                <span id="whitelistChannel" className={!(!menuOpen && !channelSkipProfileSet && !skipProfileSet) ? " hidden" : ""}>
                     {chrome.i18n.getMessage("addChannelToSkipProfile")}
                 </span>
-                <span id="whitelistChannel" className={(menuOpen || !skipProfileSet) ? " hidden" : ""}>
+                <span id="whitelistChannel" className={!(!menuOpen && channelSkipProfileSet) ? " hidden" : ""}>
                     {chrome.i18n.getMessage("editChannelsSkipProfile")}
                 </span>
+                <span id="whitelistChannel" className={!(!menuOpen && !channelSkipProfileSet && skipProfileSet) ? " hidden" : ""}>
+                    {chrome.i18n.getMessage("editActiveSkipProfile")}
+                </span>
                 <span id="unwhitelistChannel" className={!menuOpen ? " hidden" : ""}>
                     {chrome.i18n.getMessage("closeSkipProfileMenu")}
                 </span>
@@ -612,7 +619,7 @@ function SkipProfileRadioButtons(props: SkipProfileRadioButtonsProps): JSX.Eleme
                 }
             }
         }
-    }, [props.configID, props.videoID]);
+    }, [props.configID, props.videoID, props.selected]);
 
     let alreadySelected = false;
     for (const option of skipProfileOptions) {