From 41a0c12139f1b246319e3b5ffca4dd9eda7c386e Mon Sep 17 00:00:00 2001 From: TotalCaesar659 <14265316+TotalCaesar659@users.noreply.github.com> Date: Tue, 23 Mar 2021 22:10:14 +0300 Subject: [PATCH 01/10] Update URLs to HTTPS --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a4af4c9f..90df4d5f 100644 --- a/README.md +++ b/README.md @@ -98,8 +98,8 @@ The awesome [Invidious API](https://github.com/omarroth/invidious/wiki/API) was Originally forked from [YTSponsorSkip](https://github.com/NDevTK/YTSponsorSkip), but zero code remains. Icons made by: -* Gregor Cresnar from www.flaticon.com and are licensed by CC 3.0 BY -* Freepik from www.flaticon.com and are licensed by CC 3.0 BY +* Gregor Cresnar from www.flaticon.com and are licensed by CC 3.0 BY +* Freepik from www.flaticon.com and are licensed by CC 3.0 BY * Alexander Kahlkopf from iconmonstr.com and are licensed by iconmonstr License From 9b502b282f232560df4820870f48045a40ea7402 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Tue, 23 Mar 2021 19:48:47 -0400 Subject: [PATCH 02/10] New Crowdin updates (#694) * New translations messages.json (Polish) * New translations messages.json (Ukrainian) --- public/_locales/pl/messages.json | 8 ++++---- public/_locales/uk/messages.json | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/public/_locales/pl/messages.json b/public/_locales/pl/messages.json index 39890032..5544f8ba 100644 --- a/public/_locales/pl/messages.json +++ b/public/_locales/pl/messages.json @@ -95,7 +95,7 @@ "message": "Wystąpił błąd połączenia. Kod błędu: " }, "wantToSubmit": { - "message": "Czy chcesz wysłać dla video o id" + "message": "Czy chcesz wysłać dla filmu o id" }, "clearTimes": { "message": "Wyczyść segmenty" @@ -131,10 +131,10 @@ "message": "Ranking" }, "recordTimesDescription": { - "message": "Prześlij" + "message": "Wyślij" }, "submissionEditHint": { - "message": "Edycja sekcji pojawi się po kliknięciu „Wyślij”", + "message": "Edycja sekcji pojawi się po wciśnięciu „Wyślij”", "description": "Appears in the popup to inform them that editing has been moved to the video player." }, "popupHint": { @@ -517,7 +517,7 @@ "message": "Muzyka: Sekcja niemuzyczna" }, "category_music_offtopic_description": { - "message": "Do użytku tylko na filmach muzycznych. Powinno to być używane jedynie do tych sekcji filmów muzycznych, które nie są uwzględnione w innej kategorii." + "message": "Do użytku jedynie w filmach muzycznych. Powinno to być używane jedynie do tych sekcji filmów muzycznych, które nie są uwzględnione w innej kategorii." }, "category_music_offtopic_short": { "message": "Bez muzyki" diff --git a/public/_locales/uk/messages.json b/public/_locales/uk/messages.json index ecf85ecb..f1741637 100644 --- a/public/_locales/uk/messages.json +++ b/public/_locales/uk/messages.json @@ -516,6 +516,9 @@ "category_music_offtopic": { "message": "Музика: Сегмент без музики" }, + "category_music_offtopic_description": { + "message": "Тільки для використання в музичних кліпах. Використовується для сегментів музичних кліпів, які не належать до іншої категорії." + }, "category_music_offtopic_short": { "message": "Без музики" }, From 44c48ecfcc878df547a5d16c458c0ddfeecba2c5 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Tue, 23 Mar 2021 19:49:10 -0400 Subject: [PATCH 03/10] Increase version --- manifest/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest/manifest.json b/manifest/manifest.json index 393f5011..903abe4f 100644 --- a/manifest/manifest.json +++ b/manifest/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_fullName__", "short_name": "SponsorBlock", - "version": "2.0.13", + "version": "2.0.13.1", "default_locale": "en", "description": "__MSG_Description__", "content_scripts": [{ From cd521374548f98c8c4f41967653fa97641d5efcb Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Tue, 23 Mar 2021 20:36:03 -0400 Subject: [PATCH 04/10] Update README.md --- README.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 90df4d5f..2abfd8d2 100644 --- a/README.md +++ b/README.md @@ -50,14 +50,10 @@ See the [Wiki](https://github.com/ajayyy/SponsorBlock/wiki) for important links. The backend server code is available here: https://github.com/ajayyy/SponsorBlockServer -It is a simple SQLite database that will hold all the timing data. - -To make sure that this project doesn't die, I have made the database publicly downloadable at https://sponsor.ajay.app/database.db ([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. +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). -A [previous project](https://github.com/Sponsoff/sponsorship_remover) attempted to create a neural network to predict when sponsored segments happen. That project is sadly abandoned now, so I have decided to attempt to revive this idea starting from a crowd-sourced system instead. - # API You can read the API docs [here](https://github.com/ajayyy/SponsorBlockServer#api-docs). @@ -79,7 +75,6 @@ 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. - ### Attribution Generation If you contribute and add a dependency, update the attribution file using the following steps: @@ -95,7 +90,7 @@ mv ./oss-attribution/attribution.txt ./public/oss-attribution/attribution.txt The awesome [Invidious API](https://github.com/omarroth/invidious/wiki/API) was previously used. -Originally forked from [YTSponsorSkip](https://github.com/NDevTK/YTSponsorSkip), but zero code remains. +Originally forked from [YTSponsorSkip](https://github.com/NDevTK/YTSponsorSkip), but very little code remains. Icons made by: * Gregor Cresnar from www.flaticon.com and are licensed by CC 3.0 BY @@ -105,4 +100,4 @@ Icons made by: ### License -This project is licensed under GNU GPL v3 +This project is licensed under GNU GPL v3 or any later version From 80d014bc297be7b1f49eac096a51c8fb74689396 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Tue, 23 Mar 2021 20:38:04 -0400 Subject: [PATCH 05/10] Fix shields --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2abfd8d2..8e7d2070 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Badge Badge Badge - Badge + Badge Badge

From 1eb1574943b22d8a3a6b9c5ab22373d04f19284c Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Tue, 23 Mar 2021 20:38:48 -0400 Subject: [PATCH 06/10] Fix shields --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e7d2070..83ff4565 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Badge Badge Badge - Badge + Badge Badge

From b63054570215464aa69b8a5b1e99c691c61a43e4 Mon Sep 17 00:00:00 2001 From: TotalCaesar659 <14265316+TotalCaesar659@users.noreply.github.com> Date: Thu, 25 Mar 2021 03:40:31 +0300 Subject: [PATCH 07/10] Update URLs to HTTPS --- public/help/index_en.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/help/index_en.html b/public/help/index_en.html index 112e9568..7eaabf6a 100644 --- a/public/help/index_en.html +++ b/public/help/index_en.html @@ -131,9 +131,9 @@

The awesome Invidious API is used to grab the time the video was published.

-

Some icons made by Gregor Cresnar from www.flaticon.com and are licensed by CC 3.0 BY

+

Some icons made by Gregor Cresnar from www.flaticon.com and are licensed by CC 3.0 BY

-

Some icons made by Freepik from www.flaticon.com and are licensed by CC 3.0 BY

+

Some icons made by Freepik from www.flaticon.com and are licensed by CC 3.0 BY

Open Source Licenses

From 928c075416ee1ca9b710c9396be97a4a1117a753 Mon Sep 17 00:00:00 2001 From: Manual Date: Fri, 26 Mar 2021 12:00:47 +0200 Subject: [PATCH 08/10] fix exception when on youtube.com/tv --- src/content.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/content.ts b/src/content.ts index ba1bd757..6bbbc46e 100644 --- a/src/content.ts +++ b/src/content.ts @@ -1530,6 +1530,7 @@ function getSegmentsMessage(sponsorTimes: SponsorTime[]): string { 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 (!videoRootsWithEventListeners.includes(videoRoot)) { videoRoot.addEventListener("keydown", hotkeyListener); From 719010db976334cdefad436f36e6fc651895c901 Mon Sep 17 00:00:00 2001 From: Manual Date: Sat, 27 Mar 2021 00:08:02 +0200 Subject: [PATCH 09/10] =?UTF-8?q?Don=E2=80=99t=20throw=20an=20exception=20?= =?UTF-8?q?if=20there=E2=80=99s=20no=20videoRoot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suggested change by @ajayyy Co-authored-by: Ajay Ramachandran --- src/content.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content.ts b/src/content.ts index 6bbbc46e..33842dd3 100644 --- a/src/content.ts +++ b/src/content.ts @@ -1532,7 +1532,7 @@ function addHotkeyListener(): boolean { 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 (!videoRootsWithEventListeners.includes(videoRoot)) { + if (videoRoot && !videoRootsWithEventListeners.includes(videoRoot)) { videoRoot.addEventListener("keydown", hotkeyListener); videoRootsWithEventListeners.push(videoRoot); return true; From 0b560f3fbc4644278f5b7af040bdfa75c5bd9aa0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Mar 2021 10:39:17 +0000 Subject: [PATCH 10/10] Bump y18n from 4.0.0 to 4.0.1 Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) 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 24535d48..7041ec66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16734,9 +16734,9 @@ "dev": true }, "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz", + "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==" }, "yallist": { "version": "3.1.1",