Fix icon not square

load shared.css on third party sites

manifest/manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "__MSG_fullName__",
     "short_name": "SponsorBlock",
-    "version": "5.1.12",
+    "version": "5.1.13",
     "default_locale": "en",
     "description": "__MSG_Description__",
     "homepage_url": "https://sponsor.ajay.app",
@@ -73,7 +73,11 @@
         "content.css",
         "shared.css",
         "js/document.js",
-        "libs/Source+Sans+Pro.css"
+        "libs/Source+Sans+Pro.css",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmRduz8A.woff2",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmBduz8A.woff2",
+        "libs/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlBduz8A.woff2"
     ],
     "permissions": [
         "storage",
@@ -88,8 +92,8 @@
         "default_icon": {
             "16": "icons/IconSponsorBlocker16px.png",
             "32": "icons/IconSponsorBlocker32px.png",
-            "64": "icons/LogoSponsorBlocker64px.png",
-            "128": "icons/LogoSponsorBlocker128px.png"
+            "64": "icons/IconSponsorBlocker64px.png",
+            "128": "icons/IconSponsorBlocker128px.png"
         },
         "theme_icons": [
             {
@@ -103,13 +107,13 @@
                 "size": 32
             },
             {
-                "light": "icons/LogoSponsorBlocker64px.png",
-                "dark": "icons/LogoSponsorBlocker64px.png",
+                "light": "icons/IconSponsorBlocker64px.png",
+                "dark": "icons/IconSponsorBlocker64px.png",
                 "size": 64
             },
             {
-                "light": "icons/LogoSponsorBlocker128px.png",
-                "dark": "icons/LogoSponsorBlocker128px.png",
+                "light": "icons/IconSponsorBlocker128px.png",
+                "dark": "icons/IconSponsorBlocker128px.png",
                 "size": 128
             }
         ]
@@ -123,11 +127,11 @@
     "icons": {
         "16": "icons/IconSponsorBlocker16px.png",
         "32": "icons/IconSponsorBlocker32px.png",
-        "64": "icons/LogoSponsorBlocker64px.png",
-        "128": "icons/LogoSponsorBlocker128px.png",
-        "256": "icons/LogoSponsorBlocker256px.png",
-        "512": "icons/LogoSponsorBlocker512px.png",
-        "1024": "icons/LogoSponsorBlocker1024px.png"
+        "64": "icons/IconSponsorBlocker64px.png",
+        "128": "icons/IconSponsorBlocker128px.png",
+        "256": "icons/IconSponsorBlocker256px.png",
+        "512": "icons/IconSponsorBlocker512px.png",
+        "1024": "icons/IconSponsorBlocker1024px.png"
     },
     "options_ui": {
         "page": "options/options.html",

public/libs/Source+Sans+Pro.css

@@ -3,7 +3,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNa7lqDY.woff2) format('woff2');
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qNa7lqDY.woff2) format('woff2');
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 }
 /* cyrillic */
@@ -11,7 +11,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qPK7lqDY.woff2) format('woff2');
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qPK7lqDY.woff2) format('woff2');
   unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 /* greek-ext */
@@ -19,7 +19,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNK7lqDY.woff2) format('woff2');
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qNK7lqDY.woff2) format('woff2');
   unicode-range: U+1F00-1FFF;
 }
 /* greek */
@@ -27,7 +27,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qO67lqDY.woff2) format('woff2');
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qO67lqDY.woff2) format('woff2');
   unicode-range: U+0370-03FF;
 }
 /* vietnamese */
@@ -35,7 +35,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qN67lqDY.woff2) format('woff2');
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qN67lqDY.woff2) format('woff2');
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
 }
 /* latin-ext */
@@ -43,7 +43,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qNq7lqDY.woff2) format('woff2');
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qNq7lqDY.woff2) format('woff2');
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -51,7 +51,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 400;
-  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2) format('woff2');
+  src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(6xK3dSBYKcSV-LCoeQqfX1RYOo3qOK7l.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* cyrillic-ext */
@@ -59,7 +59,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmhduz8A.woff2) format('woff2');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmhduz8A.woff2) format('woff2');
   unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
 }
 /* cyrillic */
@@ -67,7 +67,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwkxduz8A.woff2) format('woff2');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwkxduz8A.woff2) format('woff2');
   unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
 }
 /* greek-ext */
@@ -75,7 +75,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmxduz8A.woff2) format('woff2');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmxduz8A.woff2) format('woff2');
   unicode-range: U+1F00-1FFF;
 }
 /* greek */
@@ -83,7 +83,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlBduz8A.woff2) format('woff2');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlBduz8A.woff2) format('woff2');
   unicode-range: U+0370-03FF;
 }
 /* vietnamese */
@@ -91,7 +91,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmBduz8A.woff2) format('woff2');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmBduz8A.woff2) format('woff2');
   unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
 }
 /* latin-ext */
@@ -99,7 +99,7 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmRduz8A.woff2) format('woff2');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwmRduz8A.woff2) format('woff2');
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -107,6 +107,6 @@
   font-family: 'Source Sans Pro';
   font-style: normal;
   font-weight: 700;
-  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(https://fonts.gstatic.com/s/sourcesanspro/v13/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2) format('woff2');
+  src: local('Source Sans Pro Bold'), local('SourceSansPro-Bold'), url(6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdu.woff2) format('woff2');
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
-}
+}

src/content.ts

@@ -1092,98 +1092,88 @@ async function sponsorsLookup(keepOldSubmissions = true) {
                         source: SponsorSourceType.Server
                     }))
                     ?.sort((a, b) => a.segment[0] - b.segment[0]);
-        if (!recievedSegments || !recievedSegments.length) {
-            // return if no video found
-            chrome.runtime.sendMessage({
-                message: "infoUpdated",
-                found: false,
-                status: lastResponseStatus,
-                sponsorTimes: sponsorTimes,
-                time: video.currentTime,
-                onMobileYouTube
-            });
+        if (recievedSegments && recievedSegments.length) {
+            if (showChapterMessage) {
+                const chapterSegments = recievedSegments.filter((s) => s.actionType === ActionType.Chapter);
+                if (chapterSegments.length > 3) {
+                    const prependElement = document.querySelector(".ytp-chrome-bottom") as HTMLElement;
+                    if (prependElement) {
+                        Config.config.showChapterInfoMessage = false;
+                        new Tooltip({
+                            text: `🟨${chrome.i18n.getMessage("chapterNewFeature")}${chapterSegments.slice(0, 3).map((s) => s.description).join(", ")}`,
+                            linkOnClick: () => void chrome.runtime.sendMessage({ "message": "openUpsell" }),
+                            referenceNode: prependElement.parentElement,
+                            prependElement,
+                            timeout: 1500,
+                            leftOffset: "20px",
+                            positionRealtive: false
+                        });
+                    }
+                }
+    
+                recievedSegments = recievedSegments.filter((s) => s.actionType !== ActionType.Chapter);
+            }
+    
+            sponsorDataFound = true;
+    
+            // Check if any old submissions should be kept
+            if (sponsorTimes !== null && keepOldSubmissions) {
+                for (let i = 0; i < sponsorTimes.length; i++) {
+                    if (sponsorTimes[i].source === SponsorSourceType.Local)  {
+                        // This is a user submission, keep it
+                        recievedSegments.push(sponsorTimes[i]);
+                    }
+                }
+            }
+    
+            const oldSegments = sponsorTimes || [];
+            sponsorTimes = recievedSegments;
+            existingChaptersImported = false;
+    
+            // Hide all submissions smaller than the minimum duration
+            if (Config.config.minDuration !== 0) {
+                for (const segment of sponsorTimes) {
+                    const duration = segment.segment[1] - segment.segment[0];
+                    if (duration > 0 && duration < Config.config.minDuration) {
+                        segment.hidden = SponsorHideType.MinimumDuration;
+                    }
+                }
+            }
+    
+            if (keepOldSubmissions) {
+                for (const segment of oldSegments) {
+                    const otherSegment = sponsorTimes.find((other) => segment.UUID === other.UUID);
+                    if (otherSegment) {
+                        // If they downvoted it, or changed the category, keep it
+                        otherSegment.hidden = segment.hidden;
+                        otherSegment.category = segment.category;
+                    }
+                }
+            }
+    
+            // See if some segments should be hidden
+            const downvotedData = Config.local.downvotedSegments[hashPrefix];
+            if (downvotedData) {
+                for (const segment of sponsorTimes) {
+                    const hashedUUID = await utils.getHash(segment.UUID, 1);
+                    const segmentDownvoteData = downvotedData.segments.find((downvote) => downvote.uuid === hashedUUID);
+                    if (segmentDownvoteData) {
+                        segment.hidden = segmentDownvoteData.hidden;
+                    }
+                }
+            }
+    
+            startSkipScheduleCheckingForStartSponsors();
+    
+            //update the preview bar
+            //leave the type blank for now until categories are added
+            if (lastPreviewBarUpdate == sponsorVideoID || (lastPreviewBarUpdate == null && !isNaN(video.duration))) {
+                //set it now
+                //otherwise the listener can handle it
+                updatePreviewBar();
+            }
+        } else {
             retryFetch(404);
-            return;
-        }
-
-        if (showChapterMessage) {
-            const chapterSegments = recievedSegments.filter((s) => s.actionType === ActionType.Chapter);
-            if (chapterSegments.length > 3) {
-                const prependElement = document.querySelector(".ytp-chrome-bottom") as HTMLElement;
-                if (prependElement) {
-                    Config.config.showChapterInfoMessage = false;
-                    new Tooltip({
-                        text: `🟨${chrome.i18n.getMessage("chapterNewFeature")}${chapterSegments.slice(0, 3).map((s) => s.description).join(", ")}`,
-                        linkOnClick: () => void chrome.runtime.sendMessage({ "message": "openUpsell" }),
-                        referenceNode: prependElement.parentElement,
-                        prependElement,
-                        timeout: 1500,
-                        leftOffset: "20px",
-                        positionRealtive: false
-                    });
-                }
-            }
-
-            recievedSegments = recievedSegments.filter((s) => s.actionType !== ActionType.Chapter);
-        }
-
-        sponsorDataFound = true;
-
-        // Check if any old submissions should be kept
-        if (sponsorTimes !== null && keepOldSubmissions) {
-            for (let i = 0; i < sponsorTimes.length; i++) {
-                if (sponsorTimes[i].source === SponsorSourceType.Local)  {
-                    // This is a user submission, keep it
-                    recievedSegments.push(sponsorTimes[i]);
-                }
-            }
-        }
-
-        const oldSegments = sponsorTimes || [];
-        sponsorTimes = recievedSegments;
-        existingChaptersImported = false;
-
-        // Hide all submissions smaller than the minimum duration
-        if (Config.config.minDuration !== 0) {
-            for (const segment of sponsorTimes) {
-                const duration = segment.segment[1] - segment.segment[0];
-                if (duration > 0 && duration < Config.config.minDuration) {
-                    segment.hidden = SponsorHideType.MinimumDuration;
-                }
-            }
-        }
-
-        if (keepOldSubmissions) {
-            for (const segment of oldSegments) {
-                const otherSegment = sponsorTimes.find((other) => segment.UUID === other.UUID);
-                if (otherSegment) {
-                    // If they downvoted it, or changed the category, keep it
-                    otherSegment.hidden = segment.hidden;
-                    otherSegment.category = segment.category;
-                }
-            }
-        }
-
-        // See if some segments should be hidden
-        const downvotedData = Config.local.downvotedSegments[hashPrefix];
-        if (downvotedData) {
-            for (const segment of sponsorTimes) {
-                const hashedUUID = await utils.getHash(segment.UUID, 1);
-                const segmentDownvoteData = downvotedData.segments.find((downvote) => downvote.uuid === hashedUUID);
-                if (segmentDownvoteData) {
-                    segment.hidden = segmentDownvoteData.hidden;
-                }
-            }
-        }
-
-        startSkipScheduleCheckingForStartSponsors();
-
-        //update the preview bar
-        //leave the type blank for now until categories are added
-        if (lastPreviewBarUpdate == sponsorVideoID || (lastPreviewBarUpdate == null && !isNaN(video.duration))) {
-            //set it now
-            //otherwise the listener can handle it
-            updatePreviewBar();
         }
     } else {
         retryFetch(lastResponseStatus);

src/js-components/previewBar.ts

@@ -314,7 +314,7 @@ class PreviewBar {
         if (chapterChevron) {
             if (this.segments.some((segment) => segment.source === SponsorSourceType.YouTube)) {
                 chapterChevron.style.removeProperty("display");
-            } else {
+            } else if (this.segments) {
                 chapterChevron.style.display = "none";
             }
         }

src/utils.ts

@@ -18,7 +18,8 @@ export default class Utils {
     css = [
         "content.css",
         "./libs/Source+Sans+Pro.css",
-        "popup.css"
+        "popup.css",
+        "shared.css"
     ];
 
     /* Used for waitForElement */