From 87a7f85c24f9647c3771ce692805ec20d4aab268 Mon Sep 17 00:00:00 2001 From: Nanobyte Date: Thu, 31 Dec 2020 20:59:12 +0100 Subject: [PATCH 01/44] Change segment list layout in popup --- public/popup.css | 12 ++++++++++++ src/popup.ts | 25 ++++++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/public/popup.css b/public/popup.css index 2aa096a6..c658a8af 100644 --- a/public/popup.css +++ b/public/popup.css @@ -10,6 +10,14 @@ display: none !important; } +.sponsorTimesCategoryColorCircle { + margin: 0 8px; +} + +.voteButtonsContainer--hide { + display: none; +} + @media only screen and (max-width: 600px) { #sponsorBlockPopupBody { width: 100%; @@ -41,8 +49,12 @@ border: none; padding: 7px; outline: none; + + display: flex; + justify-content: flex-start; cursor: pointer; + white-space: nowrap; } .dot { diff --git a/src/popup.ts b/src/popup.ts index db34325c..d07a651d 100644 --- a/src/popup.ts +++ b/src/popup.ts @@ -385,6 +385,12 @@ async function runThePopup(messageListener?: MessageListener): Promise { const sponsorTimeButton = document.createElement("button"); sponsorTimeButton.className = "segmentTimeButton popupElement"; + const categoryColorCircle = document.createElement("span"); + categoryColorCircle.id = "sponsorTimesCategoryColorCircle" + UUID; + categoryColorCircle.style.backgroundColor = Config.config.barTypes[segmentTimes[i].category].color; + categoryColorCircle.classList.add("dot"); + categoryColorCircle.classList.add("sponsorTimesCategoryColorCircle"); + const prefix = utils.shortCategoryName(segmentTimes[i].category) + ": "; let extraInfo = ""; @@ -395,14 +401,16 @@ async function runThePopup(messageListener?: MessageListener): Promise { //this one is too short extraInfo = " (" + chrome.i18n.getMessage("hiddenDueToDuration") + ")"; } + + const segmentTimeFromTo = getFormattedTime(segmentTimes[i].segment[0]) + " " + chrome.i18n.getMessage("to") + " " + getFormattedTime(segmentTimes[i].segment[1]); + + const segmentTimeFromToNode = document.createTextNode(segmentTimeFromTo); + const textNode = document.createTextNode(utils.shortCategoryName(segmentTimes[i].category) + extraInfo); - sponsorTimeButton.innerText = prefix + getFormattedTime(segmentTimes[i].segment[0]) + " " + chrome.i18n.getMessage("to") + " " + getFormattedTime(segmentTimes[i].segment[1]) + extraInfo; + sponsorTimeButton.appendChild(segmentTimeFromToNode); + sponsorTimeButton.appendChild(categoryColorCircle); + sponsorTimeButton.appendChild(textNode); - const categoryColorCircle = document.createElement("span"); - categoryColorCircle.id = "sponsorTimesCategoryColorCircle" + UUID; - categoryColorCircle.style.backgroundColor = Config.config.barTypes[segmentTimes[i].category].color; - categoryColorCircle.classList.add("dot"); - categoryColorCircle.classList.add("sponsorTimesCategoryColorCircle"); const votingButtons = document.createElement("div"); votingButtons.classList.add("votingButtons"); @@ -411,7 +419,7 @@ async function runThePopup(messageListener?: MessageListener): Promise { const voteButtonsContainer = document.createElement("div"); voteButtonsContainer.id = "sponsorTimesVoteButtonsContainer" + UUID; voteButtonsContainer.setAttribute("align", "center"); - voteButtonsContainer.style.display = "none" + voteButtonsContainer.classList.add('voteButtonsContainer--hide'); const upvoteButton = document.createElement("img"); upvoteButton.id = "sponsorTimesUpvoteButtonsContainer" + UUID; @@ -431,7 +439,7 @@ async function runThePopup(messageListener?: MessageListener): Promise { //add click listener to open up vote panel sponsorTimeButton.addEventListener("click", function() { - voteButtonsContainer.style.removeProperty("display"); + voteButtonsContainer.classList.toggle("voteButtonsContainer--hide"); }); // Will contain request status @@ -445,7 +453,6 @@ async function runThePopup(messageListener?: MessageListener): Promise { thanksForVotingText.classList.add("sponsorTimesThanksForVotingText"); voteStatusContainer.appendChild(thanksForVotingText); - votingButtons.append(categoryColorCircle); votingButtons.append(sponsorTimeButton); votingButtons.append(voteButtonsContainer); votingButtons.append(voteStatusContainer); From d5abc1a9d9037ce32950444275dde4d263c6793c Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Sun, 23 May 2021 11:49:55 -0400 Subject: [PATCH 02/44] Increase version number --- manifest/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest/manifest.json b/manifest/manifest.json index cff76ddc..e85d881f 100644 --- a/manifest/manifest.json +++ b/manifest/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_fullName__", "short_name": "SponsorBlock", - "version": "2.0.16.1", + "version": "2.0.16.2", "default_locale": "en", "description": "__MSG_Description__", "content_scripts": [{ From 95cdb7f6916bb9fa70b8d27b9727f4480b863300 Mon Sep 17 00:00:00 2001 From: GitMoleo <69057107+GitMoleo@users.noreply.github.com> Date: Sun, 23 May 2021 19:43:09 +0200 Subject: [PATCH 03/44] Change to "start/stop segment keybind" Change "Set key for start segment keybind" to "Set key for start/stop segment keybind", since it is more accurate to the actual feature! --- public/_locales/en/messages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json index a70310ed..d2b49402 100644 --- a/public/_locales/en/messages.json +++ b/public/_locales/en/messages.json @@ -239,7 +239,7 @@ "message": "Set key for skipping a segment" }, "setStartSponsorShortcut": { - "message": "Set key for start segment keybind" + "message": "Set key for start/stop segment keybind" }, "setSubmitKeybind": { "message": "Set key for submission keybind" From 99ecd32e82ab19fb00b24fe8df1d05b7b39af302 Mon Sep 17 00:00:00 2001 From: GitMoleo <69057107+GitMoleo@users.noreply.github.com> Date: Tue, 25 May 2021 17:19:23 +0200 Subject: [PATCH 04/44] edit old link to 3rd-party-ports in README.md Since the README still contained the [old link to 3rd-party-ports in the wiki](https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports) , I edited it to be [the new one](https://github.com/ajayyy/SponsorBlock/wiki/3rd-Party-Ports) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 83ff4565..0a404c57 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ The backend server code is available here: https://github.com/ajayyy/SponsorBloc To make sure that this project doesn't die, I have made the database publicly downloadable at https://sponsor.ajay.app/database ([License](https://github.com/ajayyy/SponsorBlock/wiki/Database-and-API-License)). If you are planning on using the database in another project, please read the [API Docs](https://github.com/ajayyy/SponsorBlock/wiki/API-Docs) page for more information. -The dataset and API are now being used in some [ports](https://github.com/ajayyy/SponsorBlock/wiki/Unofficial-Ports) as well as a [neural network](https://github.com/andrewzlee/NeuralBlock). +The dataset and API are now being used in some [ports](https://github.com/ajayyy/SponsorBlock/wiki/3rd-Party-Ports) as well as a [neural network](https://github.com/andrewzlee/NeuralBlock). # API From 283790874d3f2ec096dc109db105d0095dadf080 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 26 May 2021 21:24:06 -0400 Subject: [PATCH 05/44] Add link to pull request testing doc in wiki --- .github/pull_request_template.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ac293972..b6a81206 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1 +1,5 @@ - [ ] I agree to license my contribution under LGPL-3.0 **or** my contribution is from another project with a license compatible with LGPL-3.0 + +To test this pull request, follow the [instructions in the wiki](https://github.com/ajayyy/SponsorBlock/wiki/Testing-a-Pull-Request). + +*** From da1d4bc1ce912aad64a2cbf1e1dbc8078e68365b Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 26 May 2021 22:04:38 -0400 Subject: [PATCH 06/44] Improve centering when text is small --- public/popup.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/public/popup.css b/public/popup.css index c658a8af..f1c7791a 100644 --- a/public/popup.css +++ b/public/popup.css @@ -42,6 +42,15 @@ text-align: center; } +#issueReporterContainer { + display: flex; + justify-content: center; +} + +#issueReporterTimeButtons { + text-align: left; +} + #issueReporterTimeButtons > .votingButtons > .segmentTimeButton { font-weight: bold; color: var(--sb-main-fg-color); @@ -49,9 +58,6 @@ border: none; padding: 7px; outline: none; - - display: flex; - justify-content: flex-start; cursor: pointer; white-space: nowrap; From deb0e9b9be24f4770c52842b6d5c403709becd56 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 26 May 2021 22:05:05 -0400 Subject: [PATCH 07/44] Fix issue with whitelist button --- public/popup.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/popup.css b/public/popup.css index f1c7791a..c562e57e 100644 --- a/public/popup.css +++ b/public/popup.css @@ -295,8 +295,6 @@ background-color:#ec1c1c; min-height: 16px; margin-top: auto; margin-bottom: auto; - - height: 100%; } .SBWhitelistIcon>path { From 0aa346e18e9ee61a75af34f084805f1070c41923 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 26 May 2021 22:13:06 -0400 Subject: [PATCH 08/44] Remove unused declaration --- src/popup.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/popup.ts b/src/popup.ts index d07a651d..f265b824 100644 --- a/src/popup.ts +++ b/src/popup.ts @@ -391,8 +391,6 @@ async function runThePopup(messageListener?: MessageListener): Promise { categoryColorCircle.classList.add("dot"); categoryColorCircle.classList.add("sponsorTimesCategoryColorCircle"); - const prefix = utils.shortCategoryName(segmentTimes[i].category) + ": "; - let extraInfo = ""; if (segmentTimes[i].hidden === SponsorHideType.Downvoted) { //this one is downvoted From dabe3553a643ab700d61c647e37866b49e3fc7b5 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 26 May 2021 22:25:55 -0400 Subject: [PATCH 09/44] Change to stacked layout --- public/popup.css | 9 --------- src/popup.ts | 8 ++++---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/public/popup.css b/public/popup.css index 4e61f847..0fd1f839 100644 --- a/public/popup.css +++ b/public/popup.css @@ -42,15 +42,6 @@ text-align: center; } -#issueReporterContainer { - display: flex; - justify-content: center; -} - -#issueReporterTimeButtons { - text-align: left; -} - #issueReporterTimeButtons > .votingButtons > .segmentTimeButton { font-weight: bold; color: var(--sb-main-fg-color); diff --git a/src/popup.ts b/src/popup.ts index fffdf43c..7ae6f6d5 100644 --- a/src/popup.ts +++ b/src/popup.ts @@ -387,14 +387,14 @@ async function runThePopup(messageListener?: MessageListener): Promise { extraInfo = " (" + chrome.i18n.getMessage("hiddenDueToDuration") + ")"; } - const segmentTimeFromTo = utils.getFormattedTime(segmentTimes[i].segment[0], true) + " " + chrome.i18n.getMessage("to") + " " + utils.getFormattedTime(segmentTimes[i].segment[1], true); - - const segmentTimeFromToNode = document.createTextNode(segmentTimeFromTo); const textNode = document.createTextNode(utils.shortCategoryName(segmentTimes[i].category) + extraInfo); + const segmentTimeFromToNode = document.createElement("div"); + segmentTimeFromToNode.innerText = utils.getFormattedTime(segmentTimes[i].segment[0], true) + " " + chrome.i18n.getMessage("to") + " " + utils.getFormattedTime(segmentTimes[i].segment[1], true); + segmentTimeFromToNode.style.margin = "5px"; - sponsorTimeButton.appendChild(segmentTimeFromToNode); sponsorTimeButton.appendChild(categoryColorCircle); sponsorTimeButton.appendChild(textNode); + sponsorTimeButton.appendChild(segmentTimeFromToNode); const votingButtons = document.createElement("div"); votingButtons.classList.add("votingButtons"); From fc3bd9bb7718e1f641e131ce0ac55bcb18b39100 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Thu, 27 May 2021 12:07:39 -0400 Subject: [PATCH 10/44] Add funding info --- .github/FUNDING.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..eeef1019 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,2 @@ +patreon: ajayyy +custom: [sponsor.ajay.app/donate] From a6b9af62f9d7cfb74c5b580d16531c8c526de69f Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Sun, 30 May 2021 12:34:03 -0400 Subject: [PATCH 11/44] Update matrix link --- public/popup.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/popup.html b/public/popup.html index 4f3669eb..c224f573 100644 --- a/public/popup.html +++ b/public/popup.html @@ -136,7 +136,7 @@ GitHub
Discord | - Matrix | + Matrix | __MSG_help__ | $ @@ -146,4 +146,4 @@ - \ No newline at end of file + From 18161967fcf0106ac2ffa9bd3053ea60f3ae78db Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Mon, 31 May 2021 14:26:08 -0400 Subject: [PATCH 12/44] Prevent retry fetch from potentially using the wrong videoID Resolves https://github.com/ajayyy/SponsorBlock/issues/667 --- src/content.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/content.ts b/src/content.ts index e86d3171..d3d44a78 100644 --- a/src/content.ts +++ b/src/content.ts @@ -573,11 +573,11 @@ async function sponsorsLookup(id: string) { if (result.length > 0) { result = result[0].segments; if (result.length === 0) { // return if no segments found - retryFetch(id); + retryFetch(); return; } } else { // return if no video found - retryFetch(id); + retryFetch(); return; } @@ -625,7 +625,7 @@ async function sponsorsLookup(id: string) { sponsorLookupRetries = 0; } else if (response?.status === 404) { - retryFetch(id); + retryFetch(); } else if (sponsorLookupRetries < 15 && !recheckStarted) { recheckStarted = true; @@ -638,7 +638,7 @@ async function sponsorsLookup(id: string) { }); } -function retryFetch(id: string): void { +function retryFetch(): void { if (!Config.config.refetchWhenNotFound) return; sponsorDataFound = false; @@ -649,7 +649,11 @@ function retryFetch(id: string): void { //if less than 3 days old if (Date.now() - new Date(dateUploaded).getTime() < 259200000) { - setTimeout(() => sponsorsLookup(id), 30000 + Math.random() * 90000); + setTimeout(() => { + if (sponsorVideoID && sponsorTimes?.length === 0) { + sponsorsLookup(sponsorVideoID); + } + }, 10000 + Math.random() * 30000); } }); From a9a85d9816750427bc36a927808ea347bdb47bcf Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Mon, 31 May 2021 14:33:17 -0400 Subject: [PATCH 13/44] Clean segment recieving code --- src/content.ts | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/content.ts b/src/content.ts index d3d44a78..5f43ae75 100644 --- a/src/content.ts +++ b/src/content.ts @@ -568,25 +568,15 @@ async function sponsorsLookup(id: string) { categories }).then(async (response: FetchResponse) => { if (response?.ok) { - let result = JSON.parse(response.responseText); - result = result.filter((video) => video.videoID === id); - if (result.length > 0) { - result = result[0].segments; - if (result.length === 0) { // return if no segments found - retryFetch(); - return; - } - } else { // return if no video found + const recievedSegments: SponsorTime[] = JSON.parse(response.responseText) + ?.filter((video) => video.videoID === id) + ?.map((video) => video.segments)[0]; + if (!recievedSegments || !recievedSegments.length) { + // return if no video found retryFetch(); return; } - const recievedSegments: SponsorTime[] = result; - if (!recievedSegments.length) { - console.error("[SponsorBlock] Server returned malformed response: " + JSON.stringify(recievedSegments)); - return; - } - sponsorDataFound = true; // Check if any old submissions should be kept From 42fa6c44c4c885543812da9d79406df38ce23e68 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Mon, 31 May 2021 14:37:12 -0400 Subject: [PATCH 14/44] Prevent retry fetching in another place https://github.com/ajayyy/SponsorBlock/issues/667 --- src/content.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/content.ts b/src/content.ts index 5f43ae75..8154e99e 100644 --- a/src/content.ts +++ b/src/content.ts @@ -621,7 +621,11 @@ async function sponsorsLookup(id: string) { //TODO lower when server becomes better (back to 1 second) //some error occurred, try again in a second - setTimeout(() => sponsorsLookup(id), 5000 + Math.random() * 15000 + 5000 * sponsorLookupRetries); + setTimeout(() => { + if (sponsorVideoID && sponsorTimes?.length === 0) { + sponsorsLookup(sponsorVideoID); + } + }, 5000 + Math.random() * 15000 + 5000 * sponsorLookupRetries); sponsorLookupRetries++; } From 9478bfe6a4b17886401ae609ced5e5a95969194c Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Mon, 31 May 2021 14:45:39 -0400 Subject: [PATCH 15/44] Don't crash if bar types are missing --- src/components/CategorySkipOptionsComponent.tsx | 4 ++-- src/js-components/previewBar.ts | 2 +- src/popup.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/CategorySkipOptionsComponent.tsx b/src/components/CategorySkipOptionsComponent.tsx index 3cc03527..a59e3f54 100644 --- a/src/components/CategorySkipOptionsComponent.tsx +++ b/src/components/CategorySkipOptionsComponent.tsx @@ -21,8 +21,8 @@ class CategorySkipOptionsComponent extends React.Component { const categoryColorCircle = document.createElement("span"); categoryColorCircle.id = "sponsorTimesCategoryColorCircle" + UUID; - categoryColorCircle.style.backgroundColor = Config.config.barTypes[segmentTimes[i].category].color; + categoryColorCircle.style.backgroundColor = Config.config.barTypes[segmentTimes[i].category]?.color; categoryColorCircle.classList.add("dot"); categoryColorCircle.classList.add("sponsorTimesCategoryColorCircle"); From 2e1b17f8bdeba7c3242ab8575234f46908e66ad1 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Mon, 31 May 2021 14:48:03 -0400 Subject: [PATCH 16/44] Refresh segments when creating new segment to submit --- src/content.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/content.ts b/src/content.ts index 8154e99e..a9e92f10 100644 --- a/src/content.ts +++ b/src/content.ts @@ -589,6 +589,7 @@ async function sponsorsLookup(id: string) { } } + const oldSegments = sponsorTimes; sponsorTimes = recievedSegments; // Hide all submissions smaller than the minimum duration @@ -600,6 +601,15 @@ async function sponsorsLookup(id: string) { } } + 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; + } + } + startSkipScheduleCheckingForStartSponsors(); // Reset skip save @@ -1181,6 +1191,9 @@ function startOrEndTimingNewSegment() { // Save the newly created segment Config.config.segmentTimes.set(sponsorVideoID, sponsorTimesSubmitting); + // Make sure they know if someone has already submitted something it while they were watching + sponsorsLookup(sponsorVideoID); + updateEditButtonsOnPlayer(); updateSponsorTimesSubmitting(false); } From df48705b67e4b4f9386c05098075865223447367 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Tue, 1 Jun 2021 23:19:26 -0400 Subject: [PATCH 17/44] Increase version number --- manifest/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest/manifest.json b/manifest/manifest.json index e85d881f..a3d31e9b 100644 --- a/manifest/manifest.json +++ b/manifest/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_fullName__", "short_name": "SponsorBlock", - "version": "2.0.16.2", + "version": "2.0.17", "default_locale": "en", "description": "__MSG_Description__", "content_scripts": [{ From d2847c6a77bf2a627574b76c784507cf7c660f75 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Tue, 8 Jun 2021 22:13:57 -0400 Subject: [PATCH 18/44] Changes to preview bar --- src/content.ts | 2 +- src/js-components/previewBar.ts | 19 ++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/content.ts b/src/content.ts index a9e92f10..26318c45 100644 --- a/src/content.ts +++ b/src/content.ts @@ -761,7 +761,7 @@ function getYouTubeVideoID(url: string) { */ function updatePreviewBarPositionMobile(parent: HTMLElement) { if (document.getElementById("previewbar") === null) { - previewBar.updatePosition(parent); + previewBar.createElement(parent); } } diff --git a/src/js-components/previewBar.ts b/src/js-components/previewBar.ts index 67d28c1a..0235727e 100644 --- a/src/js-components/previewBar.ts +++ b/src/js-components/previewBar.ts @@ -1,5 +1,5 @@ /* -This is based on code from VideoSegments. +Parts of this are inspired from code from VideoSegments, but rewritten and under the LGPLv3 license https://github.com/videosegments/videosegments/commits/f1e111bdfe231947800c6efdd51f62a4e7fef4d4/segmentsbar/segmentsbar.js */ @@ -37,7 +37,7 @@ class PreviewBar { this.onMobileYouTube = onMobileYouTube; this.onInvidious = onInvidious; - this.updatePosition(parent); + this.createElement(parent); this.setupHoverText(); } @@ -134,7 +134,7 @@ class PreviewBar { }); } - updatePosition(parent: HTMLElement): void { + createElement(parent: HTMLElement): void { this.parent = parent; if (this.onMobileYouTube) { @@ -148,16 +148,6 @@ class PreviewBar { this.parent.prepend(this.container); } - // TODO: call on config changes - updateColor(segmentType: string, color: string, opacity: number): void { - const bars = > document.querySelectorAll('[data-vs-segment-type=' + segmentType + ']'); - - for (const bar of bars) { - bar.style.backgroundColor = color; - bar.style.opacity = String(opacity); - } - } - clear(): void { this.videoDuration = 0; this.segments = []; @@ -169,7 +159,6 @@ class PreviewBar { set(segments: PreviewBarSegment[], videoDuration: number): void { this.clear(); - if (!segments) return; this.segments = segments; @@ -195,7 +184,7 @@ class PreviewBar { bar.setAttribute('data-vs-segment-type', barSegmentType); bar.style.backgroundColor = Config.config.barTypes[barSegmentType]?.color; - if (!this.onMobileYouTube) bar.style.opacity = Config.config.barTypes[barSegmentType].opacity; + if (!this.onMobileYouTube) bar.style.opacity = Config.config.barTypes[barSegmentType]?.opacity; bar.style.position = "absolute"; bar.style.width = this.timeToPercentage(segment[1] - segment[0]); From 919b72a5900d5263e914169b64f178ea18950307 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Tue, 8 Jun 2021 22:29:58 -0400 Subject: [PATCH 19/44] Change to LGPL https://github.com/ajayyy/SponsorBlock/issues/721 --- LICENSE | 832 +++++++++++--------------------------------------------- 1 file changed, 160 insertions(+), 672 deletions(-) diff --git a/LICENSE b/LICENSE index 61e854aa..4d49f81f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,679 +1,167 @@ SponsorBlock Copyright (C) 2019 Ajay Ramachandran and other SponsorBlock contributors. -Please refer to the license below. - - GNU GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. From 97b6e0ee42171353af0c1b8e22de9abfcaa4e02b Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 9 Jun 2021 13:31:26 -0400 Subject: [PATCH 20/44] Change variable names --- src/js-components/previewBar.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js-components/previewBar.ts b/src/js-components/previewBar.ts index 0235727e..14fde89f 100644 --- a/src/js-components/previewBar.ts +++ b/src/js-components/previewBar.ts @@ -179,12 +179,12 @@ class PreviewBar { bar.classList.add('previewbar'); bar.innerHTML = ' '; - const barSegmentType = (preview ? 'preview-' : '') + category; + const fullCategoryName = (preview ? 'preview-' : '') + category; - bar.setAttribute('data-vs-segment-type', barSegmentType); + bar.setAttribute('sponsorblock-category', fullCategoryName); - bar.style.backgroundColor = Config.config.barTypes[barSegmentType]?.color; - if (!this.onMobileYouTube) bar.style.opacity = Config.config.barTypes[barSegmentType]?.opacity; + bar.style.backgroundColor = Config.config.barTypes[fullCategoryName]?.color; + if (!this.onMobileYouTube) bar.style.opacity = Config.config.barTypes[fullCategoryName]?.opacity; bar.style.position = "absolute"; bar.style.width = this.timeToPercentage(segment[1] - segment[0]); From 4932fc6f45f58f4dbd90d24377336ff100999f17 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 9 Jun 2021 14:26:20 -0400 Subject: [PATCH 21/44] Fix skipping on Firefox for Android Resolves https://github.com/ajayyy/SponsorBlock/issues/659 and https://github.com/ajayyy/SponsorBlock/issues/588 --- README.md | 2 ++ package.json | 2 ++ src/content.ts | 82 ++++++++++++++++++++++++++++++++------------------ 3 files changed, 56 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 0a404c57..48398c67 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,8 @@ The result is in `dist`. This can be loaded as an unpacked extension Run `npm run dev` to run the extension using a clean browser profile with hot reloading. Use `npm run dev:firefox` for Firefox. This uses [`web-ext run`](https://extensionworkshop.com/documentation/develop/web-ext-command-reference/#commands). Known chromium bug: Extension is not loaded properly on first start. Visit `chrome://extensions/` and reload the extension. +For Firefox for Android, use `npm run dev:firefox-android --adb-device `. See the [Firefox documentation](https://extensionworkshop.com/documentation/develop/developing-extensions-for-firefox-for-android/#debug-your-extension) for more information. + ### Attribution Generation If you contribute and add a dependency, update the attribution file using the following steps: diff --git a/package.json b/package.json index 36161a3d..c127356f 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "web-run": "npm run web-run:chrome", "web-sign": "web-ext sign -s dist", "web-run:firefox": "cd dist && web-ext run --start-url https://addons.mozilla.org/firefox/addon/ublock-origin/", + "web-run:firefox-android": "cd dist && web-ext run -t firefox-android --firefox-apk org.mozilla.fenix", "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", @@ -50,6 +51,7 @@ "build:watch:firefox": "webpack --env.browser=firefox --config webpack/webpack.dev.js --watch", "dev": "npm run build:dev && concurrently \"npm run web-run\" \"npm run build:watch\"", "dev:firefox": "npm run build:dev:firefox && concurrently \"npm run web-run:firefox\" \"npm run build:watch:firefox\"", + "dev:firefox-android": "npm run build:dev:firefox && concurrently \"npm run web-run:firefox-android\" \"npm run build:watch:firefox\"", "clean": "rimraf dist", "test": "npx jest", "lint": "eslint src", diff --git a/src/content.ts b/src/content.ts index 26318c45..4822eff1 100644 --- a/src/content.ts +++ b/src/content.ts @@ -42,6 +42,7 @@ let sponsorSkipped: boolean[] = []; //the video let video: HTMLVideoElement; +let videoMutationObserver: MutationObserver = null; // List of videos that have had event listeners added to them const videoRootsWithEventListeners: HTMLDivElement[] = []; @@ -51,9 +52,6 @@ let onMobileYouTube; //the video id of the last preview bar update let lastPreviewBarUpdate; -//whether the duration listener listening for the duration changes of the video has been setup yet -let durationListenerSetUp = false; - // Is the video currently being switched let switchingVideos = null; @@ -477,48 +475,54 @@ function incorrectVideoCheck(videoID?: string, sponsorTime?: SponsorTime): boole } } -async function sponsorsLookup(id: string) { - video = document.querySelector('video') // Youtube video player - //there is no video here - if (video == null) { - setTimeout(() => sponsorsLookup(id), 100); - return; - } +function setupMobileVideoMutationListener() { + const videoContainer = document.querySelector(".html5-video-container"); + if (!videoContainer || videoMutationObserver !== null) return; - addHotkeyListener(); + videoMutationObserver = new MutationObserver(() => { + const newVideo = document.querySelector('video'); + if (newVideo && newVideo !== video) { + video = newVideo; + setupVideoListeners(); + } + }); - if (!durationListenerSetUp) { - durationListenerSetUp = true; + videoMutationObserver.observe(videoContainer, { + attributes: true, + childList: true, + subtree: true + }); +} - //wait until it is loaded - video.addEventListener('durationchange', durationChangeListener); - } +function setupVideoListeners() { + //wait until it is loaded + video.addEventListener('durationchange', durationChangeListener); - if (!seekListenerSetUp && !Config.config.disableSkipping) { - seekListenerSetUp = true; + + if (!Config.config.disableSkipping) { switchingVideos = false; video.addEventListener('play', () => { switchingVideos = false; - + // If it is not the first event, then the only way to get to 0 is if there is a seek event // This check makes sure that changing the video resolution doesn't cause the extension to think it // gone back to the begining if (!firstEvent && video.currentTime === 0) return; firstEvent = false; - + // Check if an ad is playing updateAdFlag(); - + // Make sure it doesn't get double called with the playing event if (Math.abs(lastCheckVideoTime - video.currentTime) > 0.3 || (lastCheckVideoTime !== video.currentTime && Date.now() - lastCheckTime > 2000)) { lastCheckTime = Date.now(); lastCheckVideoTime = video.currentTime; - + startSponsorSchedule(); } - + }); video.addEventListener('playing', () => { // Make sure it doesn't get double called with the play event @@ -526,7 +530,7 @@ async function sponsorsLookup(id: string) { || (lastCheckVideoTime !== video.currentTime && Date.now() - lastCheckTime > 2000)) { lastCheckTime = Date.now(); lastCheckVideoTime = video.currentTime; - + startSponsorSchedule(); } }); @@ -535,7 +539,7 @@ async function sponsorsLookup(id: string) { // Reset lastCheckVideoTime lastCheckTime = Date.now(); lastCheckVideoTime = video.currentTime; - + startSponsorSchedule(); } }); @@ -546,12 +550,30 @@ async function sponsorsLookup(id: string) { // Reset lastCheckVideoTime lastCheckVideoTime = -1; lastCheckTime = 0; - + cancelSponsorSchedule(); }); - + startSponsorSchedule(); } +} + +async function sponsorsLookup(id: string) { + video = document.querySelector('video'); // Youtube video player + //there is no video here + if (video == null) { + setTimeout(() => sponsorsLookup(id), 100); + return; + } + + if (onMobileYouTube) setupMobileVideoMutationListener(); + + addHotkeyListener(); + + if (!seekListenerSetUp && !Config.config.disableSkipping) { + seekListenerSetUp = true; + setupVideoListeners(); + } //check database for sponsor times //made true once a setTimeout has been created to try again after a server error @@ -589,7 +611,7 @@ async function sponsorsLookup(id: string) { } } - const oldSegments = sponsorTimes; + const oldSegments = sponsorTimes || []; sponsorTimes = recievedSegments; // Hide all submissions smaller than the minimum duration @@ -1099,7 +1121,7 @@ async function createButtons(): Promise { /** Creates any missing buttons on the player and updates their visiblity. */ async function updateVisibilityOfPlayerControlsButton(): Promise { // Not on a proper video yet - if (!sponsorVideoID) return; + if (!sponsorVideoID || onMobileYouTube) return; await createButtons(); @@ -1116,7 +1138,7 @@ async function updateVisibilityOfPlayerControlsButton(): Promise { /** Updates the visibility of buttons on the player related to creating segments. */ function updateEditButtonsOnPlayer(): void { // Don't try to update the buttons if we aren't on a YouTube video page - if (!sponsorVideoID) return; + if (!sponsorVideoID || onMobileYouTube) return; const buttonsEnabled = !Config.config.hideVideoPlayerControls && !onInvidious; From 547acc89b93ab258040c2a363fb423ad69ae64fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Jun 2021 18:28:15 +0000 Subject: [PATCH 22/44] Bump normalize-url from 4.5.0 to 4.5.1 Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1. - [Release notes](https://github.com/sindresorhus/normalize-url/releases) - [Commits](https://github.com/sindresorhus/normalize-url/commits) --- updated-dependencies: - dependency-name: normalize-url dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 03c9eedd..b4957d73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12463,9 +12463,9 @@ } }, "normalize-url": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", - "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", + "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==", "dev": true }, "npm-run-path": { From dacf766b4ab30e98d2d4c2fa9f8dd24daae1c9ad Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 9 Jun 2021 14:57:24 -0400 Subject: [PATCH 23/44] Fix potential infinite loop in skip notice --- src/render/SkipNotice.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/render/SkipNotice.tsx b/src/render/SkipNotice.tsx index 526d2d1c..d259029f 100644 --- a/src/render/SkipNotice.tsx +++ b/src/render/SkipNotice.tsx @@ -24,6 +24,10 @@ class SkipNotice { //get reference node let referenceNode = document.getElementById("player-container-id") || document.getElementById("movie_player") || document.querySelector("#player-container .video-js"); + // YouTube Music + if (new URL(document.URL).host === "music.youtube.com") { + referenceNode = document.querySelector("#main-panel.ytmusic-player-page"); + } if (referenceNode == null) { //for embeds const player = document.getElementById("player"); @@ -31,16 +35,13 @@ class SkipNotice { let index = 1; //find the child that is the video player (sometimes it is not the first) - while (!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; index++; } } - // YouTube Music - if (new URL(document.URL).host === "music.youtube.com") { - referenceNode = document.querySelector("#main-panel.ytmusic-player-page"); - } + const amountOfPreviousNotices = document.getElementsByClassName("sponsorSkipNotice").length; //this is the suffix added at the end of every id From 315901f69b8de0a9913e3839ede572e10a96c553 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 9 Jun 2021 14:57:53 -0400 Subject: [PATCH 24/44] Use mutation listener on desktop too --- src/content.ts | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/content.ts b/src/content.ts index 4822eff1..c1c334ed 100644 --- a/src/content.ts +++ b/src/content.ts @@ -35,7 +35,6 @@ let channelIDInfo: ChannelIDInfo; // Skips are rescheduled every seeking event. // Skips are canceled every seeking event let currentSkipSchedule: NodeJS.Timeout = null; -let seekListenerSetUp = false /** Has the sponsor been skipped */ let sponsorSkipped: boolean[] = []; @@ -44,6 +43,7 @@ let sponsorSkipped: boolean[] = []; let video: HTMLVideoElement; let videoMutationObserver: MutationObserver = null; // List of videos that have had event listeners added to them +const videosWithEventListeners: HTMLVideoElement[] = []; const videoRootsWithEventListeners: HTMLDivElement[] = []; let onInvidious; @@ -475,17 +475,11 @@ function incorrectVideoCheck(videoID?: string, sponsorTime?: SponsorTime): boole } } -function setupMobileVideoMutationListener() { +function setupVideoMutationListener() { const videoContainer = document.querySelector(".html5-video-container"); - if (!videoContainer || videoMutationObserver !== null) return; - - videoMutationObserver = new MutationObserver(() => { - const newVideo = document.querySelector('video'); - if (newVideo && newVideo !== video) { - video = newVideo; - setupVideoListeners(); - } - }); + if (!videoContainer || videoMutationObserver !== null || onInvidious) return; + + videoMutationObserver = new MutationObserver(refreshVideoAttachments); videoMutationObserver.observe(videoContainer, { attributes: true, @@ -494,11 +488,24 @@ function setupMobileVideoMutationListener() { }); } +function refreshVideoAttachments() { + const newVideo = document.querySelector('video'); + if (newVideo && newVideo !== video) { + video = newVideo; + + addHotkeyListener(); + if (!videosWithEventListeners.includes(video)) { + videosWithEventListeners.push(video); + + setupVideoListeners(); + } + } +} + function setupVideoListeners() { //wait until it is loaded video.addEventListener('durationchange', durationChangeListener); - if (!Config.config.disableSkipping) { switchingVideos = false; @@ -559,21 +566,14 @@ function setupVideoListeners() { } async function sponsorsLookup(id: string) { - video = document.querySelector('video'); // Youtube video player - //there is no video here - if (video == null) { + if (!video) refreshVideoAttachments(); + //there is still no video here + if (!video) { setTimeout(() => sponsorsLookup(id), 100); return; } - if (onMobileYouTube) setupMobileVideoMutationListener(); - - addHotkeyListener(); - - if (!seekListenerSetUp && !Config.config.disableSkipping) { - seekListenerSetUp = true; - setupVideoListeners(); - } + setupVideoMutationListener(); //check database for sponsor times //made true once a setTimeout has been created to try again after a server error From 6a02d62ccd8f0f15f098f9467e731e42de793dcf Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 9 Jun 2021 16:53:32 -0400 Subject: [PATCH 25/44] Make options page work on mobile --- README.md | 2 +- public/options/options.css | 18 ++++-------------- public/options/options.html | 3 ++- src/components/CategoryChooserComponent.tsx | 9 ++++++--- .../CategorySkipOptionsComponent.tsx | 9 ++++++--- 5 files changed, 19 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 48398c67..7260d31f 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ The result is in `dist`. This can be loaded as an unpacked extension Run `npm run dev` to run the extension using a clean browser profile with hot reloading. Use `npm run dev:firefox` for Firefox. This uses [`web-ext run`](https://extensionworkshop.com/documentation/develop/web-ext-command-reference/#commands). Known chromium bug: Extension is not loaded properly on first start. Visit `chrome://extensions/` and reload the extension. -For Firefox for Android, use `npm run dev:firefox-android --adb-device `. See the [Firefox documentation](https://extensionworkshop.com/documentation/develop/developing-extensions-for-firefox-for-android/#debug-your-extension) for more information. +For Firefox for Android, use `npm run dev:firefox-android -- --adb-device `. See the [Firefox documentation](https://extensionworkshop.com/documentation/develop/developing-extensions-for-firefox-for-android/#debug-your-extension) for more information. ### Attribution Generation diff --git a/public/options/options.css b/public/options/options.css index 971c6893..27cb1174 100644 --- a/public/options/options.css +++ b/public/options/options.css @@ -268,23 +268,13 @@ p,li { padding: 10px; } -p,li,code,a { - max-width: 60%; - text-align: left; - overflow-wrap: break-word; -} - @media screen and (orientation:portrait) { - p,li,code,a { + #options { max-width: 100%; } - - .projectPreviewImage { - position: unset; - width: 130px; - display: block; - margin: auto; - transform: none; + + .previewColorOption { + display: none; } } diff --git a/public/options/options.html b/public/options/options.html index 9daef3b3..5feb6ba9 100644 --- a/public/options/options.html +++ b/public/options/options.html @@ -3,7 +3,8 @@ Options - SponsorBlock - + + diff --git a/src/components/CategoryChooserComponent.tsx b/src/components/CategoryChooserComponent.tsx index bb86e10f..91a395a0 100644 --- a/src/components/CategoryChooserComponent.tsx +++ b/src/components/CategoryChooserComponent.tsx @@ -34,15 +34,18 @@ class CategoryChooserComponent extends React.Component - + {chrome.i18n.getMessage("skipOption")} - + {chrome.i18n.getMessage("seekBarColor")} - + {chrome.i18n.getMessage("previewColor")} diff --git a/src/components/CategorySkipOptionsComponent.tsx b/src/components/CategorySkipOptionsComponent.tsx index a59e3f54..cc68cd5a 100644 --- a/src/components/CategorySkipOptionsComponent.tsx +++ b/src/components/CategorySkipOptionsComponent.tsx @@ -56,7 +56,8 @@ class CategorySkipOptionsComponent extends React.Component - + - + Date: Wed, 9 Jun 2021 16:54:16 -0400 Subject: [PATCH 26/44] Increase version number --- manifest/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest/manifest.json b/manifest/manifest.json index a3d31e9b..d9b3d039 100644 --- a/manifest/manifest.json +++ b/manifest/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_fullName__", "short_name": "SponsorBlock", - "version": "2.0.17", + "version": "2.0.17.1", "default_locale": "en", "description": "__MSG_Description__", "content_scripts": [{ From 34f4b14672eb1596bc232eb8ddaa18e667673beb Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 9 Jun 2021 19:22:02 -0400 Subject: [PATCH 27/44] Remove unused config values --- src/config.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/config.ts b/src/config.ts index b555f3ae..a80d667d 100644 --- a/src/config.ts +++ b/src/config.ts @@ -428,6 +428,14 @@ function migrateOldFormats(config: SBConfig) { chrome.storage.sync.remove("sponsorTimes"); } + + // Remove some old unused options + if (config["sponsorVideoID"] !== undefined) { + chrome.storage.sync.remove("sponsorVideoID"); + } + if (config["previousVideoID"] !== undefined) { + chrome.storage.sync.remove("previousVideoID"); + } } async function setupConfig() { From d5addb524f5a18639cf9d71435993df2d8fb7e0c Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 9 Jun 2021 20:05:09 -0400 Subject: [PATCH 28/44] Try to get GitHub to recognise license --- LICENSE | 2 -- 1 file changed, 2 deletions(-) diff --git a/LICENSE b/LICENSE index 4d49f81f..0a041280 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,3 @@ -SponsorBlock Copyright (C) 2019 Ajay Ramachandran and other SponsorBlock contributors. - GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 From 5ef890cbee90dba3a0dbf905d90b64718345884d Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 9 Jun 2021 20:06:30 -0400 Subject: [PATCH 29/44] Add back header --- LICENSE | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LICENSE b/LICENSE index 0a041280..971ae0c2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,5 @@ +SponsorBlock Copyright (C) 2019+ Ajay Ramachandran and other SponsorBlock contributors. + GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 From 91959176f5904233c98177e7af4dc002f0f633c3 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Wed, 9 Jun 2021 20:07:03 -0400 Subject: [PATCH 30/44] Revert "Add back header" This reverts commit 5ef890cbee90dba3a0dbf905d90b64718345884d. --- LICENSE | 2 -- 1 file changed, 2 deletions(-) diff --git a/LICENSE b/LICENSE index 971ae0c2..0a041280 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,3 @@ -SponsorBlock Copyright (C) 2019+ Ajay Ramachandran and other SponsorBlock contributors. - GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 From 12f42d12b98c4c25dfc5b041c00be3c879d5b5ad Mon Sep 17 00:00:00 2001 From: Atrate Date: Thu, 10 Jun 2021 21:14:57 +0200 Subject: [PATCH 31/44] Update README after license change The README's license section has not been updated after the change to the LGPL. This PR fixes that. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7260d31f..4b637bdf 100644 --- a/README.md +++ b/README.md @@ -102,4 +102,4 @@ Icons made by: ### License -This project is licensed under GNU GPL v3 or any later version +This project is licensed under GNU LGPL v3 or any later version From c3e1cfa04c333649ee7dcb1feb48eeeccdfead08 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Thu, 10 Jun 2021 16:58:55 -0400 Subject: [PATCH 32/44] Add note about newleaf --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b637bdf..b281254f 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ mv ./oss-attribution/attribution.txt ./public/oss-attribution/attribution.txt # Credit -The awesome [Invidious API](https://github.com/omarroth/invidious/wiki/API) was previously used. +The awesome [Invidious API](https://github.com/omarroth/invidious/wiki/API) was previously used, and the server is now using [NewLeaf](https://git.sr.ht/~cadence/NewLeaf) as a to get video info from YouTube. Originally forked from [YTSponsorSkip](https://github.com/NDevTK/YTSponsorSkip), but very little code remains. From b0400f98bec31ec9dddb420495c86df73e301e1b Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Fri, 11 Jun 2021 00:50:38 -0400 Subject: [PATCH 33/44] Add better hotkey detection --- src/content.ts | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/content.ts b/src/content.ts index c1c334ed..13843746 100644 --- a/src/content.ts +++ b/src/content.ts @@ -44,7 +44,6 @@ let video: HTMLVideoElement; let videoMutationObserver: MutationObserver = null; // List of videos that have had event listeners added to them const videosWithEventListeners: HTMLVideoElement[] = []; -const videoRootsWithEventListeners: HTMLDivElement[] = []; let onInvidious; let onMobileYouTube; @@ -77,6 +76,7 @@ const playerButtons: Record Config.config !== null, 1000, 1).then(() => videoIDChange(getYouTubeVideoID(document.URL))); +addHotkeyListener(); //the amount of times the sponsor lookup has retried //this only happens if there is an error @@ -493,7 +493,6 @@ function refreshVideoAttachments() { if (newVideo && newVideo !== video) { video = newVideo; - addHotkeyListener(); if (!videosWithEventListeners.includes(video)) { videosWithEventListeners.push(video); @@ -1563,21 +1562,14 @@ function getSegmentsMessage(sponsorTimes: SponsorTime[]): string { return sponsorTimesMessage; } -function addHotkeyListener(): boolean { - let videoRoot = document.getElementById("movie_player") as HTMLDivElement; - if (onInvidious) videoRoot = (document.getElementById("player-container") ?? document.getElementById("player")) as HTMLDivElement; - if (video.baseURI.startsWith("https://www.youtube.com/tv#/")) videoRoot = document.querySelector("ytlr-watch-page") as HTMLDivElement; - - if (videoRoot && !videoRootsWithEventListeners.includes(videoRoot)) { - videoRoot.addEventListener("keydown", hotkeyListener); - videoRootsWithEventListeners.push(videoRoot); - return true; - } - - return false; +function addHotkeyListener(): void { + document.addEventListener("keydown", hotkeyListener); } function hotkeyListener(e: KeyboardEvent): void { + if (["textarea", "input"].includes(document.activeElement?.tagName?.toLowerCase()) + || document.activeElement?.id?.toLowerCase()?.includes("editable")) return; + const key = e.key; const skipKey = Config.config.skipKeybind; From ac037c6f08c0f7978841d6749c1da91ea72ad19e Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Fri, 11 Jun 2021 13:28:42 -0400 Subject: [PATCH 34/44] Make get_video_info work again Resolve https://github.com/ajayyy/SponsorBlock/issues/751 for now Potentially helps with https://github.com/ajayyy/SponsorBlock/issues/766 and https://github.com/ajayyy/SponsorBlock/issues/753 --- src/content.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/content.ts b/src/content.ts index 13843746..6ce82711 100644 --- a/src/content.ts +++ b/src/content.ts @@ -721,7 +721,7 @@ function startSkipScheduleCheckingForStartSponsors() { * Get the video info for the current tab from YouTube */ async function getVideoInfo(): Promise { - const result = await utils.asyncRequestToCustomServer("GET", "https://www.youtube.com/get_video_info?video_id=" + sponsorVideoID); + const result = await utils.asyncRequestToCustomServer("GET", "https://www.youtube.com/get_video_info?video_id=" + sponsorVideoID + "&html5=1"); if (result.ok) { const decodedData = decodeURIComponent(result.responseText).match(/player_response=([^&]*)/)[1]; @@ -834,16 +834,19 @@ function updatePreviewBar(): void { async function whitelistCheck() { const whitelistedChannels = Config.config.whitelistedChannels; - const channelID = document.querySelector(".ytd-channel-name a")?.getAttribute("href")?.replace(/\/.+\//, "") // YouTube + const getChannelID = () => videoInfo?.videoDetails?.channelId + ?? document.querySelector(".ytd-channel-name a")?.getAttribute("href")?.replace(/\/.+\//, "") // YouTube ?? document.querySelector(".ytp-title-channel-logo")?.getAttribute("href")?.replace(/https:\/.+\//, "") // YouTube Embed ?? document.querySelector("a > .channel-profile")?.parentElement?.getAttribute("href")?.replace(/\/.+\//, ""); // Invidious - if (channelID) { + try { + await utils.wait(() => !!getChannelID(), 6000, 20); + channelIDInfo = { status: ChannelIDStatus.Found, - id: channelID + id: getChannelID() } - } else { + } catch (e) { channelIDInfo = { status: ChannelIDStatus.Failed, id: null @@ -853,7 +856,7 @@ async function whitelistCheck() { } //see if this is a whitelisted channel - if (whitelistedChannels != undefined && whitelistedChannels.includes(channelID)) { + if (whitelistedChannels != undefined && whitelistedChannels.includes(getChannelID())) { channelWhitelisted = true; } From 8d9b6e8c1e9fbec7e749bc9aef307726d9480ccc Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Fri, 11 Jun 2021 13:58:40 -0400 Subject: [PATCH 35/44] Grow preview bar when the bar is hovered Only for non chapter videos --- public/content.css | 6 ++++++ src/js-components/previewBar.ts | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/public/content.css b/public/content.css index a9a6c6eb..4af5e567 100644 --- a/public/content.css +++ b/public/content.css @@ -9,6 +9,12 @@ height: 100%; transform: scaleY(0.6) translateY(-30%) translateY(1.5px); z-index: 40; + + transition: transform .1s cubic-bezier(0,0,0.2,1); +} + +#previewbar.hovered { + transform: scaleY(1) } .previewbar { diff --git a/src/js-components/previewBar.ts b/src/js-components/previewBar.ts index 14fde89f..514fc390 100644 --- a/src/js-components/previewBar.ts +++ b/src/js-components/previewBar.ts @@ -142,8 +142,15 @@ class PreviewBar { parent.style.opacity = "1"; this.container.style.transform = "none"; + } else if (!this.onInvidious) { + // Hover listener + this.parent.addEventListener("mouseenter", () => this.container.classList.add("hovered")); + + this.parent.addEventListener("mouseleave", () => this.container.classList.remove("hovered")); } + + // On the seek bar this.parent.prepend(this.container); } From 29b29e3f6e817f8cce2ccc2c9177ccc2779c2ddd Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Fri, 11 Jun 2021 17:55:24 -0400 Subject: [PATCH 36/44] Add type to getYouTubeVideoID --- src/content.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content.ts b/src/content.ts index 6ce82711..ac517c72 100644 --- a/src/content.ts +++ b/src/content.ts @@ -735,7 +735,7 @@ async function getVideoInfo(): Promise { } } -function getYouTubeVideoID(url: string) { +function getYouTubeVideoID(url: string): string | boolean { // For YouTube TV support if(url.startsWith("https://www.youtube.com/tv#/")) url = url.replace("#", ""); From 8cb212a77bc4cb88dcbd9e841d5397c5b6443609 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Fri, 11 Jun 2021 18:17:40 -0400 Subject: [PATCH 37/44] Allow not counting time in private tabs Closes https://github.com/ajayyy/SponsorBlock/issues/703 --- public/_locales/en/messages.json | 3 +++ public/options/options.html | 13 +++++++++++++ src/config.ts | 2 ++ src/content.ts | 4 ++-- src/options.ts | 9 +++++++++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json index d2b49402..a48335e6 100644 --- a/public/_locales/en/messages.json +++ b/public/_locales/en/messages.json @@ -200,6 +200,9 @@ "whatViewTracking": { "message": "This feature tracks which segments you have skipped to let users know how much their submission has helped others and used as a metric along with upvotes to ensure that spam doesn't get into the database. The extension sends a message to the server each time you skip a segment. Hopefully most people don't change this setting so that the view numbers are accurate. :)" }, + "enableViewTrackingInPrivate": { + "message": "Enable Skip Count Tracking In Private/Incognito tabs" + }, "enableQueryByHashPrefix": { "message": "Query By Hash Prefix" }, diff --git a/public/options/options.html b/public/options/options.html index 5feb6ba9..6b5bb717 100644 --- a/public/options/options.html +++ b/public/options/options.html @@ -310,6 +310,19 @@

+
+ + +
+
+
+
+
From a12ef41060a1331c713cd11947bc5a39ded210cf Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Fri, 18 Jun 2021 00:42:30 -0400 Subject: [PATCH 44/44] Make options page text copy pastable and searchable --- public/options/options.css | 12 +++++- public/options/options.html | 84 ++++++++++++++++++++++++++++++------- 2 files changed, 78 insertions(+), 18 deletions(-) diff --git a/public/options/options.css b/public/options/options.css index 27cb1174..ddce689c 100644 --- a/public/options/options.css +++ b/public/options/options.css @@ -66,14 +66,22 @@ body { display: inline-block; } -.switch-container:after { +.switch-container { content: attr(label-name); position: absolute; - padding: 4px; width: max-content; font-size: 14px; color: white; + + display: table; +} + +.switch-container .switch-label { + display: table-cell; + vertical-align: middle; + + padding: 4px; } .text-label-container { diff --git a/public/options/options.html b/public/options/options.html index 7d2a4397..c7a3578b 100644 --- a/public/options/options.html +++ b/public/options/options.html @@ -33,19 +33,23 @@
-

@@ -151,7 +155,7 @@
-