From ba1bf4ba205def6b3c57c243f620baecfe4b9695 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Mon, 28 Nov 2022 02:05:32 +0100
Subject: [PATCH 001/301] Make the auto merge workflow compatible with draft
 PRs (#2896)

---
 .github/workflows/autoMerge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/autoMerge.yml b/.github/workflows/autoMerge.yml
index dc6ced128b2c..a5391e724555 100644
--- a/.github/workflows/autoMerge.yml
+++ b/.github/workflows/autoMerge.yml
@@ -1,7 +1,7 @@
 name: Auto Merge PR
 on:
   pull_request_target:
-    types: [opened, synchronize, reopened, auto_merge_disabled]
+    types: [opened, synchronize, reopened, auto_merge_disabled, ready_for_review]
 
 jobs:
   build:
@@ -9,7 +9,7 @@ jobs:
 
     steps:
     - name: Auto Merge PR
-      if: contains(${{ github.event.pull_request.base.ref }}, 'development') || contains(${{ github.event.pull_request.base.ref }}, 'RC')
+      if: github.event.pull_request.draft == false && (contains(${{ github.event.pull_request.base.ref }}, 'development') || contains(${{ github.event.pull_request.base.ref }}, 'RC'))
       run: |
         echo ${{ secrets.PUSH_TOKEN }} >> auth.txt
         gh auth login --with-token < auth.txt

From a495ff3d641ffa41fcd61b4eafbeb4f6d6caf51a Mon Sep 17 00:00:00 2001
From: gnuhead-chieb <41156994+gnuhead-chieb@users.noreply.github.com>
Date: Mon, 28 Nov 2022 10:07:04 +0900
Subject: [PATCH 002/301] Changed to a more appropriate country name (#2895)

---
 static/geolocations/ja/countries.json | 2 +-
 static/geolocations/zh/countries.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/geolocations/ja/countries.json b/static/geolocations/ja/countries.json
index c6d1445e4849..90c9e3e80b8e 100644
--- a/static/geolocations/ja/countries.json
+++ b/static/geolocations/ja/countries.json
@@ -192,5 +192,5 @@
 {"id":426,"name":"レソト","alpha2":"ls","alpha3":"lso"},
 {"id":422,"name":"レバノン","alpha2":"lb","alpha3":"lbn"},
 {"id":643,"name":"ロシア連邦","alpha2":"ru","alpha3":"rus"},
-{"id":158,"name":"中国台湾省","alpha2":"tw","alpha3":"twn"}
+{"id":158,"name":"台湾","alpha2":"tw","alpha3":"twn"}
 ]
diff --git a/static/geolocations/zh/countries.json b/static/geolocations/zh/countries.json
index 98a3313ce4a1..e3be3f1a30b2 100644
--- a/static/geolocations/zh/countries.json
+++ b/static/geolocations/zh/countries.json
@@ -192,5 +192,5 @@
 {"id":887,"name":"也门","alpha2":"ye","alpha3":"yem"},
 {"id":894,"name":"赞比亚","alpha2":"zm","alpha3":"zmb"},
 {"id":716,"name":"津巴布韦","alpha2":"zw","alpha3":"zwe"},
-{"id":158,"name":"中国台湾省","alpha2":"tw","alpha3":"twn"}
+{"id":158,"name":"台湾","alpha2":"tw","alpha3":"twn"}
 ]

From 673dddd3bb81f30a5f704c52d3e67c663c883e9c Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Mon, 28 Nov 2022 01:41:14 +0000
Subject: [PATCH 003/301] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/zh_Hant/
---
 static/locales/zh-TW.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/zh-TW.yaml b/static/locales/zh-TW.yaml
index 81c15284a38f..bcdd37d4a074 100644
--- a/static/locales/zh-TW.yaml
+++ b/static/locales/zh-TW.yaml
@@ -197,6 +197,7 @@ Settings:
     Expand Side Bar by Default: 預設展開側邊欄
     Disable Smooth Scrolling: 停用平滑捲動
     Hide Side Bar Labels: 隱藏側邊欄標籤
+    Hide FreeTube Header Logo: 隱藏 FreeTube 標題圖示
   Player Settings:
     Player Settings: '播放器選項'
     Force Local Backend for Legacy Formats: '強制使用傳統格式的區域伺服器'

From 57f35cc0ba3c9487cf2cac3b58c84ee8d73deef2 Mon Sep 17 00:00:00 2001
From: Massimo Pissarello <mapi68@gmail.com>
Date: Mon, 28 Nov 2022 04:24:06 +0000
Subject: [PATCH 004/301] Translated using Weblate (Italian)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/it/
---
 static/locales/it.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/it.yaml b/static/locales/it.yaml
index 05e9e2948abb..d88afa7f9ab3 100644
--- a/static/locales/it.yaml
+++ b/static/locales/it.yaml
@@ -215,6 +215,7 @@ Settings:
     Disable Smooth Scrolling: Disabilita scorrimento fluido
     Expand Side Bar by Default: Espandi automaticamente la barra laterale
     Hide Side Bar Labels: Nascondi le etichette della barra laterale
+    Hide FreeTube Header Logo: Nascondi il logo dell'intestazione di FreeTube
   Player Settings:
     Player Settings: 'Impostazioni del riproduttore video'
     Force Local Backend for Legacy Formats: 'Forza riproduttore locale per formati

From 8a9a48c670243c1940d7876c765a4fad9c29f64c Mon Sep 17 00:00:00 2001
From: Logan <hello@loganthompson.de>
Date: Mon, 28 Nov 2022 07:31:57 +0000
Subject: [PATCH 005/301] Translated using Weblate (German)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/de/
---
 static/locales/de-DE.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/static/locales/de-DE.yaml b/static/locales/de-DE.yaml
index 6e438776156d..0052f142bc6c 100644
--- a/static/locales/de-DE.yaml
+++ b/static/locales/de-DE.yaml
@@ -8,7 +8,7 @@ FreeTube: FreeTube
 File: Datei
 Quit: Beenden
 Edit: Bearbeiten
-Undo: Rückgängig
+Undo: Rückgängig machen
 Redo: Wiederherstellen
 Cut: Ausschneiden
 Copy: Kopieren
@@ -214,6 +214,7 @@ Settings:
     Disable Smooth Scrolling: Gleichmäßiges Scrollen deaktivieren
     Expand Side Bar by Default: Seitenleiste standardmäßig erweitern
     Hide Side Bar Labels: Seitenleisten-Beschriftungen ausblenden
+    Hide FreeTube Header Logo: FreeTube Titel Logo ausblenden
   Player Settings:
     Player Settings: Videoabspieler-Einstellungen
     Force Local Backend for Legacy Formats: Lokales System für Legacy Formate erzwingen
@@ -691,7 +692,7 @@ Video:
     Volume: Lautstärke
     Bandwidth: Bandbreite
     Buffered: Gepuffert
-    Dropped / Total Frames: Ausgelassene Bilder / Bilder insgesamt
+    Dropped / Total Frames: Entfallene Einzelbilder / Gesamtzahl der Einzelbilder
     Mimetype: Medientyp
     Video statistics are not available for legacy videos: Videostatistiken sind für
       ältere Videos nicht verfügbar

From 096152939dc86acc84d779e59628bc3899da107f Mon Sep 17 00:00:00 2001
From: Marco Cecconi <marco.cecconi@gmail.com>
Date: Mon, 28 Nov 2022 08:35:27 +0000
Subject: [PATCH 006/301] Translated using Weblate (Italian)

Currently translated at 99.5% (636 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/it/
---
 static/locales/it.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/static/locales/it.yaml b/static/locales/it.yaml
index d88afa7f9ab3..84bfdb05cc34 100644
--- a/static/locales/it.yaml
+++ b/static/locales/it.yaml
@@ -3,8 +3,8 @@ Locale Name: 'Italiano'
 FreeTube: 'FreeTube'
 # Currently on Subscriptions, Playlists, and History
 'This part of the app is not ready yet. Come back later when progress has been made.': >-
-  Questa parte dell'app è ancora in fase di sviluppo. Ritorna quando i lavori saranno
-  ultimati.
+  Questa parte dell'app non è ancora pronta. Torna più tardi quando saranno stati
+  fatti ulteriori progressi.
 
 # Webkit Menu Bar
 File: 'File'
@@ -19,7 +19,7 @@ Delete: 'Elimina'
 Select all: 'Seleziona tutto'
 Reload: 'Ricarica'
 Force Reload: 'Forza ricarica'
-Toggle Developer Tools: 'Abilita o disabilita strumenti sviluppatore'
+Toggle Developer Tools: 'Abilita o disabilita strumenti di sviluppo'
 Actual size: 'Dimensione reale'
 Zoom in: 'Ingrandisci'
 Zoom out: 'Rimpicciolisci'
@@ -795,7 +795,7 @@ No: 'No'
 A new blog is now available, {blogTitle}. Click to view more: 'Un nuovo blog è ora
   disponibile, {blogTitle}. Clicca per saperne di più'
 Version {versionNumber} is now available!  Click for more details: La versione {versionNumber}
-  è ora disponibile! Clicca per maggiori dettagli
+  è ora disponibile!  Clicca per maggiori dettagli
 Download From Site: Scarica dal sito
 The playlist has been reversed: La playlist è stata invertita
 Profile:

From 50e27252a4eaa5cc4920adf67d26469c86fb9992 Mon Sep 17 00:00:00 2001
From: Massimo Pissarello <mapi68@gmail.com>
Date: Mon, 28 Nov 2022 08:54:41 +0000
Subject: [PATCH 007/301] Translated using Weblate (Italian)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/it/
---
 static/locales/it.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/locales/it.yaml b/static/locales/it.yaml
index 84bfdb05cc34..602d7a4f0da3 100644
--- a/static/locales/it.yaml
+++ b/static/locales/it.yaml
@@ -19,7 +19,7 @@ Delete: 'Elimina'
 Select all: 'Seleziona tutto'
 Reload: 'Ricarica'
 Force Reload: 'Forza ricarica'
-Toggle Developer Tools: 'Abilita o disabilita strumenti di sviluppo'
+Toggle Developer Tools: 'Attiva/disattiva strumenti per sviluppatori'
 Actual size: 'Dimensione reale'
 Zoom in: 'Ingrandisci'
 Zoom out: 'Rimpicciolisci'
@@ -795,7 +795,7 @@ No: 'No'
 A new blog is now available, {blogTitle}. Click to view more: 'Un nuovo blog è ora
   disponibile, {blogTitle}. Clicca per saperne di più'
 Version {versionNumber} is now available!  Click for more details: La versione {versionNumber}
-  è ora disponibile!  Clicca per maggiori dettagli
+  è ora disponibile! Clicca per maggiori dettagli
 Download From Site: Scarica dal sito
 The playlist has been reversed: La playlist è stata invertita
 Profile:

From 271f10d6f71a5307d9051e38c46837987c0e4c8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 06:09:13 -0500
Subject: [PATCH 008/301] Bump electron from 21.2.3 to 21.3.1 (#2899)

Bumps [electron](https://github.com/electron/electron) from 21.2.3 to 21.3.1.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v21.2.3...v21.3.1)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f3b94f96218d..344344b71c6b 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.2",
     "css-minimizer-webpack-plugin": "^4.2.2",
-    "electron": "^21.2.3",
+    "electron": "^21.3.1",
     "electron-builder": "^23.6.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
diff --git a/yarn.lock b/yarn.lock
index 60d7bf96bc6b..a25147668bab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3464,10 +3464,10 @@ electron-to-chromium@^1.4.251:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
   integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
 
-electron@^21.2.3:
-  version "21.2.3"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-21.2.3.tgz#7bd190f57b154ab85c92a2e52e0329fd40cbc7b9"
-  integrity sha512-Wyj0ri3P8hnWEvX7+2Q1OtNzJI8Qn4V9J+aeypoXh+wtlX/fjfHxi4vZkos/XRncoIeYCeUZ5nhGjsOIQwSElQ==
+electron@^21.3.1:
+  version "21.3.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-21.3.1.tgz#02a61053ace79ecdc592afc641ff663dec805b42"
+  integrity sha512-Ik/I9oFHA1h32JRtRm6GMgYdUctFpF/tPnHyATg4r3LXBTUT6habGh3GxSdmmTa5JgtA7uJUEm8EjjZItk7T3g==
   dependencies:
     "@electron/get" "^1.14.1"
     "@types/node" "^16.11.26"

From ba91f6c5bc59da9f6cd06d51e8d1e7fd416fa565 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 06:18:42 -0500
Subject: [PATCH 009/301] Bump electron-context-menu from 3.5.0 to 3.6.0
 (#2897)

Bumps [electron-context-menu](https://github.com/sindresorhus/electron-context-menu) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/sindresorhus/electron-context-menu/releases)
- [Commits](https://github.com/sindresorhus/electron-context-menu/compare/v3.5.0...v3.6.0)

---
updated-dependencies:
- dependency-name: electron-context-menu
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 344344b71c6b..88bc98561719 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "autolinker": "^4.0.0",
     "browserify": "^17.0.0",
     "browserify-zlib": "^0.2.0",
-    "electron-context-menu": "^3.5.0",
+    "electron-context-menu": "^3.6.0",
     "http-proxy-agent": "^5.0.0",
     "https-proxy-agent": "^5.0.0",
     "lodash.debounce": "^4.0.8",
diff --git a/yarn.lock b/yarn.lock
index a25147668bab..051fa671c7dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3406,10 +3406,10 @@ electron-builder@^23.6.0:
     simple-update-notifier "^1.0.7"
     yargs "^17.5.1"
 
-electron-context-menu@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.5.0.tgz#f5d6df982e37555a77666bcecff59b094211b54a"
-  integrity sha512-z4agpok6YnXlGFs66zU9EBFft4llUFJ41NYFEMMS0fnprMKBztJUCHBA6LMAqJgjabfqsYC7kxlvjvepxodOqg==
+electron-context-menu@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.0.tgz#d60fabb99d5bb06c46b6929c342c75cc0eee348e"
+  integrity sha512-7uhF3WX7ZalLEurKqML2cJJrBUw1JSZNzbwIB9kVbip7sVwyl7bVjiwHzdYjuOh/+xHw21ZzxwgZcB6sTeKdEw==
   dependencies:
     cli-truncate "^2.1.0"
     electron-dl "^3.2.1"

From 9459e07dbc9e3a2c27d6d1a3e3a18afb0840b0ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 06:19:11 -0500
Subject: [PATCH 010/301] Bump @fortawesome/free-brands-svg-icons from 6.2.0 to
 6.2.1 (#2898)

Bumps [@fortawesome/free-brands-svg-icons](https://github.com/FortAwesome/Font-Awesome) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.2.0...6.2.1)

---
updated-dependencies:
- dependency-name: "@fortawesome/free-brands-svg-icons"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 88bc98561719..5aa5e2fd13cf 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.2.0",
-    "@fortawesome/free-brands-svg-icons": "^6.2.0",
+    "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.0",
     "@fortawesome/vue-fontawesome": "^2.0.8",
     "@freetube/youtube-chat": "^1.1.2",
diff --git a/yarn.lock b/yarn.lock
index 051fa671c7dc..42945841f880 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1051,6 +1051,11 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz#76467a94aa888aeb22aafa43eb6ff889df3a5a7f"
   integrity sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg==
 
+"@fortawesome/fontawesome-common-types@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz#411e02a820744d3f7e0d8d9df9d82b471beaa073"
+  integrity sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==
+
 "@fortawesome/fontawesome-svg-core@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz#11856eaf4dd1d865c442ddea1eed8ee855186ba2"
@@ -1058,12 +1063,12 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "6.2.0"
 
-"@fortawesome/free-brands-svg-icons@^6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.0.tgz#ce072179677f9b5d6767f918cfbf296f357cc1d0"
-  integrity sha512-fm1y4NyZ2qKYNmYhdMz9VAWRw1Et7PMHNunSw3W0SVAwKwv6o0qiJworLH3Y9SnmhHzAymXJwCX1op22FFvGiA==
+"@fortawesome/free-brands-svg-icons@^6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.1.tgz#04a6d6f7898f7ef392aba7a65030a584d4f4c84f"
+  integrity sha512-L8l4MfdHPmZlJ72PvzdfwOwbwcCAL0vx48tJRnI6u1PJXh+j2f3yDoKyQgO3qjEsgD5Fr2tQV/cPP8F/k6aUig==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.2.0"
+    "@fortawesome/fontawesome-common-types" "6.2.1"
 
 "@fortawesome/free-solid-svg-icons@^6.2.0":
   version "6.2.0"

From ecb91287315f19a85e291266510395748aacadb1 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Mon, 28 Nov 2022 12:52:47 +0100
Subject: [PATCH 011/301] Migrate search suggestions to youtubei.js (#2855)

* Migrate search suggestions to youtubei.js

* Rename functions to indicate that they are for the local API

* Implement and use a lightweight Innertube session

* Fix typo in comment

Co-authored-by: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>

* Fix another typo in a comment

Co-authored-by: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
---
 _scripts/webpack.renderer.config.js        |  11 +-
 _scripts/webpack.web.config.js             |   1 +
 package.json                               |   2 +-
 src/main/index.js                          |  10 ++
 src/renderer/components/top-nav/top-nav.js |  15 +-
 src/renderer/helpers/api/PlayerCache.js    |  41 ++++++
 src/renderer/helpers/api/local.js          |  58 ++++++++
 yarn.lock                                  | 156 ++++++++++++++++-----
 8 files changed, 250 insertions(+), 44 deletions(-)
 create mode 100644 src/renderer/helpers/api/PlayerCache.js
 create mode 100644 src/renderer/helpers/api/local.js

diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
index 15965ff234b3..2f78d7dcb460 100644
--- a/_scripts/webpack.renderer.config.js
+++ b/_scripts/webpack.renderer.config.js
@@ -126,10 +126,19 @@ const config = {
       filename: isDevMode ? '[name].css' : '[name].[contenthash].css',
       chunkFilename: isDevMode ? '[id].css' : '[id].[contenthash].css',
     }),
+    // ignore linkedom's unnecessary broken canvas import, as youtubei.js only uses linkedom to generate DASH manifests
+    new webpack.IgnorePlugin({
+      resourceRegExp: /^canvas$/
+    })
   ],
   resolve: {
     alias: {
-      vue$: 'vue/dist/vue.common.js'
+      vue$: 'vue/dist/vue.common.js',
+
+      // defaults to the prebundled browser version which causes webpack to error with:
+      // "Critical dependency: require function is used in a way in which dependencies cannot be statically extracted"
+      // webpack likes to bundle the dependencies itself, could really have a better error message though
+      'youtubei.js$': 'youtubei.js/dist/browser.js',
     },
     extensions: ['.js', '.vue']
   },
diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
index a49104cccdc3..169f428ba7f9 100644
--- a/_scripts/webpack.web.config.js
+++ b/_scripts/webpack.web.config.js
@@ -26,6 +26,7 @@ const config = {
   },
   externals: {
     electron: '{}',
+    'youtubei.js': '{}',
     ytpl: '{}',
     ytsr: '{}'
   },
diff --git a/package.json b/package.json
index 5aa5e2fd13cf..b2d2853384bd 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
-    "youtube-suggest": "^1.2.0",
+    "youtubei.js": "^2.5.0",
     "yt-channel-info": "^3.2.1",
     "yt-dash-manifest-generator": "1.1.0",
     "ytdl-core": "https://github.com/absidue/node-ytdl-core#fix-likes-extraction",
diff --git a/src/main/index.js b/src/main/index.js
index 15a38879d6b2..c23a4f2f769e 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -162,6 +162,16 @@ function runApp() {
       })
     })
 
+    // make InnerTube requests work with the fetch function
+    // InnerTube rejects requests if the referer isn't YouTube or empty
+    const innertubeRequestFilter = { urls: ['https://www.youtube.com/youtubei/*'] }
+
+    session.defaultSession.webRequest.onBeforeSendHeaders(innertubeRequestFilter, ({ requestHeaders }, callback) => {
+      requestHeaders.referer = 'https://www.youtube.com'
+      // eslint-disable-next-line node/no-callback-literal
+      callback({ requestHeaders })
+    })
+
     if (replaceHttpCache) {
       // in-memory image cache
 
diff --git a/src/renderer/components/top-nav/top-nav.js b/src/renderer/components/top-nav/top-nav.js
index a23d984f8a38..2c7c26b27f47 100644
--- a/src/renderer/components/top-nav/top-nav.js
+++ b/src/renderer/components/top-nav/top-nav.js
@@ -4,10 +4,10 @@ import FtInput from '../ft-input/ft-input.vue'
 import FtSearchFilters from '../ft-search-filters/ft-search-filters.vue'
 import FtProfileSelector from '../ft-profile-selector/ft-profile-selector.vue'
 import debounce from 'lodash.debounce'
-import ytSuggest from 'youtube-suggest'
 
 import { IpcChannels } from '../../../constants'
 import { openInternalPath, showToast } from '../../helpers/utils'
+import { clearLocalSearchSuggestionsSession, getLocalSearchSuggestions } from '../../helpers/api/local'
 
 export default Vue.extend({
   name: 'TopNav',
@@ -24,7 +24,8 @@ export default Vue.extend({
       searchFilterValueChanged: false,
       historyIndex: 1,
       isForwardOrBack: false,
-      searchSuggestionsDataList: []
+      searchSuggestionsDataList: [],
+      lastSuggestionQuery: ''
     }
   },
   computed: {
@@ -115,6 +116,8 @@ export default Vue.extend({
         this.searchInput.blur()
       }
 
+      clearLocalSearchSuggestionsSession()
+
       this.getYoutubeUrlInfo(query).then((result) => {
         switch (result.urlType) {
           case 'video': {
@@ -210,7 +213,11 @@ export default Vue.extend({
 
     getSearchSuggestionsDebounce: function (query) {
       if (this.enableSearchSuggestions) {
-        this.debounceSearchResults(query)
+        const trimmedQuery = query.trim()
+        if (trimmedQuery !== this.lastSuggestionQuery) {
+          this.lastSuggestionQuery = trimmedQuery
+          this.debounceSearchResults(trimmedQuery)
+        }
       }
     },
 
@@ -231,7 +238,7 @@ export default Vue.extend({
         return
       }
 
-      ytSuggest(query).then((results) => {
+      getLocalSearchSuggestions(query).then((results) => {
         this.searchSuggestionsDataList = results
       })
     },
diff --git a/src/renderer/helpers/api/PlayerCache.js b/src/renderer/helpers/api/PlayerCache.js
new file mode 100644
index 000000000000..95e2a4f1ced8
--- /dev/null
+++ b/src/renderer/helpers/api/PlayerCache.js
@@ -0,0 +1,41 @@
+import { access, mkdir, readFile, unlink, writeFile } from 'fs/promises'
+import { resolve } from 'path'
+
+// based off https://github.com/LuanRT/YouTube.js/blob/6caa679df6ddc77d25be02dcb7355b722ab268aa/src/utils/Cache.ts
+// avoids errors caused by the fully dynamic `fs` and `path` module imports that youtubei.js's UniversalCache does
+export class PlayerCache {
+  constructor(cacheDirectory) {
+    this.cacheDirectory = cacheDirectory
+  }
+
+  async get(key) {
+    const filePath = resolve(this.cacheDirectory, key)
+
+    try {
+      const contents = await readFile(filePath)
+      return contents.buffer
+    } catch (e) {
+      if (e?.code === 'ENOENT') {
+        return undefined
+      }
+      throw e
+    }
+  }
+
+  async set(key, value) {
+    await mkdir(this.cacheDirectory, { recursive: true })
+
+    const filePath = resolve(this.cacheDirectory, key)
+    await writeFile(filePath, new Uint8Array(value))
+  }
+
+  async remove(key) {
+    const filePath = resolve(this.cacheDirectory, key)
+
+    // only try to delete the file if it exists, access() throws an exception if the file doesn't exist
+    try {
+      await access(filePath)
+      await unlink(filePath)
+    } catch { }
+  }
+}
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
new file mode 100644
index 000000000000..adce44e38f93
--- /dev/null
+++ b/src/renderer/helpers/api/local.js
@@ -0,0 +1,58 @@
+import { Innertube, Session } from 'youtubei.js'
+import { PlayerCache } from './PlayerCache'
+import { join } from 'path'
+
+import store from '../../store/index'
+
+/**
+ * Creates a lightweight Innertube instance, which is faster to create or
+ * an instance that can decode the streaming URLs, which is slower to create
+ * the lightweight one only needs a single web request to create the new session
+ * the full one needs 3 (or 2 if the player is cached) web requests to create:
+ * 1. the request for the session
+ * 2. fetch a page that contains a link to the player
+ * 3. if the player isn't cached, it is downloaded and transformed
+ * @param {boolean} withPlayer set to true to get an Innertube instance that can decode the streaming URLs
+ * @returns the Innertube instance
+ */
+async function createInnertube(withPlayer = false) {
+  if (withPlayer) {
+    const userData = await store.dispatch('getUserDataPath')
+
+    return await Innertube.create({
+      // use browser fetch
+      fetch: (input, init) => fetch(input, init),
+      cache: new PlayerCache(join(userData, 'player_cache'))
+    })
+  } else {
+    // from https://github.com/LuanRT/YouTube.js/pull/240
+    const sessionData = await Session.getSessionData()
+
+    const session = new Session(
+      sessionData.context,
+      sessionData.api_key,
+      sessionData.api_version,
+      sessionData.account_index,
+      undefined, // player
+      undefined, // cookies
+      (input, init) => fetch(input, init) // use browser fetch
+    )
+
+    return new Innertube(session)
+  }
+}
+
+let searchSuggestionsSession = null
+
+export async function getLocalSearchSuggestions(query) {
+  // reuse innertube instance to keep the search suggestions snappy
+  if (searchSuggestionsSession === null) {
+    searchSuggestionsSession = await createInnertube()
+  }
+
+  return await searchSuggestionsSession.getSearchSuggestions(query)
+}
+
+export function clearLocalSearchSuggestionsSession() {
+  searchSuggestionsSession = null
+}
diff --git a/yarn.lock b/yarn.lock
index 42945841f880..453311dffdfd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1233,6 +1233,11 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@protobuf-ts/runtime@^2.7.0":
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/@protobuf-ts/runtime/-/runtime-2.8.1.tgz#e88f89650ab29c3eba0afebe32b9f3552f35fc85"
+  integrity sha512-D9M5hSumYCovIfNllt7N6ODh4q+LrjiMWtNETvooaf+a2XheZJ7kgjFlsFghti0CFWwtA//of4JXQfw9hU+cCw==
+
 "@seald-io/binary-search-tree@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@seald-io/binary-search-tree/-/binary-search-tree-1.0.2.tgz#9f0e5cec5e0acf97f1b495f2f6d3476ddb6a94ed"
@@ -2492,6 +2497,13 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==
 
+busboy@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
+  integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
+  dependencies:
+    streamsearch "^1.1.0"
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -3010,6 +3022,17 @@ css-select@^4.1.3:
     domutils "^2.8.0"
     nth-check "^2.0.1"
 
+css-select@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
+  integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
+  dependencies:
+    boolbase "^1.0.0"
+    css-what "^6.1.0"
+    domhandler "^5.0.2"
+    domutils "^3.0.1"
+    nth-check "^2.0.1"
+
 css-tree@^1.1.2, css-tree@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
@@ -3018,7 +3041,7 @@ css-tree@^1.1.2, css-tree@^1.1.3:
     mdn-data "2.0.14"
     source-map "^0.6.1"
 
-css-what@^6.0.1:
+css-what@^6.0.1, css-what@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
   integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
@@ -3084,6 +3107,11 @@ csso@^4.2.0:
   dependencies:
     css-tree "^1.1.2"
 
+cssom@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
+  integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==
+
 csstype@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9"
@@ -3312,6 +3340,15 @@ dom-serializer@^1.0.1:
     domhandler "^4.2.0"
     entities "^2.0.0"
 
+dom-serializer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
+  integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
+  dependencies:
+    domelementtype "^2.3.0"
+    domhandler "^5.0.2"
+    entities "^4.2.0"
+
 dom-walk@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
@@ -3322,7 +3359,7 @@ domain-browser@^1.2.0:
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
-domelementtype@^2.0.1, domelementtype@^2.2.0:
+domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
   integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
@@ -3334,6 +3371,13 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
   dependencies:
     domelementtype "^2.2.0"
 
+domhandler@^5.0.1, domhandler@^5.0.2:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
+  integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
+  dependencies:
+    domelementtype "^2.3.0"
+
 domutils@^2.5.2, domutils@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
@@ -3343,6 +3387,15 @@ domutils@^2.5.2, domutils@^2.8.0:
     domelementtype "^2.2.0"
     domhandler "^4.2.0"
 
+domutils@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c"
+  integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==
+  dependencies:
+    dom-serializer "^2.0.0"
+    domelementtype "^2.3.0"
+    domhandler "^5.0.1"
+
 dot-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
@@ -3533,6 +3586,11 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
+entities@^4.2.0, entities@^4.3.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
+  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
+
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
@@ -4601,6 +4659,11 @@ html-entities@^2.3.2:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46"
   integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==
 
+html-escaper@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-3.0.3.tgz#4d336674652beb1dcbc29ef6b6ba7f6be6fdfed6"
+  integrity sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==
+
 html-minifier-terser@^6.0.2:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab"
@@ -4640,6 +4703,16 @@ htmlparser2@^6.1.0:
     domutils "^2.5.2"
     entities "^2.0.0"
 
+htmlparser2@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010"
+  integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==
+  dependencies:
+    domelementtype "^2.3.0"
+    domhandler "^5.0.2"
+    domutils "^3.0.1"
+    entities "^4.3.0"
+
 http-cache-semantics@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
@@ -5173,6 +5246,13 @@ jest-worker@^29.1.2:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
+jintr@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/jintr/-/jintr-0.3.1.tgz#0ab49390a187d77dc5f2c19580c644d70a94528a"
+  integrity sha512-AUcq8fKL4BE9jDx8TizZmJ9UOvk1CHKFW0nQcWaOaqk9tkLS9S10fNmusTWGEYTncn7U43nXrCbhYko/ylqrSg==
+  dependencies:
+    acorn "^8.8.0"
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -5395,6 +5475,17 @@ lilconfig@^2.0.3:
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4"
   integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==
 
+linkedom@^0.14.12:
+  version "0.14.19"
+  resolved "https://registry.yarnpkg.com/linkedom/-/linkedom-0.14.19.tgz#a8e9b91af26d5c631b5b3d21614cef1db8a56fb7"
+  integrity sha512-sFNkQZlKBWpEaAcbsDIghTLE0hHbyvS6dZuM7IH+KTM09GaQ772PtDZAuFlN0oFgyAjUj8XS9FpoWSLmBjl8MA==
+  dependencies:
+    css-select "^5.1.0"
+    cssom "^0.5.0"
+    html-escaper "^3.0.3"
+    htmlparser2 "^8.0.1"
+    uhyphen "^0.1.0"
+
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -5865,13 +5956,6 @@ node-addon-api@^1.6.3:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
   integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
 
-node-fetch@^2.6.0:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
-
 node-forge@^1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
@@ -7293,11 +7377,6 @@ smart-buffer@^4.0.2, smart-buffer@^4.2.0:
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
-smol-jsonp@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/smol-jsonp/-/smol-jsonp-1.0.0.tgz#b662c932a193f1a5c6bb1dcdaaddcd4e2007f7df"
-  integrity sha512-EwM2cKsq87A9cCKiAwfp7kVSRtAT01M/3HXaO3tYxP+pnEZ5zVYsxLdTnPjJVVIeK9O2zkV0QbWuwlHEUQNdOA==
-
 sockjs@^0.3.24:
   version "0.3.24"
   resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
@@ -7489,6 +7568,11 @@ stream-splicer@^2.0.0:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
 
+streamsearch@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
+  integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
+
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -7760,11 +7844,6 @@ tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
-
 tree-kill@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
@@ -7849,6 +7928,11 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
+uhyphen@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/uhyphen/-/uhyphen-0.1.0.tgz#3cc22afa790daa802b9f6789f3583108d5b4a08c"
+  integrity sha512-o0QVGuFg24FK765Qdd5kk0zU/U4dEsCtN/GSiwNI9i8xsSVtjIAOdTaVhLwZ1nrbWxFVMxNDDl+9fednsOMsBw==
+
 umd@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf"
@@ -7880,6 +7964,13 @@ underscore@1.13.1:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"
   integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==
 
+undici@^5.7.0:
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.12.0.tgz#c758ffa704fbcd40d506e4948860ccaf4099f531"
+  integrity sha512-zMLamCG62PGjd9HHMpo05bSLvvwWOZgGeiWlN/vlqu3+lRo3elxktVGEyLMX+IO7c2eflLjcW74AlkhEZm15mg==
+  dependencies:
+    busboy "^1.6.0"
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -8221,11 +8312,6 @@ wbuf@^1.1.0, wbuf@^1.7.3:
   dependencies:
     minimalistic-assert "^1.0.0"
 
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
-
 webpack-cli@^4.10.0:
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31"
@@ -8347,14 +8433,6 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
@@ -8494,13 +8572,15 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-youtube-suggest@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/youtube-suggest/-/youtube-suggest-1.2.0.tgz#5f1b445c2b71bfc8a4c89af99775b02cd827e77d"
-  integrity sha512-/ItW6204M+OOHaO4k5DYJGHH+UZjkaKNb7rtAWQaA6zeJvUu3tbveAsm+xTGH+8VfyT/LoAhN9/yOQajduDCJA==
+youtubei.js@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-2.5.0.tgz#bd209a8b1edccc106ef0d77c6a619f3e3085913a"
+  integrity sha512-RnRXF4+HESqpJQ1FIWXZ/6M+0Sdt8OndTTD0yYex+zWR+7YOBRrWcXRuKSsWgw3v3ctuzW7TJ8+t/s/8/ImFHw==
   dependencies:
-    node-fetch "^2.6.0"
-    smol-jsonp "^1.0.0"
+    "@protobuf-ts/runtime" "^2.7.0"
+    jintr "^0.3.1"
+    linkedom "^0.14.12"
+    undici "^5.7.0"
 
 yt-channel-info@^3.2.1:
   version "3.2.1"

From bc9cb67699c94a36a49d897a52a310c76644f3c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Nov 2022 16:42:24 +0100
Subject: [PATCH 012/301] Bump @fortawesome/fontawesome-svg-core from 6.2.0 to
 6.2.1 (#2900)

Bumps [@fortawesome/fontawesome-svg-core](https://github.com/FortAwesome/Font-Awesome) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.2.0...6.2.1)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-svg-core"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index b2d2853384bd..70b7065812f6 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "ci": "yarn install --silent --frozen-lockfile"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^6.2.0",
+    "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.0",
     "@fortawesome/vue-fontawesome": "^2.0.8",
diff --git a/yarn.lock b/yarn.lock
index 453311dffdfd..dbea5b5bbfac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1056,12 +1056,12 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz#411e02a820744d3f7e0d8d9df9d82b471beaa073"
   integrity sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==
 
-"@fortawesome/fontawesome-svg-core@^6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz#11856eaf4dd1d865c442ddea1eed8ee855186ba2"
-  integrity sha512-Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw==
+"@fortawesome/fontawesome-svg-core@^6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz#e87e905e444b5e7b715af09b64d27b53d4c8f9d9"
+  integrity sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.2.0"
+    "@fortawesome/fontawesome-common-types" "6.2.1"
 
 "@fortawesome/free-brands-svg-icons@^6.2.1":
   version "6.2.1"

From 606b7ff79431d91846cc98723fae2723651acb1f Mon Sep 17 00:00:00 2001
From: Dragibus Noir <dragibusnoir@pm.me>
Date: Mon, 28 Nov 2022 13:54:38 +0000
Subject: [PATCH 013/301] Translated using Weblate (French)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/fr/
---
 static/locales/fr-FR.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/fr-FR.yaml b/static/locales/fr-FR.yaml
index b751e4a5a0c9..76a22b9dac80 100644
--- a/static/locales/fr-FR.yaml
+++ b/static/locales/fr-FR.yaml
@@ -218,6 +218,7 @@ Settings:
     Expand Side Bar by Default: Développer la barre latérale par défaut
     Disable Smooth Scrolling: Désactiver le défilement fluide
     Hide Side Bar Labels: Masquer les étiquettes de la barre latérale
+    Hide FreeTube Header Logo: Masquer le logo d'en-tête de FreeTube
   Player Settings:
     Player Settings: 'Paramètres du lecteur'
     Force Local Backend for Legacy Formats: 'Forcer le backend local pour le format

From 66f8ef5bea26a37618300c405eadc6a2144c0aef Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Mon, 28 Nov 2022 22:06:58 +0000
Subject: [PATCH 014/301] Translated using Weblate (Arabic)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ar/
---
 static/locales/ar.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/ar.yaml b/static/locales/ar.yaml
index 349d7b168092..ffb7d0a2775c 100644
--- a/static/locales/ar.yaml
+++ b/static/locales/ar.yaml
@@ -206,6 +206,7 @@ Settings:
     Disable Smooth Scrolling: عطّل التمرير المتجانس
     Expand Side Bar by Default: كبّر الشريط الجانبي بشكل افتراضي
     Hide Side Bar Labels: إخفاء تسميات الشريط الجانبي
+    Hide FreeTube Header Logo: إخفاء شعار رأس FreeTube
   Player Settings:
     Player Settings: 'إعدادات المشغل'
     Force Local Backend for Legacy Formats: 'فرض الواجهة الخلفية المحلية للتنسيقات

From b5ad68984f2c615ec154508b4b63c0912413570e Mon Sep 17 00:00:00 2001
From: zaioti <zaioti@tuta.io>
Date: Tue, 29 Nov 2022 01:44:11 +0000
Subject: [PATCH 015/301] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt_BR/
---
 static/locales/pt-BR.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/pt-BR.yaml b/static/locales/pt-BR.yaml
index f7fddb9d33f2..ba3f02d035c2 100644
--- a/static/locales/pt-BR.yaml
+++ b/static/locales/pt-BR.yaml
@@ -209,6 +209,7 @@ Settings:
     Disable Smooth Scrolling: Desativar Rolagem Suave
     Expand Side Bar by Default: Expandir Barra Lateral por Padrão
     Hide Side Bar Labels: Ocultar etiquetas da barra lateral
+    Hide FreeTube Header Logo: Esconder o logotipo do cabeçalho do FreeTube
   Player Settings:
     Player Settings: 'Configurações do vídeo'
     Force Local Backend for Legacy Formats: 'Forçar motor local para formatos legados'

From 5703665676a18a5fc56e414ba21b65b9e37c67aa Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Tue, 29 Nov 2022 10:38:38 +0000
Subject: [PATCH 016/301] Translated using Weblate (Galician)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/gl/
---
 static/locales/gl.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/static/locales/gl.yaml b/static/locales/gl.yaml
index b1d686b32b31..8e7417e16152 100644
--- a/static/locales/gl.yaml
+++ b/static/locales/gl.yaml
@@ -32,7 +32,7 @@ Forward: 'Adiante'
 
 Version {versionNumber} is now available!  Click for more details: 'A versión {versionNumber}
   está dispoñible!  Fai clic para veres máis detalles'
-Download From Site: 'Descargar dende a páxina web'
+Download From Site: 'Descargar do sitio'
 A new blog is now available, {blogTitle}. Click to view more: 'Hai unha nova entrada
   no blog dispoñible, {blogTitle}. Fai clic para veres máis'
 
@@ -77,7 +77,7 @@ Subscriptions:
   Subscriptions: 'Subscricións'
   Latest Subscriptions: 'Últimas subscricións'
   This profile has a large number of subscriptions.  Forcing RSS to avoid rate limiting: 'Este
-    perfil ten un gran número de subscricións. Forzar ás RSS para evitar a limitación
+    perfil ten un gran número de subscricións.  Forzar ás RSS para evitar a limitación
     da taxa'
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'A
     túa listaxe de subscricións está baleira. Engade algunhas para as ver aquí.'
@@ -688,7 +688,7 @@ Video:
     music offtopic: Música Offtopic
     interaction: Interacción
     self-promotion: Autopromoción
-    outro: Outro
+    outro: outro
     intro: Intro
     sponsor: Patrocinador
     recap: Recapitulación

From fc5be5bb1ac006a97b4032705367a13da331b5bb Mon Sep 17 00:00:00 2001
From: SC <lalocas@protonmail.com>
Date: Tue, 29 Nov 2022 16:19:13 +0000
Subject: [PATCH 017/301] Translated using Weblate (Portuguese)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt/
---
 static/locales/pt.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/pt.yaml b/static/locales/pt.yaml
index 5047319f48c0..0c229fe611ea 100644
--- a/static/locales/pt.yaml
+++ b/static/locales/pt.yaml
@@ -215,6 +215,7 @@ Settings:
     Disable Smooth Scrolling: Desativar deslocação suave
     Expand Side Bar by Default: Expandir barra lateral por definição
     Hide Side Bar Labels: Ocultar texto na barra lateral
+    Hide FreeTube Header Logo: Ocultar o logotipo do FreeTube no cabeçalho
   Player Settings:
     Player Settings: 'Definições do reprodutor'
     Force Local Backend for Legacy Formats: 'Forçar sistema de ligação local para
@@ -415,6 +416,7 @@ Settings:
     Hide Live Streams: Ocultar transmissões em direto
     Hide Comments: Ocultar comentários
     Hide Chapters: Ocultar capítulos
+    Hide Upcoming Premieres: Ocultar próximas estreias
   External Player Settings:
     Custom External Player Arguments: Argumentos do reprodutor externo personalizado
     Custom External Player Executable: Executável de reprodutor externo personalizado

From deb463e8fcae26f152d2ef1fd77f09cd6cd139b4 Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Wed, 30 Nov 2022 21:03:38 +0800
Subject: [PATCH 018/301] * Update custom image request to handle error event
 (#2902)

https://www.electronjs.org/docs/latest/api/client-request#event-error
---
 src/main/index.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/index.js b/src/main/index.js
index c23a4f2f769e..01f754f2b869 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -258,6 +258,10 @@ function runApp() {
           })
         })
 
+        newRequest.on('error', (err) => {
+          console.error(err)
+        })
+
         newRequest.end()
       })
 

From 2cc811f0eefc522efefedccd364f0aceacbcf12e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20Storoniak?= <miko.storo@gmail.com>
Date: Wed, 30 Nov 2022 18:38:56 +0000
Subject: [PATCH 019/301] Translated using Weblate (Polish)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pl/
---
 static/locales/pl.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml
index fba6b9355bc4..192ba8a1e65e 100644
--- a/static/locales/pl.yaml
+++ b/static/locales/pl.yaml
@@ -212,6 +212,7 @@ Settings:
     Expand Side Bar by Default: Domyślnie rozwiń pasek boczny
     Disable Smooth Scrolling: Wyłącz płynne przewijanie
     Hide Side Bar Labels: Schowaj etykiety paska bocznego
+    Hide FreeTube Header Logo: Ukryj Logo FreeTube
   Player Settings:
     Player Settings: 'Ustawienia odtwarzacza'
     Force Local Backend for Legacy Formats: 'Wymuś lokalny back-end dla starych formatów'

From 1ba88f2be97234bd5fdb2da5aac30fa2869abc1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20W=C3=B3jcicki?= <terkaz@gmx.com>
Date: Wed, 30 Nov 2022 19:40:27 +0000
Subject: [PATCH 020/301] Translated using Weblate (Polish)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pl/
---
 static/locales/pl.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml
index 192ba8a1e65e..c5b1bcce5d0e 100644
--- a/static/locales/pl.yaml
+++ b/static/locales/pl.yaml
@@ -212,7 +212,7 @@ Settings:
     Expand Side Bar by Default: Domyślnie rozwiń pasek boczny
     Disable Smooth Scrolling: Wyłącz płynne przewijanie
     Hide Side Bar Labels: Schowaj etykiety paska bocznego
-    Hide FreeTube Header Logo: Ukryj Logo FreeTube
+    Hide FreeTube Header Logo: Schowaj logo FreeTube z paska górnego
   Player Settings:
     Player Settings: 'Ustawienia odtwarzacza'
     Force Local Backend for Legacy Formats: 'Wymuś lokalny back-end dla starych formatów'
@@ -445,7 +445,7 @@ Settings:
     Download in app: Pobierz w aplikacji
     Open in web browser: Otwórz w przeglądarce
   Parental Control Settings:
-    Parental Control Settings: Opcje kontroli rodzicielskiej
+    Parental Control Settings: Ustawienia kontroli rodzicielskiej
     Hide Unsubscribe Button: Schowaj przycisk „Odsubskrybuj”
     Show Family Friendly Only: Pokazuj tylko filmy przyjazne rodzinie
     Hide Search Bar: Schowaj pole wyszukiwania

From c98b6ab3f27895cd81dd302f17ef5473e9691c58 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Thu, 1 Dec 2022 08:46:33 +0100
Subject: [PATCH 021/301] Only show Select All context menu item in text fields
 (#2835)

---
 src/main/index.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/index.js b/src/main/index.js
index 01f754f2b869..798bd83f43b2 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -21,6 +21,7 @@ function runApp() {
     showSearchWithGoogle: false,
     showSaveImageAs: true,
     showCopyImageAddress: true,
+    showSelectAll: false,
     prepend: (defaultActions, parameters, browserWindow) => [
       {
         label: 'Show / Hide Video Statistics',
@@ -36,6 +37,15 @@ function runApp() {
         click: () => {
           createWindow({ replaceMainWindow: false, windowStartupUrl: parameters.linkURL, showWindowNow: true })
         }
+      },
+      // Only show select all in text fields
+      {
+        label: 'Select All',
+        enabled: parameters.editFlags.canSelectAll,
+        visible: parameters.isEditable,
+        click: () => {
+          browserWindow.webContents.selectAll()
+        }
       }
     ]
   })

From d793a8bcda2f0d83a60ec9583b89e83e5896a48d Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Fri, 2 Dec 2022 08:29:01 +0100
Subject: [PATCH 022/301] Make replaceFilenameForbiddenChars a helper (#2904)

* Make replaceFilenameForbiddenChars a helper

* Use function for screenshot file name checking
---
 src/renderer/helpers/utils.js       | 33 ++++++++++++++++
 src/renderer/store/modules/utils.js | 60 ++++-------------------------
 2 files changed, 40 insertions(+), 53 deletions(-)

diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index dd37b1c380bf..9f1991c8f8eb 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -422,3 +422,36 @@ export function searchFiltersMatch(filtersA, filtersB) {
     filtersA?.type === filtersB?.type &&
     filtersA?.duration === filtersB?.duration
 }
+
+export function replaceFilenameForbiddenChars(filenameOriginal) {
+  let filenameNew = filenameOriginal
+  let forbiddenChars = {}
+  switch (process.platform) {
+    case 'win32':
+      forbiddenChars = {
+        '<': '＜', // U+FF1C
+        '>': '＞', // U+FF1E
+        ':': '：', // U+FF1A
+        '"': '＂', // U+FF02
+        '/': '／', // U+FF0F
+        '\\': '＼', // U+FF3C
+        '|': '｜', // U+FF5C
+        '?': '？', // U+FF1F
+        '*': '＊' // U+FF0A
+      }
+      break
+    case 'darwin':
+      forbiddenChars = { '/': '／', ':': '：' }
+      break
+    case 'linux':
+      forbiddenChars = { '/': '／' }
+      break
+    default:
+      break
+  }
+
+  for (const forbiddenChar in forbiddenChars) {
+    filenameNew = filenameNew.replaceAll(forbiddenChar, forbiddenChars[forbiddenChar])
+  }
+  return filenameNew
+}
diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index 43426a53d00b..54b5e3d03c27 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -6,6 +6,7 @@ import { IpcChannels } from '../../../constants'
 import {
   createWebURL,
   openExternalLink,
+  replaceFilenameForbiddenChars,
   searchFiltersMatch,
   showSaveDialog,
   showToast
@@ -122,46 +123,13 @@ async function invokeIRC(context, IRCtype, webCbk, payload = null) {
 }
 
 const actions = {
-  replaceFilenameForbiddenChars(_, filenameOriginal) {
-    let filenameNew = filenameOriginal
-    let forbiddenChars = {}
-    switch (process.platform) {
-      case 'win32':
-        forbiddenChars = {
-          '<': '＜', // U+FF1C
-          '>': '＞', // U+FF1E
-          ':': '：', // U+FF1A
-          '"': '＂', // U+FF02
-          '/': '／', // U+FF0F
-          '\\': '＼', // U+FF3C
-          '|': '｜', // U+FF5C
-          '?': '？', // U+FF1F
-          '*': '＊' // U+FF0A
-        }
-        break
-      case 'darwin':
-        forbiddenChars = { '/': '／', ':': '：' }
-        break
-      case 'linux':
-        forbiddenChars = { '/': '／' }
-        break
-      default:
-        break
-    }
-
-    for (const forbiddenChar in forbiddenChars) {
-      filenameNew = filenameNew.replaceAll(forbiddenChar, forbiddenChars[forbiddenChar])
-    }
-    return filenameNew
-  },
-
-  async downloadMedia({ rootState, dispatch }, { url, title, extension, fallingBackPath }) {
+  async downloadMedia({ rootState }, { url, title, extension, fallingBackPath }) {
     if (!process.env.IS_ELECTRON) {
       openExternalLink(url)
       return
     }
 
-    const fileName = `${await dispatch('replaceFilenameForbiddenChars', title)}.${extension}`
+    const fileName = `${replaceFilenameForbiddenChars(title)}.${extension}`
     const errorMessage = i18n.t('Downloading failed', { videoTitle: title })
     let folderPath = rootState.settings.downloadFolderPath
 
@@ -281,27 +249,13 @@ const actions = {
         parsedString = parsedString.replaceAll(key, value)
       }
 
-      const platform = process.platform
-      if (platform === 'win32') {
-        // https://www.boost.org/doc/libs/1_78_0/libs/filesystem/doc/portability_guide.htm
-        // https://stackoverflow.com/questions/1976007/
-        const noForbiddenChars = ['<', '>', ':', '"', '/', '|', '?', '*'].every(char => {
-          return parsedString.indexOf(char) === -1
-        })
-        if (!noForbiddenChars) {
-          reject(new Error('Forbidden Characters')) // use message as translation key
-        }
-      } else if (platform === 'darwin') {
-        // https://superuser.com/questions/204287/
-        if (parsedString.indexOf(':') !== -1) {
-          reject(new Error('Forbidden Characters'))
-        }
+      if (parsedString !== replaceFilenameForbiddenChars(parsedString)) {
+        reject(new Error('Forbidden Characters')) // use message as translation key
       }
 
-      const dirChar = platform === 'win32' ? '\\' : '/'
       let filename
-      if (parsedString.indexOf(dirChar) !== -1) {
-        const lastIndex = parsedString.lastIndexOf(dirChar)
+      if (parsedString.indexOf(path.sep) !== -1) {
+        const lastIndex = parsedString.lastIndexOf(path.sep)
         filename = parsedString.substring(lastIndex + 1)
       } else {
         filename = parsedString

From c1f257dd79c38cf1ff44f039e6d9c8e6ce81571f Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Fri, 2 Dec 2022 08:30:27 +0100
Subject: [PATCH 023/301] Clear cached subscription videos when removing all
 subscriptions (#2905)

---
 .../components/privacy-settings/privacy-settings.js   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/privacy-settings/privacy-settings.js b/src/renderer/components/privacy-settings/privacy-settings.js
index 4974944a2576..74046499c6bc 100644
--- a/src/renderer/components/privacy-settings/privacy-settings.js
+++ b/src/renderer/components/privacy-settings/privacy-settings.js
@@ -106,6 +106,13 @@ export default Vue.extend({
             this.removeProfile(profile._id)
           }
         })
+
+        this.updateAllSubscriptionsList([])
+        this.updateProfileSubscriptions({
+          activeProfile: MAIN_PROFILE_ID,
+          videoList: [],
+          errorChannels: []
+        })
       }
     },
 
@@ -117,7 +124,9 @@ export default Vue.extend({
       'clearSessionSearchHistory',
       'updateProfile',
       'removeProfile',
-      'updateActiveProfile'
+      'updateActiveProfile',
+      'updateAllSubscriptionsList',
+      'updateProfileSubscriptions'
     ])
   }
 })

From 4af752d2dceddcc02e3e662473d25507c0e4683c Mon Sep 17 00:00:00 2001
From: Kyotaro Iijima <kyotaro.eyes@gmail.com>
Date: Fri, 2 Dec 2022 17:36:11 +0000
Subject: [PATCH 024/301] Translated using Weblate (Japanese)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ja/
---
 static/locales/ja.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/ja.yaml b/static/locales/ja.yaml
index f46a7d8b160a..9c8071348af0 100644
--- a/static/locales/ja.yaml
+++ b/static/locales/ja.yaml
@@ -197,6 +197,7 @@ Settings:
     Expand Side Bar by Default: 幅広のサイド バーで起動
     Disable Smooth Scrolling: スムーズ スクロールの無効化
     Hide Side Bar Labels: サイドバー ラベルの非表示
+    Hide FreeTube Header Logo: FreeTube ヘッダー ロゴの非表示
   Player Settings:
     Player Settings: 'プレイヤーの設定'
     Force Local Backend for Legacy Formats: '旧形式であれば内部 API の適用'

From 7ac37dc0309abdb1294f174ba02e39977474ff4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9A=D0=BE=D1=82=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B1=D0=B0=D0=B9?= <artemkotlubai@yandex.ru>
Date: Sat, 3 Dec 2022 17:45:24 +0000
Subject: [PATCH 025/301] Translated using Weblate (Russian)

Currently translated at 99.8% (638 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 8ae518d2426d..8d353acc07c0 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -316,7 +316,7 @@ Settings:
     Are you sure you want to clear out your search cache?: Выполнить очистку кэша
       поиска?
     Clear Search Cache: Очистить кэш поиска
-    Save Watched Progress: Сохранять прогресс просмотра
+    Save Watched Progress: Сохранять ход просмотра
     Remember History: Запоминать историю
     Privacy Settings: Конфиденциальность
     Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: Выполнить

From 91b81850ffbcf58742c33e5ddba4a27ee04fe055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9A=D0=BE=D1=82=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B1=D0=B0=D0=B9?= <artemkotlubai@yandex.ru>
Date: Sat, 3 Dec 2022 22:19:09 +0000
Subject: [PATCH 026/301] Translated using Weblate (Russian)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 8d353acc07c0..4f3b741f6df0 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -209,6 +209,7 @@ Settings:
     Expand Side Bar by Default: Расширить боковую панель
     Disable Smooth Scrolling: Отключить плавную прокрутку
     Hide Side Bar Labels: Скрыть надписи боковой панели
+    Hide FreeTube Header Logo: Скрыть логотип заголовка FreeTube
   Player Settings:
     Player Settings: 'Настройки проигрывателя'
     Force Local Backend for Legacy Formats: 'Принудительно использовать локальный

From cabe6ddf651007cb53133e21b79f24798dc5300c Mon Sep 17 00:00:00 2001
From: Rusi Dimitrov <astral_86@mail.bg>
Date: Sat, 3 Dec 2022 22:06:30 +0000
Subject: [PATCH 027/301] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/bg/
---
 static/locales/bg.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/static/locales/bg.yaml b/static/locales/bg.yaml
index e2616f69cc17..8e59ddc43bb0 100644
--- a/static/locales/bg.yaml
+++ b/static/locales/bg.yaml
@@ -218,6 +218,7 @@ Settings:
     Disable Smooth Scrolling: Изключване на плавното превъртане
     Expand Side Bar by Default: Разширяване на страничната лента по подразбиране
     Hide Side Bar Labels: Скриване етикетите на страничната лента
+    Hide FreeTube Header Logo: Скриване логото на FreeTube
   Player Settings:
     Player Settings: 'Настройки на плейъра'
     Force Local Backend for Legacy Formats: 'Принудително връщане към локалния интерфейс
@@ -273,6 +274,7 @@ Settings:
         също така да използвате "\" или "/", за създаване на подпапки.
       Format Label: Формат
       Folder Button: Избор на папка
+    Enter Fullscreen on Display Rotate: Режим на цял екран при завъртане на дисплея
   Privacy Settings:
     Privacy Settings: 'Настройки за поверителност'
     Remember History: 'Запазване на историята'
@@ -388,6 +390,7 @@ Settings:
     Hide Sharing Actions: Скриване на действията за споделяне
     Hide Live Streams: Скриване на предавания на живо
     Hide Chapters: Скриване на главите
+    Hide Upcoming Premieres: Скриване на предстоящите премиери
   The app needs to restart for changes to take effect. Restart and apply change?: Приложението
     трябва да се рестартира за да се приложат промените. Рестартиране?
   Proxy Settings:
@@ -768,6 +771,7 @@ Share:
   YouTube Embed URL copied to clipboard: 'YouTube адресът за вграждане е копиран'
   YouTube Channel URL copied to clipboard: YouTube адресът на канала е копиран
   Invidious Channel URL copied to clipboard: Invidious адресът на канала е копиран
+  Share Channel: Споделяне на канал
 Mini Player: 'Мини плейър'
 Comments:
   Comments: 'Коментари'

From a433c04037af125b7c780a48c0b8f212799dfe79 Mon Sep 17 00:00:00 2001
From: Simon Epstein <simon@simondo.com>
Date: Sun, 4 Dec 2022 11:43:04 +0000
Subject: [PATCH 028/301] Hide unsubscribe button on channel list if this is
 set in parental controls. (#2906)

* Hide unsubscribe button on channel list if this is set in parental
controls.

* Fix github linting errors

* Removed trailing whitespace.

* Reverted yarn.lock change

* Remove package-lock.json

Co-authored-by: Simon Epstein <simon.epstein@67bricks.com>
---
 src/renderer/views/SubscribedChannels/SubscribedChannels.js  | 4 ++++
 src/renderer/views/SubscribedChannels/SubscribedChannels.vue | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.js b/src/renderer/views/SubscribedChannels/SubscribedChannels.js
index fff25c01f389..18ec467664b9 100644
--- a/src/renderer/views/SubscribedChannels/SubscribedChannels.js
+++ b/src/renderer/views/SubscribedChannels/SubscribedChannels.js
@@ -60,6 +60,10 @@ export default Vue.extend({
       }
     },
 
+    hideUnsubscribeButton: function() {
+      return this.$store.getters.getHideUnsubscribeButton
+    },
+
     locale: function () {
       return this.$i18n.locale.replace('_', '-')
     },
diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.vue b/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
index 28189fbafa06..e61b70f087fa 100644
--- a/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
+++ b/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
@@ -44,7 +44,10 @@
             >
               {{ channel.name }}
             </div>
-            <div class="unsubscribeContainer">
+            <div
+              v-if="!hideUnsubscribeButton"
+              class="unsubscribeContainer"
+            >
               <ft-button
                 :label="$t('Channels.Unsubscribe')"
                 background-color="var(--search-bar-color)"

From ba838828024a782ca9da035ca90a605319458759 Mon Sep 17 00:00:00 2001
From: Gediminas Murauskas <muziejusinfo@gmail.com>
Date: Sun, 4 Dec 2022 11:55:34 +0000
Subject: [PATCH 029/301] Translated using Weblate (Lithuanian)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/lt/
---
 static/locales/lt.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/lt.yaml b/static/locales/lt.yaml
index f19adbec9997..02f891954b2c 100644
--- a/static/locales/lt.yaml
+++ b/static/locales/lt.yaml
@@ -556,7 +556,7 @@ Video:
   Play Previous Video: 'Groti ankstesnį vaizdo įrašą'
   # Context is "X People Watching"
   Watching: 'Žiūri'
-  Watched: 'Žiūrėjo'
+  Watched: 'Žiūrėta'
   Autoplay: 'Paleisti automatiškai'
   Starting soon, please refresh the page to check again: 'Greitai prasidės, atnaujinkite
     puslapį, kad galėtumėte patikrinti dar kartą'

From 3d0157da75e62d03c0fd51bcb4e9bcfc1671379f Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Mon, 5 Dec 2022 08:42:40 +0100
Subject: [PATCH 030/301] Make more UI elements middle clickable (#2911)

---
 .../components/playlist-info/playlist-info.js |  4 --
 .../playlist-info/playlist-info.sass          |  5 +-
 .../playlist-info/playlist-info.vue           |  6 +-
 .../side-nav-more-options.js                  |  2 +-
 src/renderer/components/side-nav/side-nav.css |  3 +-
 src/renderer/components/side-nav/side-nav.js  |  5 --
 src/renderer/components/side-nav/side-nav.vue | 67 +++++++------------
 7 files changed, 32 insertions(+), 60 deletions(-)

diff --git a/src/renderer/components/playlist-info/playlist-info.js b/src/renderer/components/playlist-info/playlist-info.js
index 30f3e4da8d5e..a96819326478 100644
--- a/src/renderer/components/playlist-info/playlist-info.js
+++ b/src/renderer/components/playlist-info/playlist-info.js
@@ -135,10 +135,6 @@ export default Vue.extend({
           query: playlistInfo
         }
       )
-    },
-
-    goToChannel: function () {
-      this.$router.push({ path: `/channel/${this.channelId}` })
     }
   }
 })
diff --git a/src/renderer/components/playlist-info/playlist-info.sass b/src/renderer/components/playlist-info/playlist-info.sass
index 5e359934e942..bb382ccc9035 100644
--- a/src/renderer/components/playlist-info/playlist-info.sass
+++ b/src/renderer/components/playlist-info/playlist-info.sass
@@ -31,9 +31,8 @@
   align-items: center
   gap: 8px
   height: 40px
-
-  /* Indicates the box can be clicked to navigate */
-  cursor: pointer
+  text-decoration: none
+  color: inherit
 
 .channelThumbnail
   width: 40px
diff --git a/src/renderer/components/playlist-info/playlist-info.vue b/src/renderer/components/playlist-info/playlist-info.vue
index b3361cd03088..fbe4d0fda9b4 100644
--- a/src/renderer/components/playlist-info/playlist-info.vue
+++ b/src/renderer/components/playlist-info/playlist-info.vue
@@ -29,9 +29,9 @@
 
     <hr>
 
-    <div
+    <router-link
       class="playlistChannel"
-      @click="goToChannel"
+      :to="`/channel/${channelId}`"
     >
       <img
         class="channelThumbnail"
@@ -42,7 +42,7 @@
       >
         {{ channelName }}
       </h3>
-    </div>
+    </router-link>
 
     <br>
 
diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.js b/src/renderer/components/side-nav-more-options/side-nav-more-options.js
index 385a4c8f1ea6..e9f7fa02df29 100644
--- a/src/renderer/components/side-nav-more-options/side-nav-more-options.js
+++ b/src/renderer/components/side-nav-more-options/side-nav-more-options.js
@@ -32,7 +32,7 @@ export default Vue.extend({
   methods: {
     navigate: function (route) {
       this.openMoreOptions = false
-      this.$emit('navigate', route)
+      this.$router.push('/' + route)
     }
   }
 })
diff --git a/src/renderer/components/side-nav/side-nav.css b/src/renderer/components/side-nav/side-nav.css
index 8ff29f6c61ad..d5d32ef60c0c 100644
--- a/src/renderer/components/side-nav/side-nav.css
+++ b/src/renderer/components/side-nav/side-nav.css
@@ -40,7 +40,6 @@
 .navOption, .navChannel {
   position: relative;
   padding: 5px;
-  cursor: pointer;
   min-height: 35px;
 }
 
@@ -88,7 +87,7 @@
   transform: translateY(-50%);
 }
 
-.channelLink {
+.navOption, .channelLink {
   display: block;
   color: inherit;
   text-decoration: inherit;
diff --git a/src/renderer/components/side-nav/side-nav.js b/src/renderer/components/side-nav/side-nav.js
index 84cd4727abdc..7c7be13ef65c 100644
--- a/src/renderer/components/side-nav/side-nav.js
+++ b/src/renderer/components/side-nav/side-nav.js
@@ -75,10 +75,5 @@ export default Vue.extend({
         hiddenLabels: this.hideText
       }
     }
-  },
-  methods: {
-    navigate: function (route) {
-      this.$router.push('/' + route)
-    }
   }
 })
diff --git a/src/renderer/components/side-nav/side-nav.vue b/src/renderer/components/side-nav/side-nav.vue
index f5380154710c..f3e256c06c89 100644
--- a/src/renderer/components/side-nav/side-nav.vue
+++ b/src/renderer/components/side-nav/side-nav.vue
@@ -8,12 +8,11 @@
       class="inner"
       :class="applyHiddenLabels"
     >
-      <div
+      <router-link
         class="navOption topNavOption mobileShow "
         role="button"
-        tabindex="0"
+        to="/subscriptions"
         :title="$t('Subscriptions.Subscriptions')"
-        @click="navigate('subscriptions')"
       >
         <div
           class="thumbnailContainer"
@@ -31,14 +30,12 @@
         >
           {{ $t("Subscriptions.Subscriptions") }}
         </p>
-      </div>
-      <div
+      </router-link>
+      <router-link
         class="navOption mobileHidden"
         role="button"
-        tabindex="0"
+        to="/subscribedchannels"
         :title="$t('Channels.Channels')"
-        @click="navigate('subscribedchannels')"
-        @keydown.enter.prevent="navigate('subscribedchannels')"
       >
         <div
           class="thumbnailContainer"
@@ -56,15 +53,13 @@
         >
           {{ $t("Channels.Channels") }}
         </p>
-      </div>
-      <div
+      </router-link>
+      <router-link
         v-if="!hideTrendingVideos"
         class="navOption mobileHidden"
         role="button"
-        tabindex="0"
+        to="/trending"
         :title="$t('Trending.Trending')"
-        @click="navigate('trending')"
-        @keydown.enter.prevent="navigate('trending')"
       >
         <div
           class="thumbnailContainer"
@@ -82,15 +77,13 @@
         >
           {{ $t("Trending.Trending") }}
         </p>
-      </div>
-      <div
+      </router-link>
+      <router-link
         v-if="!hidePopularVideos && (backendFallback || backendPreference === 'invidious')"
         class="navOption mobileHidden"
         role="button"
-        tabindex="0"
+        to="/popular"
         :title="$t('Most Popular')"
-        @click="navigate('popular')"
-        @keydown.enter.prevent="navigate('popular')"
       >
         <div
           class="thumbnailContainer"
@@ -108,15 +101,13 @@
         >
           {{ $t("Most Popular") }}
         </p>
-      </div>
-      <div
+      </router-link>
+      <router-link
         v-if="!hidePlaylists"
         class="navOption mobileShow"
         role="button"
-        tabindex="0"
+        to="/userplaylists"
         :title="$t('Playlists')"
-        @click="navigate('userplaylists')"
-        @keydown.enter.prevent="navigate('userplaylists')"
       >
         <div
           class="thumbnailContainer"
@@ -134,17 +125,13 @@
         >
           {{ $t("Playlists") }}
         </p>
-      </div>
-      <side-nav-more-options
-        @navigate="navigate"
-      />
-      <div
+      </router-link>
+      <side-nav-more-options />
+      <router-link
         class="navOption mobileShow"
         role="button"
-        tabindex="0"
+        to="/history"
         :title="$t('History.History')"
-        @click="navigate('history')"
-        @keydown.enter.prevent="navigate('history')"
       >
         <div
           class="thumbnailContainer"
@@ -162,15 +149,13 @@
         >
           {{ $t("History.History") }}
         </p>
-      </div>
+      </router-link>
       <hr>
-      <div
+      <router-link
         class="navOption mobileShow"
         role="button"
-        tabindex="0"
+        to="/settings"
         :title="$t('Settings.Settings')"
-        @click="navigate('settings')"
-        @keydown.enter.prevent="navigate('settings')"
       >
         <div
           class="thumbnailContainer"
@@ -188,14 +173,12 @@
         >
           {{ $t('Settings.Settings') }}
         </p>
-      </div>
-      <div
+      </router-link>
+      <router-link
         class="navOption mobileHidden"
         role="button"
-        tabindex="0"
+        to="/about"
         :title="$t('About.About')"
-        @click="navigate('about')"
-        @keydown.enter.prevent="navigate('about')"
       >
         <div
           class="thumbnailContainer"
@@ -213,7 +196,7 @@
         >
           {{ $t("About.About") }}
         </p>
-      </div>
+      </router-link>
       <hr>
       <div
         v-if="!hideActiveSubscriptions"

From df3beb7c791a44410f67e4244c6d6202bf0c206b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 11:40:21 +0100
Subject: [PATCH 031/301] Bump electron-context-menu from 3.6.0 to 3.6.1
 (#2913)

Bumps [electron-context-menu](https://github.com/sindresorhus/electron-context-menu) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/sindresorhus/electron-context-menu/releases)
- [Commits](https://github.com/sindresorhus/electron-context-menu/compare/v3.6.0...v3.6.1)

---
updated-dependencies:
- dependency-name: electron-context-menu
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 70b7065812f6..122609ae76a7 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "autolinker": "^4.0.0",
     "browserify": "^17.0.0",
     "browserify-zlib": "^0.2.0",
-    "electron-context-menu": "^3.6.0",
+    "electron-context-menu": "^3.6.1",
     "http-proxy-agent": "^5.0.0",
     "https-proxy-agent": "^5.0.0",
     "lodash.debounce": "^4.0.8",
diff --git a/yarn.lock b/yarn.lock
index dbea5b5bbfac..70853b782cb0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3464,10 +3464,10 @@ electron-builder@^23.6.0:
     simple-update-notifier "^1.0.7"
     yargs "^17.5.1"
 
-electron-context-menu@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.0.tgz#d60fabb99d5bb06c46b6929c342c75cc0eee348e"
-  integrity sha512-7uhF3WX7ZalLEurKqML2cJJrBUw1JSZNzbwIB9kVbip7sVwyl7bVjiwHzdYjuOh/+xHw21ZzxwgZcB6sTeKdEw==
+electron-context-menu@^3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.1.tgz#42f117e15309687b22283e6f8f7a0d95a19afe84"
+  integrity sha512-lcpO6tzzKUROeirhzBjdBWNqayEThmdW+2I2s6H6QMrwqTVyT3EK47jW3Nxm60KTxl5/bWfEoIruoUNn57/QkQ==
   dependencies:
     cli-truncate "^2.1.0"
     electron-dl "^3.2.1"

From c918afece49df975efde66dac463a5158b078641 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 11:40:36 +0100
Subject: [PATCH 032/301] Bump vue-i18n from 8.28.1 to 8.28.2 (#2916)

Bumps [vue-i18n](https://github.com/intlify/vue-i18n-next/tree/HEAD/packages/vue-i18n) from 8.28.1 to 8.28.2.
- [Release notes](https://github.com/intlify/vue-i18n-next/releases)
- [Changelog](https://github.com/intlify/vue-i18n-next/blob/master/CHANGELOG.md)
- [Commits](https://github.com/intlify/vue-i18n-next/commits/HEAD/packages/vue-i18n)

---
updated-dependencies:
- dependency-name: vue-i18n
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 122609ae76a7..4f2b2149e4ae 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "videojs-overlay": "^2.1.4",
     "videojs-vtt-thumbnails-freetube": "0.0.15",
     "vue": "^2.7.13",
-    "vue-i18n": "^8.28.1",
+    "vue-i18n": "^8.28.2",
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
diff --git a/yarn.lock b/yarn.lock
index 70853b782cb0..7e518deab77a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8245,10 +8245,10 @@ vue-hot-reload-api@^2.3.0:
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
   integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
-vue-i18n@^8.28.1:
-  version "8.28.1"
-  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.28.1.tgz#f74e249ed9dbe3133661ff9879ae298664bc46ea"
-  integrity sha512-5anatPdfF5uHyHxZukYoqWPKFCbkLg854tnnAeRfUc3yE4/6hYDgvW/ftZLwCQvT7U0QZExC8Bv5L8xd61izBw==
+vue-i18n@^8.28.2:
+  version "8.28.2"
+  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.28.2.tgz#913558066e274395c0a9f40b2f3393d5c2636840"
+  integrity sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA==
 
 vue-loader@^15.10.0:
   version "15.10.0"

From ac20b19c137f609031b6a0690f5bcd131e12f8a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 11:40:44 +0100
Subject: [PATCH 033/301] Bump marked from 4.1.1 to 4.2.3 (#2915)

Bumps [marked](https://github.com/markedjs/marked) from 4.1.1 to 4.2.3.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v4.1.1...v4.2.3)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4f2b2149e4ae..40071240a1d4 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "http-proxy-agent": "^5.0.0",
     "https-proxy-agent": "^5.0.0",
     "lodash.debounce": "^4.0.8",
-    "marked": "^4.1.1",
+    "marked": "^4.2.3",
     "nedb-promises": "^6.2.1",
     "process": "^0.11.10",
     "socks-proxy-agent": "^7.0.0",
diff --git a/yarn.lock b/yarn.lock
index 7e518deab77a..b6207c9b7e4a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5631,10 +5631,10 @@ make-dir@^3.0.2:
   dependencies:
     semver "^6.0.0"
 
-marked@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-4.1.1.tgz#2f709a4462abf65a283f2453dc1c42ab177d302e"
-  integrity sha512-0cNMnTcUJPxbA6uWmCmjWz4NJRe/0Xfk2NhXCUHjew9qJzFN20krFnsUe7QynwqOwa5m1fZ4UDg0ycKFVC0ccw==
+marked@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.3.tgz#bd76a5eb510ff1d8421bc6c3b2f0b93488c15bea"
+  integrity sha512-slWRdJkbTZ+PjkyJnE30Uid64eHwbwa1Q25INCAYfZlK4o6ylagBy/Le9eWntqJFoFT93ikUKMv47GZ4gTwHkw==
 
 matcher@^3.0.0:
   version "3.0.0"

From 70425683c89c159a96e800e07361eb2db6f8fd99 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 11:40:51 +0100
Subject: [PATCH 034/301] Bump sass from 1.56.0 to 1.56.1 (#2914)

Bumps [sass](https://github.com/sass/dart-sass) from 1.56.0 to 1.56.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.56.0...1.56.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 40071240a1d4..a796c35d10c1 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
-    "sass": "^1.56.0",
+    "sass": "^1.56.1",
     "sass-loader": "^13.2.0",
     "tree-kill": "1.2.2",
     "vue-devtools": "^5.1.4",
diff --git a/yarn.lock b/yarn.lock
index b6207c9b7e4a..8b25e2d5df89 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7134,10 +7134,10 @@ sass-loader@^13.2.0:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
-sass@^1.56.0:
-  version "1.56.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.56.0.tgz#134032075a3223c8d49cb5c35e091e5ba1de8e0a"
-  integrity sha512-WFJ9XrpkcnqZcYuLRJh5qiV6ibQOR4AezleeEjTjMsCocYW59dEG19U3fwTTXxzi2Ed3yjPBp727hbbj53pHFw==
+sass@^1.56.1:
+  version "1.56.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.56.1.tgz#94d3910cd468fd075fa87f5bb17437a0b617d8a7"
+  integrity sha512-VpEyKpyBPCxE7qGDtOcdJ6fFbcpOM+Emu7uZLxVrkX8KVU/Dp5UF7WLvzqRuUhB6mqqQt1xffLoG+AndxTZrCQ==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From 08bba94a540c13b19546eaa29afa64208410633d Mon Sep 17 00:00:00 2001
From: Milo Ivir <mail@milotype.de>
Date: Mon, 5 Dec 2022 18:54:09 +0000
Subject: [PATCH 035/301] Translated using Weblate (Croatian)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/hr/
---
 static/locales/hr.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/hr.yaml b/static/locales/hr.yaml
index 1618bd34f1d8..e48018e91dcb 100644
--- a/static/locales/hr.yaml
+++ b/static/locales/hr.yaml
@@ -210,6 +210,7 @@ Settings:
     Disable Smooth Scrolling: Deaktiviraj neisprekidano klizanje
     Expand Side Bar by Default: Standardno proširi bočnu traku
     Hide Side Bar Labels: Sakrij oznake bočnih traka
+    Hide FreeTube Header Logo: Sakrij FreeTube logotip u zaglavlju
   Player Settings:
     Player Settings: 'Postavke playera'
     Force Local Backend for Legacy Formats: 'Koristi lokalni pozadinski sustav za

From fa9a992a5289656689b46b51f797b40c6c0e0c72 Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Tue, 6 Dec 2022 15:47:34 +0800
Subject: [PATCH 036/301] Update copy/open YT video in playlist view to have
 playlist ID when present (#2848)

* * Update copy/open YT video in playlist view to have playlist ID when present

* * Update YT share URL for video with playlist
---
 .../components/ft-list-video/ft-list-video.js | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js
index 571d0d542867..5c31573c64e1 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.js
+++ b/src/renderer/components/ft-list-video/ft-list-video.js
@@ -98,7 +98,13 @@ export default Vue.extend({
     },
 
     invidiousUrl: function () {
-      return `${this.currentInvidiousInstance}/watch?v=${this.id}`
+      let videoUrl = `${this.currentInvidiousInstance}/watch?v=${this.id}`
+      // `playlistId` can be undefined
+      if (this.playlistId && this.playlistId.length !== 0) {
+        // `index` seems can be ignored
+        videoUrl += `&list=${this.playlistId}`
+      }
+      return videoUrl
     },
 
     invidiousChannelUrl: function () {
@@ -106,10 +112,21 @@ export default Vue.extend({
     },
 
     youtubeUrl: function () {
-      return `https://www.youtube.com/watch?v=${this.id}`
+      let videoUrl = `https://www.youtube.com/watch?v=${this.id}`
+      // `playlistId` can be undefined
+      if (this.playlistId && this.playlistId.length !== 0) {
+        // `index` seems can be ignored
+        videoUrl += `&list=${this.playlistId}`
+      }
+      return videoUrl
     },
 
     youtubeShareUrl: function () {
+      // `playlistId` can be undefined
+      if (this.playlistId && this.playlistId.length !== 0) {
+        // `index` seems can be ignored
+        return `https://youtu.be/${this.id}?list=${this.playlistId}`
+      }
       return `https://youtu.be/${this.id}`
     },
 

From c5697443ff9e76b073801245b53d5ffed00daa1c Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 6 Dec 2022 12:05:20 +0100
Subject: [PATCH 037/301] Only show the load more comments button when
 necessary (#2917)

---
 .../components/watch-video-comments/watch-video-comments.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.vue b/src/renderer/components/watch-video-comments/watch-video-comments.vue
index 9edf67048102..060ced466bd4 100644
--- a/src/renderer/components/watch-video-comments/watch-video-comments.vue
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.vue
@@ -192,7 +192,7 @@
       </h3>
     </div>
     <h4
-      v-if="commentData.length > 0 && !isLoading && showComments"
+      v-if="commentData.length > 0 && !isLoading && showComments && nextPageToken"
       class="getMoreComments"
       @click="getMoreComments"
     >

From a88bafeb27d7ee4db4fd7cb88a888ef0d77c6f41 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 6 Dec 2022 12:37:44 +0100
Subject: [PATCH 038/301] Make getUserDataPath, getPicturesPath and
 getSystemLocale helpers (#2920)

---
 .../components/data-settings/data-settings.js |  1 -
 .../experimental-settings.js                  | 10 ++---
 .../ft-video-player/ft-video-player.js        |  7 ++--
 .../player-settings/player-settings.js        |  4 +-
 src/renderer/helpers/api/local.js             |  6 +--
 src/renderer/helpers/utils.js                 | 33 +++++++++++++++
 src/renderer/store/modules/settings.js        |  4 +-
 src/renderer/store/modules/utils.js           | 42 -------------------
 src/renderer/views/Watch/Watch.js             |  8 ++--
 9 files changed, 50 insertions(+), 65 deletions(-)

diff --git a/src/renderer/components/data-settings/data-settings.js b/src/renderer/components/data-settings/data-settings.js
index 31dd51c85903..857816276370 100644
--- a/src/renderer/components/data-settings/data-settings.js
+++ b/src/renderer/components/data-settings/data-settings.js
@@ -1121,7 +1121,6 @@ export default Vue.extend({
       'updateShowProgressBar',
       'updateHistory',
       'compactHistory',
-      'getUserDataPath',
       'addPlaylist',
       'addVideo'
     ]),
diff --git a/src/renderer/components/experimental-settings/experimental-settings.js b/src/renderer/components/experimental-settings/experimental-settings.js
index 83cbf7080dc7..ec0116809fb9 100644
--- a/src/renderer/components/experimental-settings/experimental-settings.js
+++ b/src/renderer/components/experimental-settings/experimental-settings.js
@@ -1,10 +1,10 @@
 import { closeSync, existsSync, openSync, rmSync } from 'fs'
 import Vue from 'vue'
-import { mapActions } from 'vuex'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtPrompt from '../ft-prompt/ft-prompt.vue'
+import { getUserDataPath } from '../../helpers/utils'
 
 export default Vue.extend({
   name: 'ExperimentalSettings',
@@ -23,7 +23,7 @@ export default Vue.extend({
     }
   },
   mounted: function () {
-    this.getUserDataPath().then((userData) => {
+    getUserDataPath().then((userData) => {
       this.replaceHttpCachePath = `${userData}/experiment-replace-http-cache`
 
       this.replaceHttpCache = existsSync(this.replaceHttpCachePath)
@@ -64,10 +64,6 @@ export default Vue.extend({
 
       const { ipcRenderer } = require('electron')
       ipcRenderer.send('relaunchRequest')
-    },
-
-    ...mapActions([
-      'getUserDataPath'
-    ])
+    }
   }
 })
diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
index aa3eacbc072d..ba1b24cf5215 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -15,7 +15,7 @@ import 'videojs-mobile-ui/dist/videojs-mobile-ui.css'
 import { IpcChannels } from '../../../constants'
 import { sponsorBlockSkipSegments } from '../../helpers/sponsorblock'
 import { calculateColorLuminance, colors } from '../../helpers/colors'
-import { showSaveDialog, showToast } from '../../helpers/utils'
+import { getPicturesPath, showSaveDialog, showToast } from '../../helpers/utils'
 
 export default Vue.extend({
   name: 'FtVideoPlayer',
@@ -1382,7 +1382,7 @@ export default Vue.extend({
         }
 
         if (this.screenshotFolder === '' || !fs.existsSync(this.screenshotFolder)) {
-          dirPath = await this.getPicturesPath()
+          dirPath = await getPicturesPath()
         } else {
           dirPath = this.screenshotFolder
         }
@@ -1415,7 +1415,7 @@ export default Vue.extend({
         this.updateScreenshotFolderPath(dirPath)
       } else {
         if (this.screenshotFolder === '') {
-          dirPath = path.join(await this.getPicturesPath(), 'Freetube', subDir)
+          dirPath = path.join(await getPicturesPath(), 'Freetube', subDir)
         } else {
           dirPath = path.join(this.screenshotFolder, subDir)
         }
@@ -1922,7 +1922,6 @@ export default Vue.extend({
       'updateDefaultCaptionSettings',
       'parseScreenshotCustomFileName',
       'updateScreenshotFolderPath',
-      'getPicturesPath'
     ])
   }
 })
diff --git a/src/renderer/components/player-settings/player-settings.js b/src/renderer/components/player-settings/player-settings.js
index 0d7379e15279..8084b5a530ce 100644
--- a/src/renderer/components/player-settings/player-settings.js
+++ b/src/renderer/components/player-settings/player-settings.js
@@ -11,6 +11,7 @@ import FtTooltip from '../ft-tooltip/ft-tooltip.vue'
 import { ipcRenderer } from 'electron'
 import { IpcChannels } from '../../../constants'
 import path from 'path'
+import { getPicturesPath } from '../../helpers/utils'
 
 export default Vue.extend({
   name: 'PlayerSettings',
@@ -204,7 +205,7 @@ export default Vue.extend({
     },
 
     getScreenshotEmptyFolderPlaceholder: async function() {
-      return path.join(await this.getPicturesPath(), 'Freetube')
+      return path.join(await getPicturesPath(), 'Freetube')
     },
 
     getScreenshotFolderPlaceholder: function() {
@@ -284,7 +285,6 @@ export default Vue.extend({
       'updateScreenshotFolderPath',
       'updateScreenshotFilenamePattern',
       'parseScreenshotCustomFileName',
-      'getPicturesPath'
     ])
   }
 })
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index adce44e38f93..2af7d7911ede 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -1,8 +1,8 @@
 import { Innertube, Session } from 'youtubei.js'
-import { PlayerCache } from './PlayerCache'
 import { join } from 'path'
 
-import store from '../../store/index'
+import { PlayerCache } from './PlayerCache'
+import { getUserDataPath } from '../utils'
 
 /**
  * Creates a lightweight Innertube instance, which is faster to create or
@@ -17,7 +17,7 @@ import store from '../../store/index'
  */
 async function createInnertube(withPlayer = false) {
   if (withPlayer) {
-    const userData = await store.dispatch('getUserDataPath')
+    const userData = await getUserDataPath()
 
     return await Innertube.create({
       // use browser fetch
diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index 9f1991c8f8eb..5cba3e30e56f 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -455,3 +455,36 @@ export function replaceFilenameForbiddenChars(filenameOriginal) {
   }
   return filenameNew
 }
+
+export async function getSystemLocale() {
+  let locale
+  if (process.env.IS_ELECTRON) {
+    const { ipcRenderer } = require('electron')
+    locale = await ipcRenderer.invoke(IpcChannels.GET_SYSTEM_LOCALE)
+  } else {
+    if (navigator && navigator.language) {
+      locale = navigator.language
+    }
+  }
+
+  return locale || 'en-US'
+}
+
+export async function getUserDataPath() {
+  if (process.env.IS_ELECTRON) {
+    const { ipcRenderer } = require('electron')
+    return await ipcRenderer.invoke(IpcChannels.GET_USER_DATA_PATH)
+  } else {
+    // TODO: implement getUserDataPath web compatible callback
+    return null
+  }
+}
+
+export async function getPicturesPath() {
+  if (process.env.IS_ELECTRON) {
+    const { ipcRenderer } = require('electron')
+    return await ipcRenderer.invoke(IpcChannels.GET_PICTURES_PATH)
+  } else {
+    return null
+  }
+}
diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
index 4fe04df2f59e..40090fd358b8 100644
--- a/src/renderer/store/modules/settings.js
+++ b/src/renderer/store/modules/settings.js
@@ -1,7 +1,7 @@
 import i18n from '../../i18n/index'
 import { MAIN_PROFILE_ID, IpcChannels, SyncEvents } from '../../../constants'
 import { DBSettingHandlers } from '../../../datastores/handlers/index'
-import { showToast } from '../../helpers/utils'
+import { getSystemLocale, showToast } from '../../helpers/utils'
 
 /*
  * Due to the complexity of the settings module in FreeTube, a more
@@ -285,7 +285,7 @@ const stateWithSideEffects = {
 
       let targetLocale = value
       if (value === 'system') {
-        const systemLocaleName = (await dispatch('getSystemLocale')).replace('-', '_') // ex: en_US
+        const systemLocaleName = (await getSystemLocale()).replace('-', '_') // ex: en_US
         const systemLocaleLang = systemLocaleName.split('_')[0] // ex: en
         const targetLocaleOptions = i18n.allLocales.filter((locale) => { // filter out other languages
           const localeLang = locale.replace('-', '_').split('_')[0]
diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index 54b5e3d03c27..ff1e741a734b 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -101,27 +101,6 @@ const getters = {
   }
 }
 
-/**
- * Wrapper function that calls `ipcRenderer.invoke(IRCtype, payload)` if the user is
- * using Electron or a provided custom callback otherwise.
- * @param {Object} context Object
- * @param {String} IRCtype String
- * @param {Function} webCbk Function
- * @param {Object} payload any (default: null)
-*/
-
-async function invokeIRC(context, IRCtype, webCbk, payload = null) {
-  let response = null
-  if (process.env.IS_ELECTRON) {
-    const { ipcRenderer } = require('electron')
-    response = await ipcRenderer.invoke(IRCtype, payload)
-  } else if (webCbk) {
-    response = await webCbk()
-  }
-
-  return response
-}
-
 const actions = {
   async downloadMedia({ rootState }, { url, title, extension, fallingBackPath }) {
     if (!process.env.IS_ELECTRON) {
@@ -207,27 +186,6 @@ const actions = {
     })
   },
 
-  async getSystemLocale (context) {
-    const webCbk = () => {
-      if (navigator && navigator.language) {
-        return navigator.language
-      }
-    }
-
-    return (await invokeIRC(context, IpcChannels.GET_SYSTEM_LOCALE, webCbk)) || 'en-US'
-  },
-
-  async getUserDataPath (context) {
-    // TODO: implement getUserDataPath web compatible callback
-    const webCbk = () => null
-    return await invokeIRC(context, IpcChannels.GET_USER_DATA_PATH, webCbk)
-  },
-
-  async getPicturesPath (context) {
-    const webCbk = () => null
-    return await invokeIRC(context, IpcChannels.GET_PICTURES_PATH, webCbk)
-  },
-
   parseScreenshotCustomFileName: function({ rootState }, payload) {
     return new Promise((resolve, reject) => {
       const { pattern = rootState.settings.screenshotFilenamePattern, date, playerTime, videoId } = payload
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 61d4aceac7bc..6ce4172dc6f8 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -17,6 +17,7 @@ import {
   buildVTTFileLocally,
   copyToClipboard,
   formatDurationAsTimestamp,
+  getUserDataPath,
   showToast
 } from '../../helpers/utils'
 
@@ -1194,7 +1195,6 @@ export default Vue.extend({
       }
 
       if (this.removeVideoMetaFiles) {
-        const userData = await this.getUserDataPath()
         if (process.env.NODE_ENV === 'development') {
           const dashFileLocation = `static/dashFiles/${videoId}.xml`
           const vttFileLocation = `static/storyboards/${videoId}.vtt`
@@ -1206,6 +1206,7 @@ export default Vue.extend({
             fs.rmSync(vttFileLocation)
           }
         } else {
+          const userData = await getUserDataPath()
           const dashFileLocation = `${userData}/dashFiles/${videoId}.xml`
           const vttFileLocation = `${userData}/storyboards/${videoId}.vtt`
 
@@ -1239,7 +1240,7 @@ export default Vue.extend({
 
     createLocalDashManifest: async function (formats) {
       const xmlData = ytDashGen.generate_dash_file_from_formats(formats, this.videoLengthSeconds)
-      const userData = await this.getUserDataPath()
+      const userData = await getUserDataPath()
       let fileLocation
       let uriSchema
       if (process.env.NODE_ENV === 'development') {
@@ -1317,7 +1318,7 @@ export default Vue.extend({
       })
       // TODO: MAKE A VARIABLE WHICH CAN CHOOSE BETWEEN STORYBOARD ARRAY ELEMENTS
       const results = buildVTTFileLocally(storyboardArray[1])
-      this.getUserDataPath().then((userData) => {
+      getUserDataPath().then((userData) => {
         let fileLocation
         let uriSchema
 
@@ -1474,7 +1475,6 @@ export default Vue.extend({
     ...mapActions([
       'updateHistory',
       'updateWatchProgress',
-      'getUserDataPath',
       'ytGetVideoInformation',
       'invidiousGetVideoInformation',
       'updateSubscriptionDetails'

From 735886aec84c33b2f603dfb403633562c775f2e3 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 6 Dec 2022 12:38:42 +0100
Subject: [PATCH 039/301] Increase dependebot PR limit to 10 (#2918)

---
 .github/dependabot.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 396fc42b3a9a..c90fb342d97a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,6 +7,7 @@ updates:
     labels:
       - "PR: waiting for review"
       - "PR: dependencies"
+    open-pull-requests-limit: 10
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

From cdb33f348e347064e11e77393fe00b3d78a475a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 14:42:15 +0100
Subject: [PATCH 040/301] Bump mini-css-extract-plugin from 2.7.0 to 2.7.2
 (#2923)

Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 2.7.0 to 2.7.2.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v2.7.0...v2.7.2)

---
updated-dependencies:
- dependency-name: mini-css-extract-plugin
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a796c35d10c1..4455e31c2da1 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "js-yaml": "^4.1.0",
     "json-minimizer-webpack-plugin": "^4.0.0",
     "lefthook": "^1.1.4",
-    "mini-css-extract-plugin": "^2.7.0",
+    "mini-css-extract-plugin": "^2.7.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
diff --git a/yarn.lock b/yarn.lock
index 8b25e2d5df89..ea57e397f72d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5756,10 +5756,10 @@ min-document@^2.19.0:
   dependencies:
     dom-walk "^0.1.0"
 
-mini-css-extract-plugin@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.0.tgz#d7d9ba0c5b596d155e36e2b174082fc7f010dd64"
-  integrity sha512-auqtVo8KhTScMsba7MbijqZTfibbXiBNlPAQbsVt7enQfcDYLdgG57eGxMqwVU3mfeWANY4F1wUg+rMF+ycZgw==
+mini-css-extract-plugin@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz#e049d3ea7d3e4e773aad585c6cb329ce0c7b72d7"
+  integrity sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==
   dependencies:
     schema-utils "^4.0.0"
 

From bd28de186de63d7295050f6a2d1d39e6a46d1742 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 15:04:20 +0100
Subject: [PATCH 041/301] Bump @babel/preset-env from 7.18.10 to 7.20.2 (#2921)

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.18.10 to 7.20.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.20.2/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 435 ++++++++++++++++++++++++++-------------------------
 2 files changed, 226 insertions(+), 211 deletions(-)

diff --git a/package.json b/package.json
index 4455e31c2da1..8e6aecc9f3e3 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
   "devDependencies": {
     "@babel/core": "^7.20.2",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/preset-env": "^7.18.10",
+    "@babel/preset-env": "^7.20.2",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^9.1.0",
     "copy-webpack-plugin": "^11.0.0",
diff --git a/yarn.lock b/yarn.lock
index ea57e397f72d..12135bba1474 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -29,15 +29,10 @@
   dependencies:
     "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.13.tgz#6aff7b350a1e8c3e40b029e46cbe78e24a913483"
-  integrity sha512-5yUzC5LqyTFp2HLmDoxGQelcdYgSpP9xsnMWBphAscOdFrHSAVbLNzWiy32sVNDqJRDiJK6klfDnAgu6PAGSHw==
-
-"@babel/compat-data@^7.20.0":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30"
-  integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.0", "@babel/compat-data@^7.20.1":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733"
+  integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==
 
 "@babel/core@^7.20.2":
   version "7.20.2"
@@ -69,12 +64,14 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
-  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
+"@babel/generator@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95"
+  integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.20.5"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    jsesc "^2.5.1"
 
 "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
@@ -114,14 +111,6 @@
     "@babel/helper-replace-supers" "^7.18.9"
     "@babel/helper-split-export-declaration" "^7.18.6"
 
-"@babel/helper-create-regexp-features-plugin@^7.16.7":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1"
-  integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    regexpu-core "^5.0.1"
-
 "@babel/helper-create-regexp-features-plugin@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz#3e35f4e04acbbf25f1b3534a657610a000543d3c"
@@ -130,10 +119,18 @@
     "@babel/helper-annotate-as-pure" "^7.18.6"
     regexpu-core "^5.1.0"
 
-"@babel/helper-define-polyfill-provider@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz#bd10d0aca18e8ce012755395b05a79f45eca5073"
-  integrity sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==
+"@babel/helper-create-regexp-features-plugin@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz#5ea79b59962a09ec2acf20a963a01ab4d076ccca"
+  integrity sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    regexpu-core "^5.2.1"
+
+"@babel/helper-define-polyfill-provider@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
+  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
   dependencies:
     "@babel/helper-compilation-targets" "^7.17.7"
     "@babel/helper-plugin-utils" "^7.16.7"
@@ -191,7 +188,7 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.18.9", "@babel/helper-module-transforms@^7.20.2":
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.2":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712"
   integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==
@@ -212,15 +209,10 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
-  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
-
-"@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f"
-  integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
+  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
 
 "@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
   version "7.18.9"
@@ -243,14 +235,18 @@
     "@babel/traverse" "^7.18.9"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-simple-access@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea"
-  integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==
+"@babel/helper-replace-supers@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz#e1592a9b4b368aa6bdb8784a711e0bcbf0612b78"
+  integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/traverse" "^7.19.1"
+    "@babel/types" "^7.19.0"
 
-"@babel/helper-simple-access@^7.20.2":
+"@babel/helper-simple-access@^7.19.4", "@babel/helper-simple-access@^7.20.2":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
   integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
@@ -338,6 +334,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.3.tgz#5358cf62e380cf69efcb87a7bb922ff88bfac6e2"
   integrity sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==
 
+"@babel/parser@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8"
+  integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -354,13 +355,13 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
     "@babel/plugin-proposal-optional-chaining" "^7.18.9"
 
-"@babel/plugin-proposal-async-generator-functions@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz#85ea478c98b0095c3e4102bff3b67d306ed24952"
-  integrity sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==
+"@babel/plugin-proposal-async-generator-functions@^7.20.1":
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz#352f02baa5d69f4e7529bdac39aaa02d41146af9"
+  integrity sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
@@ -429,16 +430,16 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7"
-  integrity sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==
+"@babel/plugin-proposal-object-rest-spread@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz#a556f59d555f06961df1e572bb5eca864c84022d"
+  integrity sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ==
   dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/compat-data" "^7.20.1"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.18.8"
+    "@babel/plugin-transform-parameters" "^7.20.1"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.18.6":
   version "7.18.6"
@@ -475,7 +476,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.18.6":
+"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
   integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
@@ -483,14 +484,6 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
-  integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
@@ -526,12 +519,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-import-assertions@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz#cd6190500a4fa2fe31990a963ffab4b63e4505e4"
-  integrity sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==
+"@babel/plugin-syntax-import-assertions@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
+  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
@@ -619,24 +612,25 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz#f9b7e018ac3f373c81452d6ada8bd5a18928926d"
-  integrity sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw==
+"@babel/plugin-transform-block-scoping@^7.20.2":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.5.tgz#401215f9dc13dc5262940e2e527c9536b3d7f237"
+  integrity sha512-WvpEIW9Cbj9ApF3yJCjIEEf1EiNJLtXagOrL5LNWEZOo3jv8pmPoYTSNJQvqej8OavVlgOoOPw6/htGZro6IkA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-classes@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz#90818efc5b9746879b869d5ce83eb2aa48bbc3da"
-  integrity sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==
+"@babel/plugin-transform-classes@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz#c0033cf1916ccf78202d04be4281d161f6709bb2"
+  integrity sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.20.0"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
     "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-replace-supers" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-replace-supers" "^7.19.1"
     "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
@@ -647,14 +641,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-destructuring@^7.18.9":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz#9e03bc4a94475d62b7f4114938e6c5c33372cbf5"
-  integrity sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==
+"@babel/plugin-transform-destructuring@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz#c23741cfa44ddd35f5e53896e88c75331b8b2792"
+  integrity sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-dotall-regex@^7.18.6":
+"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
   integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
@@ -662,14 +656,6 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
-  integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-
 "@babel/plugin-transform-duplicate-keys@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
@@ -715,35 +701,32 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-amd@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz#8c91f8c5115d2202f277549848874027d7172d21"
-  integrity sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==
+"@babel/plugin-transform-modules-amd@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz#aca391801ae55d19c4d8d2ebfeaa33df5f2a2cbd"
+  integrity sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz#afd243afba166cca69892e24a8fd8c9f2ca87883"
-  integrity sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==
+"@babel/plugin-transform-modules-commonjs@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz#25b32feef24df8038fc1ec56038917eacb0b730c"
+  integrity sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-simple-access" "^7.18.6"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-simple-access" "^7.19.4"
 
-"@babel/plugin-transform-modules-systemjs@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz#545df284a7ac6a05125e3e405e536c5853099a06"
-  integrity sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==
+"@babel/plugin-transform-modules-systemjs@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d"
+  integrity sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-validator-identifier" "^7.19.1"
 
 "@babel/plugin-transform-modules-umd@^7.18.6":
   version "7.18.6"
@@ -753,13 +736,13 @@
     "@babel/helper-module-transforms" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz#c89bfbc7cc6805d692f3a49bc5fc1b630007246d"
-  integrity sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
+  integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.20.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-transform-new-target@^7.18.6":
   version "7.18.6"
@@ -776,12 +759,12 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/helper-replace-supers" "^7.18.6"
 
-"@babel/plugin-transform-parameters@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz#ee9f1a0ce6d78af58d0956a9378ea3427cccb48a"
-  integrity sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==
+"@babel/plugin-transform-parameters@^7.20.1":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.5.tgz#f8f9186c681d10c3de7620c916156d893c8a019e"
+  integrity sha512-h7plkOmcndIUWXZFLgpbrh2+fXAi47zcUX7IrOQuZdLD0I0KvjJ6cvo3BEcAOsDOcZhVKGJqv07mkSqK0y2isQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-transform-property-literals@^7.18.6":
   version "7.18.6"
@@ -812,12 +795,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz#6ea7a6297740f381c540ac56caf75b05b74fb664"
-  integrity sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==
+"@babel/plugin-transform-spread@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6"
+  integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
 
 "@babel/plugin-transform-sticky-regex@^7.18.6":
@@ -856,18 +839,18 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/preset-env@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.10.tgz#83b8dfe70d7eea1aae5a10635ab0a5fe60dfc0f4"
-  integrity sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==
+"@babel/preset-env@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506"
+  integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==
   dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/compat-data" "^7.20.1"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/helper-validator-option" "^7.18.6"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-async-generator-functions" "^7.18.10"
+    "@babel/plugin-proposal-async-generator-functions" "^7.20.1"
     "@babel/plugin-proposal-class-properties" "^7.18.6"
     "@babel/plugin-proposal-class-static-block" "^7.18.6"
     "@babel/plugin-proposal-dynamic-import" "^7.18.6"
@@ -876,7 +859,7 @@
     "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
     "@babel/plugin-proposal-numeric-separator" "^7.18.6"
-    "@babel/plugin-proposal-object-rest-spread" "^7.18.9"
+    "@babel/plugin-proposal-object-rest-spread" "^7.20.2"
     "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
     "@babel/plugin-proposal-optional-chaining" "^7.18.9"
     "@babel/plugin-proposal-private-methods" "^7.18.6"
@@ -887,7 +870,7 @@
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.18.6"
+    "@babel/plugin-syntax-import-assertions" "^7.20.0"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -900,10 +883,10 @@
     "@babel/plugin-transform-arrow-functions" "^7.18.6"
     "@babel/plugin-transform-async-to-generator" "^7.18.6"
     "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
-    "@babel/plugin-transform-block-scoping" "^7.18.9"
-    "@babel/plugin-transform-classes" "^7.18.9"
+    "@babel/plugin-transform-block-scoping" "^7.20.2"
+    "@babel/plugin-transform-classes" "^7.20.2"
     "@babel/plugin-transform-computed-properties" "^7.18.9"
-    "@babel/plugin-transform-destructuring" "^7.18.9"
+    "@babel/plugin-transform-destructuring" "^7.20.2"
     "@babel/plugin-transform-dotall-regex" "^7.18.6"
     "@babel/plugin-transform-duplicate-keys" "^7.18.9"
     "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
@@ -911,30 +894,30 @@
     "@babel/plugin-transform-function-name" "^7.18.9"
     "@babel/plugin-transform-literals" "^7.18.9"
     "@babel/plugin-transform-member-expression-literals" "^7.18.6"
-    "@babel/plugin-transform-modules-amd" "^7.18.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.18.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.18.9"
+    "@babel/plugin-transform-modules-amd" "^7.19.6"
+    "@babel/plugin-transform-modules-commonjs" "^7.19.6"
+    "@babel/plugin-transform-modules-systemjs" "^7.19.6"
     "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.18.6"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1"
     "@babel/plugin-transform-new-target" "^7.18.6"
     "@babel/plugin-transform-object-super" "^7.18.6"
-    "@babel/plugin-transform-parameters" "^7.18.8"
+    "@babel/plugin-transform-parameters" "^7.20.1"
     "@babel/plugin-transform-property-literals" "^7.18.6"
     "@babel/plugin-transform-regenerator" "^7.18.6"
     "@babel/plugin-transform-reserved-words" "^7.18.6"
     "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.18.9"
+    "@babel/plugin-transform-spread" "^7.19.0"
     "@babel/plugin-transform-sticky-regex" "^7.18.6"
     "@babel/plugin-transform-template-literals" "^7.18.9"
     "@babel/plugin-transform-typeof-symbol" "^7.18.9"
     "@babel/plugin-transform-unicode-escapes" "^7.18.10"
     "@babel/plugin-transform-unicode-regex" "^7.18.6"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.18.10"
-    babel-plugin-polyfill-corejs2 "^0.3.2"
-    babel-plugin-polyfill-corejs3 "^0.5.3"
-    babel-plugin-polyfill-regenerator "^0.4.0"
-    core-js-compat "^3.22.1"
+    "@babel/types" "^7.20.2"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
+    core-js-compat "^3.25.1"
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.5":
@@ -980,10 +963,26 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.16.7", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842"
-  integrity sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==
+"@babel/traverse@^7.19.1":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133"
+  integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.5"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.20.5"
+    "@babel/types" "^7.20.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84"
+  integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==
   dependencies:
     "@babel/helper-string-parser" "^7.19.4"
     "@babel/helper-validator-identifier" "^7.19.1"
@@ -2103,36 +2102,29 @@ babel-loader@^9.1.0:
     find-cache-dir "^3.3.2"
     schema-utils "^4.0.0"
 
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
-  dependencies:
-    object.assign "^4.1.0"
-
-babel-plugin-polyfill-corejs2@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz#e4c31d4c89b56f3cf85b92558954c66b54bd972d"
-  integrity sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==
+babel-plugin-polyfill-corejs2@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
+  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
   dependencies:
     "@babel/compat-data" "^7.17.7"
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7"
-  integrity sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==
+babel-plugin-polyfill-corejs3@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
+  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
-    core-js-compat "^3.21.0"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    core-js-compat "^3.25.1"
 
-babel-plugin-polyfill-regenerator@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz#8f51809b6d5883e07e71548d75966ff7635527fe"
-  integrity sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==
+babel-plugin-polyfill-regenerator@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
+  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
 
 balanced-match@^1.0.0:
   version "1.0.2"
@@ -2397,7 +2389,7 @@ browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4
     node-releases "^2.0.6"
     update-browserslist-db "^1.0.5"
 
-browserslist@^4.21.3:
+browserslist@^4.21.3, browserslist@^4.21.4:
   version "4.21.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
   integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
@@ -2887,13 +2879,12 @@ copy-webpack-plugin@^11.0.0:
     schema-utils "^4.0.0"
     serialize-javascript "^6.0.0"
 
-core-js-compat@^3.21.0, core-js-compat@^3.22.1:
-  version "3.22.5"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.5.tgz#7fffa1d20cb18405bd22756ca1353c6f1a0e8614"
-  integrity sha512-rEF75n3QtInrYICvJjrAgV03HwKiYvtKHdPtaba1KucG+cNZ4NJnH9isqt979e67KZlhpbCOTwnsvnIr+CVeOg==
+core-js-compat@^3.25.1:
+  version "3.26.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.1.tgz#0e710b09ebf689d719545ac36e49041850f943df"
+  integrity sha512-622/KzTudvXCDLRw70iHW4KKs1aGpcRcowGWyYJr2DEBfRrd6hNJybxSWJFuZYD4ma86xhrwDDHxmDaIq4EA8A==
   dependencies:
-    browserslist "^4.20.3"
-    semver "7.0.0"
+    browserslist "^4.21.4"
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -6053,7 +6044,7 @@ object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object.assign@^4.1.0, object.assign@^4.1.2:
+object.assign@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
   integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
@@ -6871,6 +6862,13 @@ regenerate-unicode-properties@^10.0.1:
   dependencies:
     regenerate "^1.4.2"
 
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
+  dependencies:
+    regenerate "^1.4.2"
+
 regenerate@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
@@ -6902,18 +6900,6 @@ regexpp@^3.0.0, regexpp@^3.1.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-regexpu-core@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3"
-  integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==
-  dependencies:
-    regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.0.1"
-    regjsgen "^0.6.0"
-    regjsparser "^0.8.2"
-    unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.0.0"
-
 regexpu-core@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.1.0.tgz#2f8504c3fd0ebe11215783a41541e21c79942c6d"
@@ -6926,11 +6912,28 @@ regexpu-core@^5.1.0:
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.0.0"
 
+regexpu-core@^5.2.1:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.2.tgz#3e4e5d12103b64748711c3aad69934d7718e75fc"
+  integrity sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==
+  dependencies:
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsgen "^0.7.1"
+    regjsparser "^0.9.1"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.1.0"
+
 regjsgen@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d"
   integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==
 
+regjsgen@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz#ee5ef30e18d3f09b7c369b76e7c2373ed25546f6"
+  integrity sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==
+
 regjsparser@^0.8.2:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f"
@@ -6938,6 +6941,13 @@ regjsparser@^0.8.2:
   dependencies:
     jsesc "~0.5.0"
 
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
+  dependencies:
+    jsesc "~0.5.0"
+
 relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@@ -7189,11 +7199,6 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.0.0, semver@~7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
 semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -7206,6 +7211,11 @@ semver@^7.2.1, semver@^7.3.2, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semve
   dependencies:
     lru-cache "^6.0.0"
 
+semver@~7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
+  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
+
 send@0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
@@ -7989,6 +7999,11 @@ unicode-match-property-value-ecmascript@^2.0.0:
   resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
   integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
 
+unicode-match-property-value-ecmascript@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
+  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
+
 unicode-property-aliases-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"

From 1c56985fc0a4067391afe6505f2af41703ee41c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 12:48:05 -0500
Subject: [PATCH 042/301] Bump webpack-cli from 4.10.0 to 5.0.1 (#2927)

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.10.0 to 5.0.1.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.10.0...webpack-cli@5.0.1)

---
updated-dependencies:
- dependency-name: webpack-cli
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 74 +++++++++++++++++++++++++++-------------------------
 2 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index 8e6aecc9f3e3..81383d33cc7a 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
     "vue-eslint-parser": "^9.1.0",
     "vue-loader": "^15.10.0",
     "webpack": "^5.75.0",
-    "webpack-cli": "^4.10.0",
+    "webpack-cli": "^5.0.1",
     "webpack-dev-server": "^4.11.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 12135bba1474..be04df993931 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1714,22 +1714,20 @@
     "@webassemblyjs/ast" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5"
-  integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==
+"@webpack-cli/configtest@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f"
+  integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==
 
-"@webpack-cli/info@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1"
-  integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==
-  dependencies:
-    envinfo "^7.7.3"
+"@webpack-cli/info@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0"
+  integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==
 
-"@webpack-cli/serve@^1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1"
-  integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
+"@webpack-cli/serve@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8"
+  integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==
 
 "@xmldom/xmldom@^0.7.2":
   version "0.7.5"
@@ -2748,7 +2746,7 @@ commander@^5.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
   integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
 
-commander@^7.0.0, commander@^7.2.0:
+commander@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
@@ -2758,6 +2756,11 @@ commander@^8.3.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
+commander@^9.4.1:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd"
+  integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==
+
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -4934,10 +4937,10 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
-interpret@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
-  integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
+interpret@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
+  integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
 
 ip@^1.1.5:
   version "1.1.8"
@@ -6848,12 +6851,12 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-rechoir@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
-  integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
+rechoir@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
+  integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==
   dependencies:
-    resolve "^1.9.0"
+    resolve "^1.20.0"
 
 regenerate-unicode-properties@^10.0.1:
   version "10.0.1"
@@ -7031,7 +7034,7 @@ resolve@^1.1.4, resolve@^1.17.0, resolve@^1.4.0:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.9.0:
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -8327,22 +8330,23 @@ wbuf@^1.1.0, wbuf@^1.7.3:
   dependencies:
     minimalistic-assert "^1.0.0"
 
-webpack-cli@^4.10.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31"
-  integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==
+webpack-cli@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a"
+  integrity sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.2.0"
-    "@webpack-cli/info" "^1.5.0"
-    "@webpack-cli/serve" "^1.7.0"
+    "@webpack-cli/configtest" "^2.0.1"
+    "@webpack-cli/info" "^2.0.1"
+    "@webpack-cli/serve" "^2.0.1"
     colorette "^2.0.14"
-    commander "^7.0.0"
+    commander "^9.4.1"
     cross-spawn "^7.0.3"
+    envinfo "^7.7.3"
     fastest-levenshtein "^1.0.12"
     import-local "^3.0.2"
-    interpret "^2.2.0"
-    rechoir "^0.7.0"
+    interpret "^3.1.1"
+    rechoir "^0.8.0"
     webpack-merge "^5.7.3"
 
 webpack-dev-middleware@^5.3.1:

From 935310d30f721100f784d07514b331682f0d70ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 12:49:13 -0500
Subject: [PATCH 043/301] Bump lefthook from 1.1.4 to 1.2.4 (#2926)

Bumps [lefthook](https://github.com/evilmartians/lefthook) from 1.1.4 to 1.2.4.
- [Release notes](https://github.com/evilmartians/lefthook/releases)
- [Changelog](https://github.com/evilmartians/lefthook/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evilmartians/lefthook/compare/v1.1.4...v1.2.4)

---
updated-dependencies:
- dependency-name: lefthook
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 80 ++++++++++++++++++++++++++++++----------------------
 2 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/package.json b/package.json
index 81383d33cc7a..37ca1f67eefd 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "html-webpack-plugin": "^5.3.2",
     "js-yaml": "^4.1.0",
     "json-minimizer-webpack-plugin": "^4.0.0",
-    "lefthook": "^1.1.4",
+    "lefthook": "^1.2.4",
     "mini-css-extract-plugin": "^2.7.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
diff --git a/yarn.lock b/yarn.lock
index be04df993931..4a20f63416b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5407,47 +5407,59 @@ lazy-val@^1.0.4, lazy-val@^1.0.5:
   resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d"
   integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==
 
-lefthook-darwin-arm64@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.1.4.tgz#587f7db4bc92e6edc030a2c7ea60245467e12155"
-  integrity sha512-xB0RUzZyR+qT+C02wKVNxtxDxcYM6H9wb4aQsHZbaFWz4JHUoEgph12b4raXW5Hkx6Di9xOc2sThqeh9Pznzhw==
+lefthook-darwin-arm64@1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.2.4.tgz#78684f8d46f35604ca1a5300de78f424ea12ce68"
+  integrity sha512-c3pzGWT6YuStgH0BWzlOpghJSiQTDvoXbjOmlolBKbN46KSLwclbVbeSpp2vfAtuQvGP1RIo02aMYngsVjX5DA==
 
-lefthook-darwin-x64@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lefthook-darwin-x64/-/lefthook-darwin-x64-1.1.4.tgz#1adf4f9fa6626599a99ff1fbdd5cb144eaae9b4f"
-  integrity sha512-GG2QJmpY9SFmvmbu7DOD0NkG6eD0ZmOcQmInrH3aTM0zownUadpOYw4s47TZL4H4wzYaBwejtpqzjjBk+J8iTg==
+lefthook-darwin-x64@1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lefthook-darwin-x64/-/lefthook-darwin-x64-1.2.4.tgz#364c48f812cad5ffc161aee54293610b26cffd28"
+  integrity sha512-7HrmSd9GR3pe2bKq0She2pvdGLjaB2KKlREDqbREfe+vWrC+WqzeV/xUncKk+8mz6BCHyPq0XfuZqsztluXN5w==
 
-lefthook-linux-arm64@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lefthook-linux-arm64/-/lefthook-linux-arm64-1.1.4.tgz#dd7bed4e77e5c84f970ef9362745146016a9fc6c"
-  integrity sha512-mBH42x62/q2JfOD5VQ0fMeu9aVNhFKLpPk8Mrm/NwTD1hY42P9ss3860y3CXPo2Hpebr/klWEy5Ml9dm0mA/oQ==
+lefthook-freebsd-arm64@1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.2.4.tgz#72d33877bbb25150fb4f06d0eb341bde922e9840"
+  integrity sha512-VkUoz3xrW70XJ82y3vAz1vfZOdUCe/8z4W2h3YMIBaR/Ovrt9PwtWHtSWEM5LrTBkgi1BbIP7hZtu7HbMw/siQ==
 
-lefthook-linux-x64@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lefthook-linux-x64/-/lefthook-linux-x64-1.1.4.tgz#26c243bb199091a0f0253861de06294764888b59"
-  integrity sha512-4kGfA9oBrVn5YoyToYS4dyM28nIkMMUTFj/Pjg5J9pVZ21awlJz8tA3MG1jyElPtVMuqRd0L3HXBpkU7j/ruEw==
+lefthook-freebsd-x64@1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.2.4.tgz#1886f0045d60f13939cb184612201002c48533b2"
+  integrity sha512-e/ycIWt9WB3T/8KGy1aXY16AbVRGYXI4kw7jDp+GT5Lqile609mA9HCPubm4uPQK5PEtvYTB8R3c19LCDGqyeQ==
 
-lefthook-windows-arm64@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lefthook-windows-arm64/-/lefthook-windows-arm64-1.1.4.tgz#0dcf6bd1465a930236396d368d6290d4163e6ba0"
-  integrity sha512-qH31NMbmvzn8euuqILTNQrFsRfpxmxyJhKXmHbRqH0RP4RW0lBe422AAxflA6wVb2nNvknzAw7zeZa/jNviLSg==
+lefthook-linux-arm64@1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lefthook-linux-arm64/-/lefthook-linux-arm64-1.2.4.tgz#d2281f0436c263267517b7e63a41353f74161e8c"
+  integrity sha512-GDpfnt71Tx3+H14RcZr294of+ZTSANZ8v7dp86fATc2odZnvRCi31mGb2b0SjWGTvnsD9fnXcdvhOPsG2/+qIA==
 
-lefthook-windows-x64@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lefthook-windows-x64/-/lefthook-windows-x64-1.1.4.tgz#d3917110a7b0e81a68e64bede0c78d3f1b3c64a0"
-  integrity sha512-6PqBP2wFRmNTz3Aqx4nonWKfmYkH8LaMP++9Cy9JUfwNoFoRQ9EEzLWmHzSZxUBG41ogQlPHmIg4sRMFSeWBBw==
+lefthook-linux-x64@1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lefthook-linux-x64/-/lefthook-linux-x64-1.2.4.tgz#292cf3040fbeb1ec40168dd772ceddcc9d4166b9"
+  integrity sha512-wNVsG0oOZVYqK5RIYZgY7aYPCoVaWkx4SGpTQiPrgiVeXRm2AgY/+U7Pv6Nim9KZppQXemNjaA83dA0DvOOufg==
 
-lefthook@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lefthook/-/lefthook-1.1.4.tgz#65d472be3d3d5b503db362975d0d1a1f2e41354f"
-  integrity sha512-ztmoAun8BQEgHA/VaFF/481GGWFQmf30/SXjwTgX39fJWV8fmmcD6+uois9xbvcLY9ABCvZqgsAwLywc9jAFow==
+lefthook-windows-arm64@1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lefthook-windows-arm64/-/lefthook-windows-arm64-1.2.4.tgz#4c0688a4aec29d18845a17ea4ca9e5718265c699"
+  integrity sha512-t2xdxZQdbEYSlAaCwxJVphwmz1XQI9guGVkTfZEEbBswzNvDAUBr+w2l/ySDvA8fLrIyQI3D2czMQSslhAXqAQ==
+
+lefthook-windows-x64@1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lefthook-windows-x64/-/lefthook-windows-x64-1.2.4.tgz#30602ccf377edc512fcde0e1dd09d9cb8628f417"
+  integrity sha512-0K2UeSEAdMXDNHF8FSjGS/ZlAhfMDQ8lHSkBnGXF+68W7Uo62X27yDAJHKAMDjmQKh45V7NuDaVj8dq+m0mnwQ==
+
+lefthook@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lefthook/-/lefthook-1.2.4.tgz#ef3ba657210cbc3d048b2fc5efc267fd0ef99180"
+  integrity sha512-DQOqqub4WmRFDsiTBye5GWy2TIsGdtJmkOrkK3zYBmUWoD7nuHodtMI4+JgrDgHCC1crB8LV/pMSaQOo2dsOHA==
   optionalDependencies:
-    lefthook-darwin-arm64 "1.1.4"
-    lefthook-darwin-x64 "1.1.4"
-    lefthook-linux-arm64 "1.1.4"
-    lefthook-linux-x64 "1.1.4"
-    lefthook-windows-arm64 "1.1.4"
-    lefthook-windows-x64 "1.1.4"
+    lefthook-darwin-arm64 "1.2.4"
+    lefthook-darwin-x64 "1.2.4"
+    lefthook-freebsd-arm64 "1.2.4"
+    lefthook-freebsd-x64 "1.2.4"
+    lefthook-linux-arm64 "1.2.4"
+    lefthook-linux-x64 "1.2.4"
+    lefthook-windows-arm64 "1.2.4"
+    lefthook-windows-x64 "1.2.4"
 
 levn@^0.4.1:
   version "0.4.1"

From 1b0d33509b0f6121b92542920aaebd2fd2dc8e64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 12:50:13 -0500
Subject: [PATCH 044/301] Bump prettier from 2.7.1 to 2.8.0 (#2922)

Bumps [prettier](https://github.com/prettier/prettier) from 2.7.1 to 2.8.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.7.1...2.8.0)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 37ca1f67eefd..7528d84702fb 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "lefthook": "^1.2.4",
     "mini-css-extract-plugin": "^2.7.2",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.0",
     "rimraf": "^3.0.2",
     "sass": "^1.56.1",
     "sass-loader": "^13.2.0",
diff --git a/yarn.lock b/yarn.lock
index 4a20f63416b4..df0b0455311f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6652,10 +6652,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-"prettier@^1.18.2 || ^2.0.0", prettier@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
-  integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
+"prettier@^1.18.2 || ^2.0.0", prettier@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.0.tgz#c7df58393c9ba77d6fba3921ae01faf994fb9dc9"
+  integrity sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==
 
 pretty-error@^4.0.0:
   version "4.0.0"

From a3d61fe343c911f34eb16dd4bfbfadfce9b80c9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 19:19:31 +0100
Subject: [PATCH 045/301] Bump @babel/core from 7.20.2 to 7.20.5 (#2929)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.20.2 to 7.20.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.20.5/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 66 ++++++++++++++--------------------------------------
 2 files changed, 19 insertions(+), 49 deletions(-)

diff --git a/package.json b/package.json
index 7528d84702fb..beeaf8f47fab 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "ytsr": "^3.8.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.2",
+    "@babel/core": "^7.20.5",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/preset-env": "^7.20.2",
     "babel-eslint": "^10.1.0",
diff --git a/yarn.lock b/yarn.lock
index df0b0455311f..b27a8c129211 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -34,36 +34,27 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733"
   integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==
 
-"@babel/core@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.2.tgz#8dc9b1620a673f92d3624bd926dc49a52cf25b92"
-  integrity sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g==
+"@babel/core@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113"
+  integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.2"
+    "@babel/generator" "^7.20.5"
     "@babel/helper-compilation-targets" "^7.20.0"
     "@babel/helper-module-transforms" "^7.20.2"
-    "@babel/helpers" "^7.20.1"
-    "@babel/parser" "^7.20.2"
+    "@babel/helpers" "^7.20.5"
+    "@babel/parser" "^7.20.5"
     "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.1"
-    "@babel/types" "^7.20.2"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.20.1", "@babel/generator@^7.20.2":
-  version "7.20.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.4.tgz#4d9f8f0c30be75fd90a0562099a26e5839602ab8"
-  integrity sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==
-  dependencies:
-    "@babel/types" "^7.20.2"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    jsesc "^2.5.1"
-
 "@babel/generator@^7.20.5":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95"
@@ -302,14 +293,14 @@
     "@babel/traverse" "^7.18.11"
     "@babel/types" "^7.18.10"
 
-"@babel/helpers@^7.20.1":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.1.tgz#2ab7a0fcb0a03b5bf76629196ed63c2d7311f4c9"
-  integrity sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==
+"@babel/helpers@^7.20.5":
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763"
+  integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==
   dependencies:
     "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.1"
-    "@babel/types" "^7.20.0"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
 
 "@babel/highlight@^7.10.4":
   version "7.17.9"
@@ -329,12 +320,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.18.10", "@babel/parser@^7.18.4", "@babel/parser@^7.20.1", "@babel/parser@^7.20.2", "@babel/parser@^7.7.0":
-  version "7.20.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.3.tgz#5358cf62e380cf69efcb87a7bb922ff88bfac6e2"
-  integrity sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==
-
-"@babel/parser@^7.20.5":
+"@babel/parser@^7.18.10", "@babel/parser@^7.18.4", "@babel/parser@^7.20.5", "@babel/parser@^7.7.0":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8"
   integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
@@ -947,23 +933,7 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.9", "@babel/traverse@^7.20.1", "@babel/traverse@^7.7.0":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.1.tgz#9b15ccbf882f6d107eeeecf263fbcdd208777ec8"
-  integrity sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.1"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.20.1"
-    "@babel/types" "^7.20.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.19.1":
+"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5", "@babel/traverse@^7.7.0":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133"
   integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==
@@ -979,7 +949,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84"
   integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==

From 8f45519c706b120ede1bc456c79d5bf81a559648 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Dec 2022 10:29:13 +0100
Subject: [PATCH 046/301] Bump vue from 2.7.13 to 2.7.14 (#2928)

Bumps [vue](https://github.com/vuejs/core) from 2.7.13 to 2.7.14.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vuejs/core/commits)

---
updated-dependencies:
- dependency-name: vue
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index beeaf8f47fab..096bf25e0c18 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "videojs-mobile-ui": "^0.8.0",
     "videojs-overlay": "^2.1.4",
     "videojs-vtt-thumbnails-freetube": "0.0.15",
-    "vue": "^2.7.13",
+    "vue": "^2.7.14",
     "vue-i18n": "^8.28.2",
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
diff --git a/yarn.lock b/yarn.lock
index b27a8c129211..655a2f132215 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1538,10 +1538,10 @@
     global "~4.4.0"
     is-function "^1.0.1"
 
-"@vue/compiler-sfc@2.7.13":
-  version "2.7.13"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz#818944f4a9616b752d48dac6a56bffe2db88bdff"
-  integrity sha512-zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg==
+"@vue/compiler-sfc@2.7.14":
+  version "2.7.14"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz#3446fd2fbb670d709277fc3ffa88efc5e10284fd"
+  integrity sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==
   dependencies:
     "@babel/parser" "^7.18.4"
     postcss "^8.4.14"
@@ -8284,12 +8284,12 @@ vue-template-es2015-compiler@^1.9.0:
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
-vue@^2.7.13:
-  version "2.7.13"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.13.tgz#e9e499cc6da46dc7941c2510193b15aa6a84a79f"
-  integrity sha512-QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ==
+vue@^2.7.14:
+  version "2.7.14"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.14.tgz#3743dcd248fd3a34d421ae456b864a0246bafb17"
+  integrity sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==
   dependencies:
-    "@vue/compiler-sfc" "2.7.13"
+    "@vue/compiler-sfc" "2.7.14"
     csstype "^3.1.0"
 
 vuex@^3.6.2:

From 98b259303d4eec5ddb07074ab25adf09d5d11093 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Dec 2022 08:49:50 -0500
Subject: [PATCH 047/301] Bump video.js from 7.18.1 to 7.20.3 (#2642)

Bumps [video.js](https://github.com/videojs/video.js) from 7.18.1 to 7.20.3.
- [Release notes](https://github.com/videojs/video.js/releases)
- [Changelog](https://github.com/videojs/video.js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/videojs/video.js/compare/v7.18.1...v7.20.3)

---
updated-dependencies:
- dependency-name: video.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 83 +++++++++++++++++++++++-----------------------------
 2 files changed, 38 insertions(+), 47 deletions(-)

diff --git a/package.json b/package.json
index 096bf25e0c18..c1a3a7876afb 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "nedb-promises": "^6.2.1",
     "process": "^0.11.10",
     "socks-proxy-agent": "^7.0.0",
-    "video.js": "7.18.1",
+    "video.js": "7.20.3",
     "videojs-contrib-quality-levels": "^2.1.0",
     "videojs-http-source-selector": "^1.1.6",
     "videojs-mobile-ui": "^0.8.0",
diff --git a/yarn.lock b/yarn.lock
index 655a2f132215..84bb56b03717 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1497,30 +1497,21 @@
   dependencies:
     "@types/node" "*"
 
-"@videojs/http-streaming@2.13.1":
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-2.13.1.tgz#b7688d91eec969181430e00868b514b16b3b21b7"
-  integrity sha512-1x3fkGSPyL0+iaS3/lTvfnPTtfqzfgG+ELQtPPtTvDwqGol9Mx3TNyZwtSTdIufBrqYRn7XybB/3QNMsyjq13A==
+"@videojs/http-streaming@2.14.3":
+  version "2.14.3"
+  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-2.14.3.tgz#3277e03b576766decb4fc663e954e18bfa10d2a1"
+  integrity sha512-2tFwxCaNbcEZzQugWf8EERwNMyNtspfHnvxRGRABQs09W/5SqmkWFuGWfUAm4wQKlXGfdPyAJ1338ASl459xAA==
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "3.0.4"
-    aes-decrypter "3.1.2"
+    "@videojs/vhs-utils" "3.0.5"
+    aes-decrypter "3.1.3"
     global "^4.4.0"
-    m3u8-parser "4.7.0"
-    mpd-parser "0.21.0"
+    m3u8-parser "4.7.1"
+    mpd-parser "0.21.1"
     mux.js "6.0.1"
     video.js "^6 || ^7"
 
-"@videojs/vhs-utils@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-3.0.4.tgz#e253eecd8e9318f767e752010d213587f94bb03a"
-  integrity sha512-hui4zOj2I1kLzDgf8QDVxD3IzrwjS/43KiS8IHQO0OeeSsb4pB/lgNt1NG7Dv0wMQfCccUpMVLGcK618s890Yg==
-  dependencies:
-    "@babel/runtime" "^7.12.5"
-    global "^4.4.0"
-    url-toolkit "^2.2.1"
-
-"@videojs/vhs-utils@^3.0.0", "@videojs/vhs-utils@^3.0.2", "@videojs/vhs-utils@^3.0.4":
+"@videojs/vhs-utils@3.0.5", "@videojs/vhs-utils@^3.0.4", "@videojs/vhs-utils@^3.0.5":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz#665ba70d78258ba1ab977364e2fe9f4d4799c46c"
   integrity sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==
@@ -1764,13 +1755,13 @@ acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
   integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
-aes-decrypter@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.1.2.tgz#3545546f8e9f6b878640339a242efe221ba7a7cb"
-  integrity sha512-42nRwfQuPRj9R1zqZBdoxnaAmnIFyDi0MNyTVhjdFOd8fifXKKRfwIHIZ6AMn1or4x5WONzjwRTbTWcsIQ0O4A==
+aes-decrypter@3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.1.3.tgz#65ff5f2175324d80c41083b0e135d1464b12ac35"
+  integrity sha512-VkG9g4BbhMBy+N5/XodDeV6F02chEk9IpgRTq/0bS80y4dzy79VH2Gtms02VXomf3HmyRe3yyJYkJ990ns+d6A==
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.0"
+    "@videojs/vhs-utils" "^3.0.5"
     global "^4.4.0"
     pkcs7 "^1.0.4"
 
@@ -5575,13 +5566,13 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-m3u8-parser@4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.7.0.tgz#e01e8ce136098ade1b14ee691ea20fc4dc60abf6"
-  integrity sha512-48l/OwRyjBm+QhNNigEEcRcgbRvnUjL7rxs597HmW9QSNbyNvt+RcZ9T/d9vxi9A9z7EZrB1POtZYhdRlwYQkQ==
+m3u8-parser@4.7.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.7.1.tgz#d6df2c940bb19a01112a04ccc4ff44886a945305"
+  integrity sha512-pbrQwiMiq+MmI9bl7UjtPT3AK603PV9bogNlr83uC+X9IoxqL5E4k7kU7fMQ0dpRgxgeSMygqUa0IMLQNXLBNA==
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.0"
+    "@videojs/vhs-utils" "^3.0.5"
     global "^4.4.0"
 
 m3u8stream@^0.7.1:
@@ -5846,13 +5837,13 @@ module-deps@^6.2.3:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
-mpd-parser@0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.21.0.tgz#c2036cce19522383b93c973180fdd82cd646168e"
-  integrity sha512-NbpMJ57qQzFmfCiP1pbL7cGMbVTD0X1hqNgL0VYP1wLlZXLf/HtmvQpNkOA1AHkPVeGQng+7/jEtSvNUzV7Gdg==
+mpd-parser@0.21.1:
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.21.1.tgz#4f4834074ed0a8e265d8b04a5d2d7b5045a4fa55"
+  integrity sha512-BxlSXWbKE1n7eyEPBnTEkrzhS3PdmkkKdM1pgKbPnPOH0WFZIc0sPOWi7m0Uo3Wd2a4Or8Qf4ZbS7+ASqQ49fw==
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@videojs/vhs-utils" "^3.0.2"
+    "@videojs/vhs-utils" "^3.0.5"
     "@xmldom/xmldom" "^0.7.2"
     global "^4.4.0"
 
@@ -8145,24 +8136,24 @@ verror@^1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-video.js@7.18.1, "video.js@^6 || ^7", video.js@^7.0.0, "video.js@^7.2.0 || ^6.6.0":
-  version "7.18.1"
-  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.18.1.tgz#d93cd4992710d4d95574a00e7d29a2518f9b30f7"
-  integrity sha512-mnXdmkVcD5qQdKMZafDjqdhrnKGettZaGSVkExjACiylSB4r2Yt5W1bchsKmjFpfuNfszsMjTUnnoIWSSqoe/Q==
+video.js@7.20.3, "video.js@^6 || ^7", video.js@^7.0.0, "video.js@^7.2.0 || ^6.6.0":
+  version "7.20.3"
+  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.20.3.tgz#5694741346dc683255993e5069daa15d4bacb646"
+  integrity sha512-JMspxaK74LdfWcv69XWhX4rILywz/eInOVPdKefpQiZJSMD5O8xXYueqACP2Q5yqKstycgmmEKlJzZ+kVmDciw==
   dependencies:
     "@babel/runtime" "^7.12.5"
-    "@videojs/http-streaming" "2.13.1"
+    "@videojs/http-streaming" "2.14.3"
     "@videojs/vhs-utils" "^3.0.4"
     "@videojs/xhr" "2.6.0"
-    aes-decrypter "3.1.2"
+    aes-decrypter "3.1.3"
     global "^4.4.0"
     keycode "^2.2.0"
-    m3u8-parser "4.7.0"
-    mpd-parser "0.21.0"
+    m3u8-parser "4.7.1"
+    mpd-parser "0.21.1"
     mux.js "6.0.1"
     safe-json-parse "4.0.0"
     videojs-font "3.2.0"
-    videojs-vtt.js "^0.15.3"
+    videojs-vtt.js "^0.15.4"
 
 videojs-contrib-quality-levels@^2.0.4, videojs-contrib-quality-levels@^2.1.0:
   version "2.1.0"
@@ -8210,10 +8201,10 @@ videojs-vtt-thumbnails-freetube@0.0.15:
     request "^2.88.2"
     video.js "^7.2.0 || ^6.6.0"
 
-videojs-vtt.js@^0.15.3:
-  version "0.15.3"
-  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.15.3.tgz#84260393b79487fcf195d9372f812d7fab83a993"
-  integrity sha512-5FvVsICuMRx6Hd7H/Y9s9GDeEtYcXQWzGMS+sl4UX3t/zoHp3y+isSfIPRochnTH7h+Bh1ILyC639xy9Z6kPag==
+videojs-vtt.js@^0.15.4:
+  version "0.15.4"
+  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz#5dc5aabcd82ba40c5595469bd855ea8230ca152c"
+  integrity sha512-r6IhM325fcLb1D6pgsMkTQT1PpFdUdYZa1iqk7wJEu+QlibBwATPfPc9Bg8Jiym0GE5yP1AG2rMLu+QMVWkYtA==
   dependencies:
     global "^4.3.1"
 

From 7abe97d700695525b2c5d4af95a561dec4ca640f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Dec 2022 15:26:30 +0100
Subject: [PATCH 048/301] Bump electron from 21.3.1 to 22.0.0 (#2925)

Bumps [electron](https://github.com/electron/electron) from 21.3.1 to 22.0.0.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v21.3.1...v22.0.0)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 282 +++++++++++++++++++++++----------------------------
 2 files changed, 130 insertions(+), 154 deletions(-)

diff --git a/package.json b/package.json
index c1a3a7876afb..6d7b9345caba 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.2",
     "css-minimizer-webpack-plugin": "^4.2.2",
-    "electron": "^21.3.1",
+    "electron": "^22.0.0",
     "electron-builder": "^23.6.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
diff --git a/yarn.lock b/yarn.lock
index 84bb56b03717..8bc8e9cf519d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -971,21 +971,20 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@electron/get@^1.14.1":
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
-  integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
+"@electron/get@^2.0.0":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e"
+  integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==
   dependencies:
     debug "^4.1.1"
     env-paths "^2.2.0"
     fs-extra "^8.1.0"
-    got "^9.6.0"
+    got "^11.8.5"
     progress "^2.0.3"
     semver "^6.2.0"
     sumchecker "^3.0.1"
   optionalDependencies:
     global-agent "^3.0.0"
-    global-tunnel-ng "^2.7.1"
 
 "@electron/universal@1.2.1":
   version "1.2.1"
@@ -1234,17 +1233,17 @@
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.50.tgz#35ee4db4ab8f3a8ff56490c51f92445d2776451e"
   integrity sha512-k8ETQOOQDg5FtK7y9KJWpsGLik+QlPmIi8zzl/dGUgshV2QitprkFlCR/AemjWOTyKn9UwSSGRTzLVotvgCjYQ==
 
-"@sindresorhus/is@^0.14.0":
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
-  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+"@sindresorhus/is@^4.0.0":
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
+  integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
 
-"@szmarczak/http-timer@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
-  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+"@szmarczak/http-timer@^4.0.5":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
+  integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
   dependencies:
-    defer-to-connect "^1.0.1"
+    defer-to-connect "^2.0.0"
 
 "@tootallnate/once@2":
   version "2.0.0"
@@ -1271,6 +1270,16 @@
   dependencies:
     "@types/node" "*"
 
+"@types/cacheable-request@^6.0.1":
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183"
+  integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==
+  dependencies:
+    "@types/http-cache-semantics" "*"
+    "@types/keyv" "^3.1.4"
+    "@types/node" "*"
+    "@types/responselike" "^1.0.0"
+
 "@types/connect-history-api-fallback@^1.3.5":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
@@ -1353,6 +1362,11 @@
   resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35"
   integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==
 
+"@types/http-cache-semantics@*":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
+  integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
+
 "@types/http-proxy@^1.17.8":
   version "1.17.9"
   resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a"
@@ -1389,6 +1403,13 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
+"@types/keyv@^3.1.4":
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
+  integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/mime@*":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
@@ -1432,6 +1453,13 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
+"@types/responselike@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
+  integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
+  dependencies:
+    "@types/node" "*"
+
 "@types/retry@0.12.0":
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
@@ -2465,18 +2493,23 @@ bytes@3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-cacheable-request@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
-  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
+cacheable-lookup@^5.0.3:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
+  integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
+
+cacheable-request@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
+  integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
   dependencies:
     clone-response "^1.0.2"
     get-stream "^5.1.0"
     http-cache-semantics "^4.0.0"
-    keyv "^3.0.0"
+    keyv "^4.0.0"
     lowercase-keys "^2.0.0"
-    normalize-url "^4.1.0"
-    responselike "^1.0.2"
+    normalize-url "^6.0.1"
+    responselike "^2.0.0"
 
 cached-path-relative@^1.0.0, cached-path-relative@^1.0.2:
   version "1.1.0"
@@ -2767,14 +2800,6 @@ concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-config-chain@^1.1.11:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
-  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
-  dependencies:
-    ini "^1.3.4"
-    proto-list "~1.2.1"
-
 connect-history-api-fallback@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
@@ -3105,12 +3130,12 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-decompress-response@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+decompress-response@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
+  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
   dependencies:
-    mimic-response "^1.0.0"
+    mimic-response "^3.1.0"
 
 deep-is@^0.1.3:
   version "0.1.4"
@@ -3124,10 +3149,10 @@ default-gateway@^6.0.3:
   dependencies:
     execa "^5.0.0"
 
-defer-to-connect@^1.0.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
-  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+defer-to-connect@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
+  integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
 
 define-lazy-prop@^2.0.0:
   version "2.0.0"
@@ -3376,11 +3401,6 @@ duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2:
   dependencies:
     readable-stream "^2.0.2"
 
-duplexer3@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -3477,12 +3497,12 @@ electron-to-chromium@^1.4.251:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
   integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
 
-electron@^21.3.1:
-  version "21.3.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-21.3.1.tgz#02a61053ace79ecdc592afc641ff663dec805b42"
-  integrity sha512-Ik/I9oFHA1h32JRtRm6GMgYdUctFpF/tPnHyATg4r3LXBTUT6habGh3GxSdmmTa5JgtA7uJUEm8EjjZItk7T3g==
+electron@^22.0.0:
+  version "22.0.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.0.tgz#ef84ab9cf23aa3f8c2f42a1e8e000ad7fd941058"
+  integrity sha512-cgRc4wjyM+81A0E8UGv1HNJjL1HBI5cWNh/DUIjzYvoUuiEM0SS0hAH/zaFQ18xOz2ced6Yih8SybpOiOYJhdg==
   dependencies:
-    "@electron/get" "^1.14.1"
+    "@electron/get" "^2.0.0"
     "@types/node" "^16.11.26"
     extract-zip "^2.0.1"
 
@@ -3509,7 +3529,7 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
-encodeurl@^1.0.2, encodeurl@~1.0.2:
+encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
@@ -4323,13 +4343,6 @@ get-intrinsic@^1.1.3:
     has "^1.0.3"
     has-symbols "^1.0.3"
 
-get-stream@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
-
 get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
@@ -4412,16 +4425,6 @@ global-agent@^3.0.0:
     semver "^7.3.2"
     serialize-error "^7.0.1"
 
-global-tunnel-ng@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
-  integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==
-  dependencies:
-    encodeurl "^1.0.2"
-    lodash "^4.17.10"
-    npm-conf "^1.1.3"
-    tunnel "^0.0.6"
-
 global@^4.3.1, global@^4.3.2, global@^4.4.0, global@~4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
@@ -4460,22 +4463,22 @@ globby@^13.1.1:
     merge2 "^1.4.1"
     slash "^4.0.0"
 
-got@^9.6.0:
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
-  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
-  dependencies:
-    "@sindresorhus/is" "^0.14.0"
-    "@szmarczak/http-timer" "^1.1.2"
-    cacheable-request "^6.0.0"
-    decompress-response "^3.3.0"
-    duplexer3 "^0.1.4"
-    get-stream "^4.1.0"
-    lowercase-keys "^1.0.1"
-    mimic-response "^1.0.1"
-    p-cancelable "^1.0.0"
-    to-readable-stream "^1.0.0"
-    url-parse-lax "^3.0.0"
+got@^11.8.5:
+  version "11.8.5"
+  resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
+  integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ==
+  dependencies:
+    "@sindresorhus/is" "^4.0.0"
+    "@szmarczak/http-timer" "^4.0.5"
+    "@types/cacheable-request" "^6.0.1"
+    "@types/responselike" "^1.0.0"
+    cacheable-lookup "^5.0.3"
+    cacheable-request "^7.0.2"
+    decompress-response "^6.0.0"
+    http2-wrapper "^1.0.0-beta.5.2"
+    lowercase-keys "^2.0.0"
+    p-cancelable "^2.0.0"
+    responselike "^2.0.0"
 
 graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.10"
@@ -4742,6 +4745,14 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+http2-wrapper@^1.0.0-beta.5.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
+  integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
+  dependencies:
+    quick-lru "^5.1.1"
+    resolve-alpn "^1.0.0"
+
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
@@ -4861,11 +4872,6 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@^1.3.4:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
 inline-source-map@~0.6.0:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5"
@@ -5243,10 +5249,10 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
-json-buffer@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
-  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
 json-minimizer-webpack-plugin@^4.0.0:
   version "4.0.0"
@@ -5338,12 +5344,12 @@ keycode@^2.2.0:
   resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.1.tgz#09c23b2be0611d26117ea2501c2c391a01f39eff"
   integrity sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==
 
-keyv@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
-  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
+keyv@^4.0.0:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
+  integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==
   dependencies:
-    json-buffer "3.0.0"
+    json-buffer "3.0.1"
 
 kind-of@^6.0.2:
   version "6.0.3"
@@ -5529,7 +5535,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
-lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
+lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -5541,11 +5547,6 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
-
 lowercase-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
@@ -5711,11 +5712,16 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mimic-response@^1.0.0, mimic-response@^1.0.1:
+mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
+mimic-response@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
+  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
+
 min-document@^2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
@@ -5948,24 +5954,11 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-normalize-url@^4.1.0:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
-  integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
-
 normalize-url@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
-npm-conf@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
-  integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
-  dependencies:
-    config-chain "^1.1.11"
-    pify "^3.0.0"
-
 npm-run-all@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
@@ -6106,10 +6099,10 @@ os-browserify@~0.3.0:
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==
 
-p-cancelable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
-  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+p-cancelable@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
+  integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
 
 p-limit@^1.1.0:
   version "1.3.0"
@@ -6601,11 +6594,6 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prepend-http@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
-
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
@@ -6641,11 +6629,6 @@ progress@^2.0.0, progress@^2.0.3:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-proto-list@~1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
-  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
-
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -6738,6 +6721,11 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
+quick-lru@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
+
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -6981,6 +6969,11 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
+resolve-alpn@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
+  integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
+
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -7016,12 +7009,12 @@ resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.2
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-responselike@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+responselike@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
+  integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==
   dependencies:
-    lowercase-keys "^1.0.0"
+    lowercase-keys "^2.0.0"
 
 retry@^0.13.1:
   version "0.13.1"
@@ -7805,11 +7798,6 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
 
-to-readable-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
-  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
-
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -7874,11 +7862,6 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-tunnel@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
-  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
@@ -8031,13 +8014,6 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-url-parse-lax@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
-  dependencies:
-    prepend-http "^2.0.0"
-
 url-toolkit@^2.2.1:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.2.5.tgz#58406b18e12c58803e14624df5e374f638b0f607"

From 91222c6943d2d4f13ddc5ef24156b52bba9629f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Dec 2022 07:08:35 +0100
Subject: [PATCH 049/301] Bump videojs-contrib-quality-levels from 2.1.0 to
 2.2.1 (#2924)

Bumps [videojs-contrib-quality-levels](https://github.com/videojs/videojs-contrib-quality-levels) from 2.1.0 to 2.2.1.
- [Release notes](https://github.com/videojs/videojs-contrib-quality-levels/releases)
- [Changelog](https://github.com/videojs/videojs-contrib-quality-levels/blob/main/CHANGELOG.md)
- [Commits](https://github.com/videojs/videojs-contrib-quality-levels/compare/v2.1.0...v2.2.1)

---
updated-dependencies:
- dependency-name: videojs-contrib-quality-levels
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 6d7b9345caba..e9daf7901645 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "process": "^0.11.10",
     "socks-proxy-agent": "^7.0.0",
     "video.js": "7.20.3",
-    "videojs-contrib-quality-levels": "^2.1.0",
+    "videojs-contrib-quality-levels": "^2.2.1",
     "videojs-http-source-selector": "^1.1.6",
     "videojs-mobile-ui": "^0.8.0",
     "videojs-overlay": "^2.1.4",
diff --git a/yarn.lock b/yarn.lock
index 8bc8e9cf519d..7db91d590be8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8112,7 +8112,7 @@ verror@^1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-video.js@7.20.3, "video.js@^6 || ^7", video.js@^7.0.0, "video.js@^7.2.0 || ^6.6.0":
+video.js@7.20.3, "video.js@^6 || ^7", "video.js@^6 || ^7 || ^8", video.js@^7.0.0, "video.js@^7.2.0 || ^6.6.0":
   version "7.20.3"
   resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.20.3.tgz#5694741346dc683255993e5069daa15d4bacb646"
   integrity sha512-JMspxaK74LdfWcv69XWhX4rILywz/eInOVPdKefpQiZJSMD5O8xXYueqACP2Q5yqKstycgmmEKlJzZ+kVmDciw==
@@ -8131,13 +8131,13 @@ video.js@7.20.3, "video.js@^6 || ^7", video.js@^7.0.0, "video.js@^7.2.0 || ^6.6.
     videojs-font "3.2.0"
     videojs-vtt.js "^0.15.4"
 
-videojs-contrib-quality-levels@^2.0.4, videojs-contrib-quality-levels@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.1.0.tgz#046e9e21ed01043f512b83a1916001d552457083"
-  integrity sha512-dqGQGbL9AFhucxki7Zh0c3kIhH0PAPcHEh6jUdRyaFCVeOuqnJrOYs/3wNtsokDdBdRf2Du2annpu4Z2XaSZRg==
+videojs-contrib-quality-levels@^2.0.4, videojs-contrib-quality-levels@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.2.1.tgz#46bd7e1db25e6e45824dadf933b08f0c6ec724a1"
+  integrity sha512-cnF6OGGgoC/2nUrbdz54nzPm3BpEZQzMTpyekiX6AXs8imATX2sHbrUz97xXVSHITldk/+d7ZAUrdQYJJTyuug==
   dependencies:
     global "^4.3.2"
-    video.js "^6 || ^7"
+    video.js "^6 || ^7 || ^8"
 
 videojs-font@3.2.0:
   version "3.2.0"

From aaee163f7675cd92d7ddf617473f96221a78df3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9A=D0=BE=D1=82=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B1=D0=B0=D0=B9?= <artemkotlubai@yandex.ru>
Date: Fri, 9 Dec 2022 15:38:02 +0000
Subject: [PATCH 050/301] Translated using Weblate (Russian)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 72 +++++++++++++++++++++---------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 4f3b741f6df0..ad65f69c2030 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -89,18 +89,18 @@ Trending:
   Music: Музыка
   Default: По умолчанию
 Most Popular: 'Самые популярные'
-Playlists: 'Плейлисты'
+Playlists: 'Подборки'
 User Playlists:
-  Your Playlists: 'Ваши плейлисты'
+  Your Playlists: 'Ваши подборки'
   Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: У
     вас нет сохранённых видео. Нажмите "Добавить видео в сохранённые", чтобы добавить
     сюда
-  Playlist Message: Эта страница не отражает полную функциональность плейлистов. Она
-    показывает только видео которые вы сохранили или добавили в избранное. После переработки
-    этой страницы все видео, которые сейчас находятся здесь, переместятся в плейлист
-    "Избранное".
-  Search bar placeholder: Поиск в Плейлисте
-  Empty Search Message: В этом плейлисте нет видео, соответствующих вашему запросу
+  Playlist Message: Эта страница не отражает все возможности подборок. Она показывает
+    только те видео, которые вы сохранили или добавили в избранное. После переработки
+    этой страницы все видео, которые сейчас находятся здесь, переместятся в подборку
+    «Избранное».
+  Search bar placeholder: Поиск в подборке
+  Empty Search Message: В этой подборке нет видео, соответствующих вашему запросу
 History:
   # On History Page
   History: 'История'
@@ -209,7 +209,7 @@ Settings:
     Expand Side Bar by Default: Расширить боковую панель
     Disable Smooth Scrolling: Отключить плавную прокрутку
     Hide Side Bar Labels: Скрыть надписи боковой панели
-    Hide FreeTube Header Logo: Скрыть логотип заголовка FreeTube
+    Hide FreeTube Header Logo: Скрыть значок FreeTube
   Player Settings:
     Player Settings: 'Настройки проигрывателя'
     Force Local Backend for Legacy Formats: 'Принудительно использовать локальный
@@ -219,7 +219,7 @@ Settings:
     Turn on Subtitles by Default: 'Субтитры по умолчанию включены'
     Autoplay Videos: 'Автовоспроизведение видео'
     Proxy Videos Through Invidious: 'Смотреть видео через прокси Invidious'
-    Autoplay Playlists: 'Автовоспроизведение плейлистов'
+    Autoplay Playlists: 'Автовоспроизведение подборок'
     Enable Theatre Mode by Default: 'Включать режим широкого экрана'
     Default Volume: 'Громкость по умолчанию'
     Default Playback Rate: 'Скорость воспроизведения по умолчанию'
@@ -361,13 +361,13 @@ Settings:
       одну или несколько подписок
     Check for Legacy Subscriptions: Проверить устаревшие подписки
     Manage Subscriptions: Управление подписками
-    Import Playlists: Импортировать плейлисты
-    All playlists has been successfully exported: Все плейлисты успешно экспортированы
-    Export Playlists: Экспортировать плейлисты
-    All playlists has been successfully imported: Все плейлисты успешно импортированы
-    Playlist insufficient data: Недостаточно данных для плейлиста "{playlist}", пропуск
+    Import Playlists: Импортировать подборки
+    All playlists has been successfully exported: Все подборки успешно экспортированы
+    Export Playlists: Экспортировать подборки
+    All playlists has been successfully imported: Все подборки успешно импортированы
+    Playlist insufficient data: Недостаточно данных для подборки «{playlist}», пропуск
       элемента
-    Playlist File: Файл плейлиста
+    Playlist File: Файл подборки
     Subscription File: Файл подписок
     History File: Файл истории
   Distraction Free Settings:
@@ -381,7 +381,7 @@ Settings:
     Hide Video Likes And Dislikes: Скрыть лайки и дизлайки к видео
     Hide Video Views: Скрыть просмотры видео
     Hide Active Subscriptions: Скрыть действующие подписки
-    Hide Playlists: Скрыть плейлисты
+    Hide Playlists: Скрыть подборки
     Hide Live Streams: Скрыть прямые трансляции
     Hide Sharing Actions: Скрыть действия общего доступа
     Hide Comments: Скрыть комментарии
@@ -521,9 +521,9 @@ Channel:
       Oldest: 'Старым'
       Most Popular: 'Самым популярным'
   Playlists:
-    Playlists: 'Плейлисты'
+    Playlists: 'Подборки'
     This channel does not currently have any playlists: 'На этом канале в настоящее
-      время нет плейлистов'
+      время нет подборок'
     Sort Types:
       Last Video Added: 'Последнему добавленному видео'
       Newest: 'Новым'
@@ -604,9 +604,9 @@ Video:
   Autoplay: Автовоспроизведение
   Play Previous Video: Воспроизвести предыдущее видео
   Play Next Video: Воспроизвести следующее видео
-  Reverse Playlist: Обратный порядок плейлиста
-  Shuffle Playlist: Перемешать плейлист
-  Loop Playlist: Повторять плейлист
+  Reverse Playlist: Обратный порядок подборки
+  Shuffle Playlist: Перемешать подборку
+  Loop Playlist: Повторять подборку
   Starting soon, please refresh the page to check again: Скоро начнется, обновите
     страницу, чтобы проверить ещё раз
   Audio:
@@ -639,17 +639,17 @@ Video:
   Skipped segment: Пропущенный сегмент
   External Player:
     Unsupported Actions:
-      looping playlists: повторение плейлистов
-      shuffling playlists: перемешивание плейлистов
-      reversing playlists: реверсирование плейлистов
+      looping playlists: повторение подборок
+      shuffling playlists: перемешивание подборок
+      reversing playlists: реверсирование подборок
       opening specific video in a playlist (falling back to opening the video): открытие
-        определенного видео в плейлисте (возврат к открытию видео)
-      opening playlists: открытие плейлистов
+        определённого видео в подборке (возврат к открытию видео)
+      opening playlists: открытие подборок
       setting a playback rate: настройка скорости воспроизведения
       starting video at offset: начинать видео со смещением
     UnsupportedActionTemplate: '{externalPlayer} не поддерживает: {action}'
     OpeningTemplate: Открытие {videoOrPlaylist} в {externalPlayer}...
-    playlist: плейлист
+    playlist: подборка
     video: видео
     OpenInTemplate: Открыть в {externalPlayer}
   Stats:
@@ -684,13 +684,13 @@ Videos:
 #& Playlists
 Playlist:
   #& About
-  View Full Playlist: 'Посмотреть весь плейлист'
+  View Full Playlist: 'Посмотреть всю подборку'
   Videos: 'Видео'
   View: 'Вид'
   Views: 'Просмотров'
   Last Updated On: 'Последнее обновление'
   Share Playlist:
-    Share Playlist: 'Поделиться плейлистом'
+    Share Playlist: 'Поделиться подборкой'
     Copy YouTube Link: 'Скопировать ссылку YouTube'
     Open in YouTube: 'Открыть в YouTube'
     Copy Invidious Link: 'Скопировать ссылку Invidious'
@@ -699,7 +699,7 @@ Playlist:
 # On Video Watch Page
 #* Published
 #& Views
-  Playlist: Плейлист
+  Playlist: Подборка
 Toggle Theatre Mode: 'Переключить режим широкого экрана'
 Change Format:
   Change Media Formats: 'Изменить форматы видео'
@@ -773,7 +773,7 @@ Playing Previous Video: 'Воспроизведение предыдущего 
 Playing next video in 5 seconds.  Click to cancel: 'Воспроизведение следующего видео
   через 5 секунд. Нажмите, чтобы отменить.'
 Canceled next video autoplay: 'Отменено автовоспроизведение следующего видео'
-'The playlist has ended.  Enable loop to continue playing': 'Плейлист закончился.
+'The playlist has ended.  Enable loop to continue playing': 'Подборка закончилась.
   Включите повторение, чтобы продолжить воспроизведение'
 
 Yes: 'Да'
@@ -821,7 +821,7 @@ Profile:
   Subscription List: Список подписок
   Profile Filter: Фильтр профилей
   Profile Settings: Настройки профиля
-The playlist has been reversed: Плейлист был перевернут
+The playlist has been reversed: Подборка была перевёрнута
 A new blog is now available, {blogTitle}. Click to view more: Доступен новый блог
   {blogTitle}. Нажмите здесь, чтобы посмотреть подробности
 Download From Site: Скачать с сайта
@@ -880,13 +880,13 @@ Tooltips:
     Custom External Player Arguments: Любые пользовательские аргументы командной строки,
       разделенные точкой с запятой (';'), которые вы хотите передать внешнему проигрывателю.
     Ignore Warnings: Скрыть предупреждения, когда текущий внешний проигрыватель не
-      поддерживает текущее действие (например, обратный порядок плейлистов и т. д.).
+      поддерживает текущее действие (например, обратный порядок подборок и др.).
     Custom External Player Executable: По умолчанию FreeTube будет считать, что выбранный
       внешний проигрыватель можно найти через переменную окружения PATH. При необходимости
       здесь можно задать собственный путь.
     External Player: При выборе внешнего проигрывателя на миниатюре появится значок,
-      позволяющий открыть видео (плейлист, если поддерживается) во внешнем проигрывателе.
-      Внимание, настройки Invidious не применяются к внешним проигрывателям.
+      позволяющий открыть видео (подборку, если поддерживается) во внешнем проигрывателе.
+      Внимание, настройки Invidious не применяются ко внешним проигрывателям.
     DefaultCustomArgumentsTemplate: "(По умолчанию: '{defaultCustomArguments}')"
   Experimental Settings:
     Replace HTTP Cache: Отключает дисковый HTTP-кэш Electron и включает пользовательский

From e96116af10a342fbc9dad9cc48f4d53c7751a1cc Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Sun, 11 Dec 2022 15:41:03 +0800
Subject: [PATCH 051/301] * Update app menu to add items for going back/forward
 in router history (#2933)

---
 src/main/index.js   | 25 +++++++++++++++++++++++++
 src/renderer/App.js | 17 +++++++++++------
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index 798bd83f43b2..bc06dfef94b0 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -1039,6 +1039,31 @@ function runApp() {
             },
             type: 'normal'
           },
+          { type: 'separator' },
+          {
+            label: 'Back',
+            accelerator: 'Alt+Left',
+            click: (_menuItem, browserWindow, _event) => {
+              if (browserWindow == null) { return }
+
+              browserWindow.webContents.send(
+                'history-back',
+              )
+            },
+            type: 'normal',
+          },
+          {
+            label: 'Forward',
+            accelerator: 'Alt+Right',
+            click: (_menuItem, browserWindow, _event) => {
+              if (browserWindow == null) { return }
+
+              browserWindow.webContents.send(
+                'history-forward',
+              )
+            },
+            type: 'normal',
+          },
         ]
       },
       {
diff --git a/src/renderer/App.js b/src/renderer/App.js
index 0e86568b2ef6..92cd8066a9ba 100644
--- a/src/renderer/App.js
+++ b/src/renderer/App.js
@@ -159,6 +159,7 @@ export default Vue.extend({
           ipcRenderer = require('electron').ipcRenderer
           this.setupListenersToSyncWindows()
           this.activateKeyboardShortcuts()
+          this.activateIPCListeners()
           this.openAllLinksExternally()
           this.enableSetSearchQueryText()
           this.enableOpenUrl()
@@ -292,15 +293,19 @@ export default Vue.extend({
       })
     },
 
+    activateIPCListeners: function () {
+      // handle menu event updates from main script
+      ipcRenderer.on('history-back', (_event) => {
+        this.$refs.topNav.historyBack()
+      })
+      ipcRenderer.on('history-forward', (_event) => {
+        this.$refs.topNav.historyForward()
+      })
+    },
+
     handleKeyboardShortcuts: function (event) {
       if (event.altKey) {
         switch (event.key) {
-          case 'ArrowRight':
-            this.$refs.topNav.historyForward()
-            break
-          case 'ArrowLeft':
-            this.$refs.topNav.historyBack()
-            break
           case 'D':
           case 'd':
             this.$refs.topNav.focusSearch()

From b33af1c81269ac1ea6c27e9d253b624d9d304e44 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 11 Dec 2022 08:42:35 +0100
Subject: [PATCH 052/301] Make the process locales plugin properly async
 (#2940)

---
 _scripts/ProcessLocalesPlugin.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/_scripts/ProcessLocalesPlugin.js b/_scripts/ProcessLocalesPlugin.js
index 4d471cd21014..988d9e4df9f8 100644
--- a/_scripts/ProcessLocalesPlugin.js
+++ b/_scripts/ProcessLocalesPlugin.js
@@ -1,7 +1,10 @@
 const { existsSync, readFileSync } = require('fs')
-const { brotliCompressSync, constants } = require('zlib')
+const { brotliCompress, constants } = require('zlib')
+const { promisify } = require('util')
 const { load: loadYaml } = require('js-yaml')
 
+const brotliCompressAsync = promisify(brotliCompress)
+
 class ProcessLocalesPlugin {
   constructor(options = {}) {
     this.compress = !!options.compress
@@ -34,9 +37,9 @@ class ProcessLocalesPlugin {
       },
         async (_assets) => {
           const promises = []
-          
+
           for (const { locale, data } of this.locales) {
-            promises.push(new Promise((resolve) => {
+            promises.push(new Promise(async (resolve) => {
               if (Object.prototype.hasOwnProperty.call(data, 'Locale Name')) {
                 delete data['Locale Name']
               }
@@ -46,7 +49,7 @@ class ProcessLocalesPlugin {
 
               if (this.compress) {
                 filename += '.br'
-                output = this.compressLocale(output)
+                output = await this.compressLocale(output)
               }
 
               compilation.emitAsset(
@@ -78,10 +81,10 @@ class ProcessLocalesPlugin {
     }
   }
 
-  compressLocale(data) {
+  async compressLocale(data) {
     const buffer = Buffer.from(data, 'utf-8')
 
-    return brotliCompressSync(buffer, {
+    return await brotliCompressAsync(buffer, {
       params: {
         [constants.BROTLI_PARAM_MODE]: constants.BROTLI_MODE_TEXT,
         [constants.BROTLI_PARAM_QUALITY]: constants.BROTLI_MAX_QUALITY,

From 45953e3ba3219225236e6e3533ae712ecb23eb86 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Sun, 11 Dec 2022 02:43:23 -0500
Subject: [PATCH 053/301] Improve accessibility of FreeTube input elements
 (#2709)

* improve accessibility of FreeTube input elements

Co-Authored-By: Jason <84899178+jasonhenriquez@users.noreply.github.com>

* make focus visible for prompt

* add close button to ft-prompt

* Update src/renderer/components/ft-icon-button/ft-icon-button.vue

Co-authored-by: absidue <48293849+absidue@users.noreply.github.com>

* make suggested changes

* move eslint plugin to devdepedencies

Co-Authored-By: absidue <48293849+absidue@users.noreply.github.com>

* dont hide ft-prompt on focus out

* add aria-describeby

* update eslint-plugin-vuejs-accessibility

* Update yarn.lock

* Update yarn.lock

* Fix lint issues

* only escape whitespace in ids

* use computed properties

Co-authored-by: Jason <84899178+jasonhenriquez@users.noreply.github.com>
Co-authored-by: absidue <48293849+absidue@users.noreply.github.com>
---
 .eslintrc.js                                  |  11 +-
 package.json                                  |   1 +
 src/renderer/App.vue                          |  10 +-
 .../components/ft-button/ft-button.js         |   4 +
 .../components/ft-button/ft-button.vue        |   1 +
 .../ft-icon-button/ft-icon-button.js          |   2 +
 .../ft-icon-button/ft-icon-button.sass        |   2 +-
 .../ft-icon-button/ft-icon-button.vue         |  14 +-
 src/renderer/components/ft-input/ft-input.vue |   3 +
 .../ft-list-dropdown/ft-list-dropdown.css     |  18 +--
 .../ft-list-dropdown/ft-list-dropdown.js      |  23 ++-
 .../ft-list-dropdown/ft-list-dropdown.vue     |  19 ++-
 .../ft-notification-banner.css                |   4 +
 .../ft-notification-banner.js                 |   3 +-
 .../ft-notification-banner.vue                |  11 +-
 .../components/ft-prompt/ft-prompt.js         |  59 +++++++-
 .../components/ft-prompt/ft-prompt.vue        |  21 ++-
 .../components/ft-select/ft-select.css        |   1 -
 .../components/ft-select/ft-select.js         |   6 +
 .../components/ft-select/ft-select.vue        |   3 +
 .../ft-share-button/ft-share-button.vue       |  14 +-
 src/renderer/components/ft-toast/ft-toast.vue |   4 +
 src/renderer/helpers/accessibility.js         |  44 ++++++
 yarn.lock                                     | 136 +++++++++++++++++-
 24 files changed, 383 insertions(+), 31 deletions(-)
 create mode 100644 src/renderer/helpers/accessibility.js

diff --git a/.eslintrc.js b/.eslintrc.js
index be982e46f7c8..e97ae69e6cda 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -26,10 +26,11 @@ module.exports = {
     'eslint:recommended',
     'plugin:vue/recommended',
     'standard'
+    // 'plugin:vuejs-accessibility/recommended' // uncomment once issues are fixed
   ],
 
   // https://eslint.org/docs/user-guide/configuring#configuring-plugins
-  plugins: ['vue'],
+  plugins: ['vue', 'vuejs-accessibility'],
 
   rules: {
     'space-before-function-paren': 'off',
@@ -40,6 +41,12 @@ module.exports = {
     'no-undef': 'warn',
     'vue/no-template-key': 'warn',
     'vue/no-useless-template-attributes': 'off',
-    'vue/multi-word-component-names': 'off'
+    'vue/multi-word-component-names': 'off',
+    'vuejs-accessibility/no-onchange': 'off',
+    'vuejs-accessibility/label-has-for': ['error', {
+      required: {
+        some: ['nesting', 'id']
+      }
+    }]
   }
 }
diff --git a/package.json b/package.json
index e9daf7901645..e7c0e287b8fd 100644
--- a/package.json
+++ b/package.json
@@ -101,6 +101,7 @@
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-standard": "^5.0.0",
     "eslint-plugin-vue": "^9.7.0",
+    "eslint-plugin-vuejs-accessibility": "^2.0.0",
     "html-webpack-plugin": "^5.3.2",
     "js-yaml": "^4.1.0",
     "json-minimizer-webpack-plugin": "^4.0.0",
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index a1a3f925fb38..b4d7faa4ef45 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -20,12 +20,14 @@
           v-if="showUpdatesBanner"
           class="banner"
           :message="updateBannerMessage"
+          role="link"
           @click="handleUpdateBannerClick"
         />
         <ft-notification-banner
           v-if="showBlogBanner"
           class="banner"
           :message="blogBannerMessage"
+          role="link"
           @click="handleNewBlogBannerClick"
         />
       </div>
@@ -46,11 +48,9 @@
 
     <ft-prompt
       v-if="showReleaseNotes"
+      :label="changeLogTitle"
       @click="showReleaseNotes = !showReleaseNotes"
     >
-      <h2>
-        {{ changeLogTitle }}
-      </h2>
       <span
         id="changeLogText"
         v-html="updateChangelog"
@@ -60,6 +60,10 @@
           :label="$t('Download From Site')"
           @click="openDownloadsPage"
         />
+        <ft-button
+          :label="$t('Close')"
+          @click="showReleaseNotes = !showReleaseNotes"
+        />
       </ft-flex-box>
     </ft-prompt>
     <ft-prompt
diff --git a/src/renderer/components/ft-button/ft-button.js b/src/renderer/components/ft-button/ft-button.js
index afb52938cfc9..74eb0ba844aa 100644
--- a/src/renderer/components/ft-button/ft-button.js
+++ b/src/renderer/components/ft-button/ft-button.js
@@ -14,6 +14,10 @@ export default Vue.extend({
     backgroundColor: {
       type: String,
       default: 'var(--accent-color)'
+    },
+    id: {
+      type: String,
+      default: ''
     }
   }
 })
diff --git a/src/renderer/components/ft-button/ft-button.vue b/src/renderer/components/ft-button/ft-button.vue
index 24cbfdb617bd..88a340248188 100644
--- a/src/renderer/components/ft-button/ft-button.vue
+++ b/src/renderer/components/ft-button/ft-button.vue
@@ -1,5 +1,6 @@
 <template>
   <button
+    :id="id.length > 0 ? id : null"
     class="btn ripple"
     :style="{
       color: textColor,
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.js b/src/renderer/components/ft-icon-button/ft-icon-button.js
index 4c220abcd85b..bbb7d9a90d6f 100644
--- a/src/renderer/components/ft-icon-button/ft-icon-button.js
+++ b/src/renderer/components/ft-icon-button/ft-icon-button.js
@@ -1,4 +1,5 @@
 import Vue from 'vue'
+import { sanitizeForHtmlId } from '../../helpers/accessibility'
 
 export default Vue.extend({
   name: 'FtIconButton',
@@ -59,6 +60,7 @@ export default Vue.extend({
     }
   },
   methods: {
+    sanitizeForHtmlId,
     // used by the share menu
     hideDropdown: function () {
       this.dropdownShown = false
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.sass b/src/renderer/components/ft-icon-button/ft-icon-button.sass
index c8ae1b8784d1..ab32c450e1d1 100644
--- a/src/renderer/components/ft-icon-button/ft-icon-button.sass
+++ b/src/renderer/components/ft-icon-button/ft-icon-button.sass
@@ -86,7 +86,7 @@
     cursor: pointer
     transition: background 0.2s ease-out
 
-    &:hover
+    &:hover, &:focus
       background-color: var(--side-nav-hover-color)
       transition: background 0.2s ease-in
 
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.vue b/src/renderer/components/ft-icon-button/ft-icon-button.vue
index fe1479f92d5b..27f8c26e20d6 100644
--- a/src/renderer/components/ft-icon-button/ft-icon-button.vue
+++ b/src/renderer/components/ft-icon-button/ft-icon-button.vue
@@ -12,8 +12,12 @@
         padding: padding + 'px',
         fontSize: size + 'px'
       }"
+      tabindex="0"
+      role="button"
       @click="handleIconClick"
       @mousedown="handleIconMouseDown"
+      @keydown.enter.prevent="handleIconClick"
+      @keydown.space.prevent="handleIconClick"
     />
     <div
       v-show="dropdownShown"
@@ -33,12 +37,20 @@
         <ul
           v-if="dropdownOptions.length > 0"
           class="list"
+          role="listbox"
+          :aria-expanded="dropdownShown"
         >
           <li
             v-for="(option, index) in dropdownOptions"
+            :id="sanitizeForHtmlId(title + '-' + index)"
             :key="index"
+            role="option"
+            aria-selected="false"
+            tabindex="-1"
             :class="option.type === 'divider' ? 'listItemDivider' : 'listItem'"
-            @click="handleDropdownClick({url: option.value, index: index})"
+            @click="handleDropdownClick({url: option.value, index: index}, $event)"
+            @keydown.enter="handleDropdownClick({url: option.value, index: index}, $event)"
+            @keydown.space="handleDropdownClick({url: option.value, index: index}, $event)"
           >
             {{ option.type === 'divider' ? '' : option.label }}
           </li>
diff --git a/src/renderer/components/ft-input/ft-input.vue b/src/renderer/components/ft-input/ft-input.vue
index 20fd3c648b3a..bdc007b5dfc4 100644
--- a/src/renderer/components/ft-input/ft-input.vue
+++ b/src/renderer/components/ft-input/ft-input.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable vuejs-accessibility/mouse-events-have-key-events -->
 <template>
   <div
     class="ft-input-component"
@@ -70,6 +71,7 @@
         @mouseenter="searchState.isPointerInList = true"
         @mouseleave="searchState.isPointerInList = false"
       >
+        <!-- eslint-disable vuejs-accessibility/click-events-have-key-events -->
         <li
           v-for="(list, index) in visibleDataList"
           :key="index"
@@ -79,6 +81,7 @@
         >
           {{ list }}
         </li>
+        <!-- skipped -->
       </ul>
     </div>
   </div>
diff --git a/src/renderer/components/ft-list-dropdown/ft-list-dropdown.css b/src/renderer/components/ft-list-dropdown/ft-list-dropdown.css
index 751dd7517c82..e52594083dfb 100644
--- a/src/renderer/components/ft-list-dropdown/ft-list-dropdown.css
+++ b/src/renderer/components/ft-list-dropdown/ft-list-dropdown.css
@@ -1,11 +1,11 @@
-.dropDown {
+.dropdown {
   position: relative;
   text-align: center;
   text-transform: uppercase;
   margin: 0 5px;
 }
 
-.dropDown ul {
+.dropdown ul {
     display: none;
     position: absolute;
     list-style: none;
@@ -15,19 +15,19 @@
     z-index: 100;
 }
 
-.dropDown ul li {
+.dropdown ul li.buttonOption {
     width: 100%;
     float: none;
     box-sizing: border-box;
 }
 
-.dropDown:hover ul {
-    display: block;
+.dropdown:hover ul, .dropdown:focus-within ul {
+  display: block;
 }
 
-.dropDown ul li a {
-    text-decoration: none;
-    color: inherit;
+.dropdown ul li a {
+  text-decoration: none;
+  color: inherit;
 }
 
 .buttonTitle {
@@ -60,7 +60,7 @@
   transition: background 0.2s ease-out;
 }
 
-.buttonOption:hover {
+.buttonOption:hover, .buttonOption:focus {
   background-color: var(--side-nav-hover-color);
   -moz-transition: background 0.2s ease-in;
   -o-transition: background 0.2s ease-in;
diff --git a/src/renderer/components/ft-list-dropdown/ft-list-dropdown.js b/src/renderer/components/ft-list-dropdown/ft-list-dropdown.js
index 1f186014afc9..b53ca8941237 100644
--- a/src/renderer/components/ft-list-dropdown/ft-list-dropdown.js
+++ b/src/renderer/components/ft-list-dropdown/ft-list-dropdown.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-
+import { sanitizeForHtmlId, handleDropdownKeyboardEvent } from '../../helpers/accessibility'
 export default Vue.extend({
   name: 'FtListDropdown',
   props: {
@@ -31,5 +31,26 @@ export default Vue.extend({
     listType: function () {
       return this.$store.getters.getListType
     }
+  },
+  methods: {
+    sanitizeForHtmlId,
+    handleIconKeyPress() {
+      const firstOption = document.getElementById('buttonOption0')
+      if (firstOption) {
+        firstOption.setAttribute('tabIndex', 1)
+        firstOption.focus()
+      }
+    },
+    handleDropdownClick: function(index, event) {
+      if (!handleDropdownKeyboardEvent(event, event?.target)) {
+        return
+      }
+
+      const unspacedTitle = CSS.escape(sanitizeForHtmlId(this.title))
+      const allOptions = document.querySelector(`#${unspacedTitle} + ul`)
+      allOptions.setAttribute('tabindex', '-1')
+      event.target.setAttribute('tabindex', '0')
+      this.$emit('click', this.labelValues[index])
+    }
   }
 })
diff --git a/src/renderer/components/ft-list-dropdown/ft-list-dropdown.vue b/src/renderer/components/ft-list-dropdown/ft-list-dropdown.vue
index 383880d41e7e..814fccec74fc 100644
--- a/src/renderer/components/ft-list-dropdown/ft-list-dropdown.vue
+++ b/src/renderer/components/ft-list-dropdown/ft-list-dropdown.vue
@@ -1,6 +1,14 @@
 <template>
-  <div class="dropDown">
-    <div class="buttonTitle">
+  <div class="dropdown">
+    <div
+      :id="sanitizeForHtmlId(title)"
+      class="buttonTitle"
+      tabindex="0"
+      role="listbox"
+      @keydown.space.prevent="handleIconKeyPress($event)"
+      @keydown.enter.prevent="handleIconKeyPress($event)"
+      @keydown.down.prevent="handleIconKeyPress($event)"
+    >
       {{ title }}
       <font-awesome-icon
         class="angleDownIcon"
@@ -10,9 +18,14 @@
     <ul>
       <li
         v-for="(label, index) in labelNames"
+        :id="'buttonOption' + index"
         :key="index"
         class="buttonOption"
-        @click="$emit('click', labelValues[index])"
+        role="option"
+        tabindex="-1"
+        aria-selected="false"
+        @click="handleDropdownClick(index, $event)"
+        @keydown="handleDropdownClick(index, $event)"
       >
         {{ label }}
       </li>
diff --git a/src/renderer/components/ft-notification-banner/ft-notification-banner.css b/src/renderer/components/ft-notification-banner/ft-notification-banner.css
index 66f4da73cf23..fc4d16558109 100644
--- a/src/renderer/components/ft-notification-banner/ft-notification-banner.css
+++ b/src/renderer/components/ft-notification-banner/ft-notification-banner.css
@@ -14,6 +14,10 @@
   cursor: pointer;
 }
 
+.ftNotificationBanner:focus {
+  box-shadow: 20px 20px 20px rgba(0,0,0,.1);
+}
+
 .message {
   margin-right: 25px;
   cursor: pointer;
diff --git a/src/renderer/components/ft-notification-banner/ft-notification-banner.js b/src/renderer/components/ft-notification-banner/ft-notification-banner.js
index 086732e0ad9d..f5333c67bc99 100644
--- a/src/renderer/components/ft-notification-banner/ft-notification-banner.js
+++ b/src/renderer/components/ft-notification-banner/ft-notification-banner.js
@@ -18,8 +18,7 @@ export default Vue.extend({
       this.$emit('click', response)
     },
 
-    handleClose: function (event) {
-      event.stopPropagation()
+    handleClose: function () {
       this.handleClick(false)
     }
   }
diff --git a/src/renderer/components/ft-notification-banner/ft-notification-banner.vue b/src/renderer/components/ft-notification-banner/ft-notification-banner.vue
index a66c2734fa72..02feed7602a2 100644
--- a/src/renderer/components/ft-notification-banner/ft-notification-banner.vue
+++ b/src/renderer/components/ft-notification-banner/ft-notification-banner.vue
@@ -1,7 +1,13 @@
 <template>
   <div
     class="ftNotificationBanner"
+    tabindex="0"
+    role="link"
+    :title="message"
+    :aria-describedby="message"
     @click="handleClick(true)"
+    @keydown.enter.prevent="handleClick(true)"
+    @keydown.space.prevent="handleClick(true)"
   >
     <div
       class="message"
@@ -15,7 +21,10 @@
     <font-awesome-icon
       class="bannerIcon"
       :icon="['fas', 'times']"
-      @click="handleClose"
+      tabindex="0"
+      :title="$t('Close Banner')"
+      @click.stop="handleClose"
+      @keydown.enter.stop.prevent="handleClose"
     />
   </div>
 </template>
diff --git a/src/renderer/components/ft-prompt/ft-prompt.js b/src/renderer/components/ft-prompt/ft-prompt.js
index acaa11651867..309f7d015dbd 100644
--- a/src/renderer/components/ft-prompt/ft-prompt.js
+++ b/src/renderer/components/ft-prompt/ft-prompt.js
@@ -2,6 +2,7 @@ import Vue from 'vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
 import FtButton from '../../components/ft-button/ft-button.vue'
+import { sanitizeForHtmlId } from '../../helpers/accessibility'
 
 export default Vue.extend({
   name: 'FtPrompt',
@@ -28,10 +29,64 @@ export default Vue.extend({
       default: () => { return [] }
     }
   },
+  data: function () {
+    return {
+      promptButtons: []
+    }
+  },
+  computed: {
+    sanitizedLabel: function() {
+      return sanitizeForHtmlId(this.label)
+    }
+  },
+  beforeDestroy: function () {
+    document.removeEventListener('keydown', this.closeEventFunction, true)
+  },
+  mounted: function () {
+    document.addEventListener('keydown', this.closeEventFunction, true)
+    document.querySelector('.prompt').addEventListener('keydown', this.arrowKeys, true)
+    this.promptButtons = Array.from(
+      document.querySelector('.prompt .promptCard .ft-flex-box').childNodes
+    ).filter((e) => {
+      return e.id && e.id.startsWith('prompt')
+    })
+    this.focusItem(0)
+  },
   methods: {
+    hide: function() {
+      this.$emit('click', null)
+    },
     handleHide: function (event) {
-      if (event.target.className === 'prompt') {
-        this.$emit('click', null)
+      if (event.target.getAttribute('role') === 'button' || event.target.className === 'prompt') {
+        this.hide()
+      }
+    },
+    focusItem: function (value) {
+      let index = value
+      if (index < 0) {
+        index = this.promptButtons.length
+      } else if (index >= this.promptButtons.length) {
+        index = 0
+      }
+      if (index >= 0 && index < this.promptButtons.length) {
+        this.promptButtons[index].focus({ focusVisible: true })
+      }
+    },
+    // close on escape key and unfocus
+    closeEventFunction: function(event) {
+      if (event.type === 'keydown' && event.key === 'Escape') {
+        event.preventDefault()
+        this.hide()
+      }
+    },
+    arrowKeys: function(e) {
+      if (e.key === 'ArrowLeft' || e.key === 'ArrowRight') {
+        e.preventDefault()
+        const currentIndex = this.promptButtons.findIndex((cur) => {
+          return cur === e.target
+        })
+        const direction = (e.key === 'ArrowLeft') ? -1 : 1
+        this.focusItem(parseInt(currentIndex) + direction)
       }
     }
   }
diff --git a/src/renderer/components/ft-prompt/ft-prompt.vue b/src/renderer/components/ft-prompt/ft-prompt.vue
index da993727fc59..ba9e2272e3ee 100644
--- a/src/renderer/components/ft-prompt/ft-prompt.vue
+++ b/src/renderer/components/ft-prompt/ft-prompt.vue
@@ -1,11 +1,19 @@
 <template>
   <div
     class="prompt"
+    tabindex="-1"
     @click="handleHide"
+    @keydown.enter="handleHide"
   >
-    <ft-card class="promptCard">
+    <ft-card
+      class="promptCard"
+      :aria-labelledby="('dialog-' + sanitizedLabel)"
+    >
       <slot>
-        <h2 class="center">
+        <h2
+          :id="'dialog-' + sanitizedLabel"
+          class="center"
+        >
           {{ label }}
         </h2>
         <p
@@ -20,10 +28,19 @@
         <ft-flex-box>
           <ft-button
             v-for="(option, index) in optionNames"
+            :id="'prompt-' + sanitizedLabel + '-' + index"
             :key="index"
             :label="option"
             @click="$emit('click', optionValues[index])"
           />
+          <ft-button
+            :id="'prompt-' + sanitizedLabel + '-close'"
+            :label="$t('Close')"
+            tabindex="0"
+            text-color="'var(--accent-color)'"
+            background-color="'var(--text-with-accent-color)'"
+            @click="hide"
+          />
         </ft-flex-box>
       </slot>
     </ft-card>
diff --git a/src/renderer/components/ft-select/ft-select.css b/src/renderer/components/ft-select/ft-select.css
index a7a404c9d2d5..5387cdbbc2cd 100644
--- a/src/renderer/components/ft-select/ft-select.css
+++ b/src/renderer/components/ft-select/ft-select.css
@@ -88,7 +88,6 @@
   font-size: 18px;
   font-weight: normal;
   position: absolute;
-  pointer-events: none;
   left: 0;
   top: 10px;
   transition: 0.2s ease all;
diff --git a/src/renderer/components/ft-select/ft-select.js b/src/renderer/components/ft-select/ft-select.js
index 8c4ab6cd7e79..f8cab906fb71 100644
--- a/src/renderer/components/ft-select/ft-select.js
+++ b/src/renderer/components/ft-select/ft-select.js
@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import FtTooltip from '../ft-tooltip/ft-tooltip.vue'
+import { sanitizeForHtmlId } from '../../helpers/accessibility'
 
 export default Vue.extend({
   name: 'FtSelect',
@@ -31,5 +32,10 @@ export default Vue.extend({
       type: Boolean,
       default: false
     }
+  },
+  computed: {
+    sanitizedPlaceholder: function() {
+      return sanitizeForHtmlId(this.placeholder)
+    }
   }
 })
diff --git a/src/renderer/components/ft-select/ft-select.vue b/src/renderer/components/ft-select/ft-select.vue
index 660cb6c86687..1d172cb3b67f 100644
--- a/src/renderer/components/ft-select/ft-select.vue
+++ b/src/renderer/components/ft-select/ft-select.vue
@@ -1,9 +1,11 @@
 <template>
   <div class="select">
     <select
+      :id="sanitizedPlaceholder"
       class="select-text"
       :class="{disabled: disabled}"
       :value="value"
+      :name="sanitizedPlaceholder"
       :disabled="disabled"
       @change="$emit('change', $event.target.value)"
     >
@@ -23,6 +25,7 @@
     <span class="select-bar" />
     <label
       class="select-label"
+      :for="sanitizedPlaceholder"
       :hidden="disabled"
     >
       {{ placeholder }}
diff --git a/src/renderer/components/ft-share-button/ft-share-button.vue b/src/renderer/components/ft-share-button/ft-share-button.vue
index 6b38d9ec398b..13d39bcd89c9 100644
--- a/src/renderer/components/ft-share-button/ft-share-button.vue
+++ b/src/renderer/components/ft-share-button/ft-share-button.vue
@@ -19,6 +19,7 @@
     <div class="shareLinks">
       <div class="header">
         <img
+          id="youtubeShareImage"
           class="youtubeLogo"
           src="~../../assets/img/yt_logo_mono_dark.png"
           alt="YouTube"
@@ -30,6 +31,7 @@
       <div class="buttons">
         <ft-button
           class="action"
+          aria-describedby="youtubeShareImage"
           @click="copyYoutube()"
         >
           <font-awesome-icon :icon="['fas', 'copy']" />
@@ -37,6 +39,7 @@
         </ft-button>
         <ft-button
           class="action"
+          aria-describedby="youtubeShareImage"
           @click="openYoutube()"
         >
           <font-awesome-icon :icon="['fas', 'globe']" />
@@ -45,6 +48,7 @@
         <ft-button
           v-if="isVideo"
           class="action"
+          aria-describedby="youtubeShareImage"
           background-color="var(--accent-color-active)"
           @click="copyYoutubeEmbed()"
         >
@@ -54,6 +58,7 @@
         <ft-button
           v-if="isVideo"
           class="action"
+          aria-describedby="youtubeShareImage"
           background-color="var(--accent-color-active)"
           @click="openYoutubeEmbed()"
         >
@@ -64,12 +69,16 @@
 
       <div class="divider" />
 
-      <div class="header invidious">
+      <div
+        id="invidiousShare"
+        class="header invidious"
+      >
         <span class="invidiousLogo" />Invidious
       </div>
 
       <div class="buttons">
         <ft-button
+          aria-describedby="invidiousShare"
           class="action"
           @click="copyInvidious()"
         >
@@ -77,6 +86,7 @@
           {{ $t("Share.Copy Link") }}
         </ft-button>
         <ft-button
+          aria-describedby="invidiousShare"
           class="action"
           @click="openInvidious()"
         >
@@ -85,6 +95,7 @@
         </ft-button>
         <ft-button
           v-if="isVideo"
+          aria-describedby="invidiousShare"
           class="action"
           background-color="var(--accent-color-active)"
           @click="copyInvidiousEmbed()"
@@ -94,6 +105,7 @@
         </ft-button>
         <ft-button
           v-if="isVideo"
+          aria-describedby="invidiousShare"
           class="action"
           background-color="var(--accent-color-active)"
           @click="openInvidiousEmbed()"
diff --git a/src/renderer/components/ft-toast/ft-toast.vue b/src/renderer/components/ft-toast/ft-toast.vue
index efcd91a8eee0..571470556d8c 100644
--- a/src/renderer/components/ft-toast/ft-toast.vue
+++ b/src/renderer/components/ft-toast/ft-toast.vue
@@ -5,7 +5,11 @@
       :key="'toast-' + index"
       class="toast"
       :class="{ closed: !toast.isOpen, open: toast.isOpen }"
+      tabindex="0"
+      role="status"
       @click="performAction(index)"
+      @keydown.enter.prevent="performAction(index)"
+      @keydown.space.prevent="performAction(index)"
     >
       <p class="message">
         {{ toast.message }}
diff --git a/src/renderer/helpers/accessibility.js b/src/renderer/helpers/accessibility.js
new file mode 100644
index 000000000000..2ff2432bef20
--- /dev/null
+++ b/src/renderer/helpers/accessibility.js
@@ -0,0 +1,44 @@
+export function handleDropdownKeyboardEvent(event, target, afterElement) {
+  if (!event || !(event instanceof KeyboardEvent)) {
+    return true
+  }
+
+  let nextElement = null
+  if (event.key === 'Tab') {
+    if (afterElement) {
+      afterElement.tabindex = 0
+      afterElement.focus()
+    }
+    return false
+  } if (event.key === 'ArrowUp') {
+    nextElement = target.previousElementSibling ?? target.parentNode.lastElementChild
+
+    if (nextElement.classList.contains('listItemDivider')) {
+      nextElement = nextElement.previousElementSibling
+    }
+  } else if (event.key === 'ArrowDown') {
+    nextElement = target.nextElementSibling ?? target.parentNode.firstElementChild
+
+    if (nextElement.classList.contains('listItemDivider')) {
+      nextElement = nextElement.nextElementSibling
+    }
+  } else if (event.key === 'Home') {
+    nextElement = target.parentNode.firstElementChild
+  } else if (event.key === 'End') {
+    nextElement = target.parentNode.lastElementChild
+  }
+
+  event.preventDefault()
+
+  if (nextElement) {
+    target.setAttribute('tabindex', '-1')
+    nextElement.setAttribute('tabindex', '0')
+    nextElement.focus()
+  }
+
+  return event.key === 'Enter' || event.key === ' '
+}
+
+export function sanitizeForHtmlId(attribute) {
+  return attribute.replace(/\s+/g, '')
+}
diff --git a/yarn.lock b/yarn.lock
index 7db91d590be8..2e32484a5d01 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1925,6 +1925,13 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
+aria-query@>=5.0.0:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e"
+  integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==
+  dependencies:
+    deep-equal "^2.0.5"
+
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -3137,6 +3144,27 @@ decompress-response@^6.0.0:
   dependencies:
     mimic-response "^3.1.0"
 
+deep-equal@^2.0.5:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.1.0.tgz#5ba60402cf44ab92c2c07f3f3312c3d857a0e1dd"
+  integrity sha512-2pxgvWu3Alv1PoWEyVg7HS8YhGlUFUV7N5oOvfL6d+7xAmLSemMwv/c8Zv/i9KFzxV5Kt5CAvQc70fLwVuf4UA==
+  dependencies:
+    call-bind "^1.0.2"
+    es-get-iterator "^1.1.2"
+    get-intrinsic "^1.1.3"
+    is-arguments "^1.1.1"
+    is-date-object "^1.0.5"
+    is-regex "^1.1.4"
+    isarray "^2.0.5"
+    object-is "^1.1.5"
+    object-keys "^1.1.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.4.3"
+    side-channel "^1.0.4"
+    which-boxed-primitive "^1.0.2"
+    which-collection "^1.0.1"
+    which-typed-array "^1.1.8"
+
 deep-is@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
@@ -3519,6 +3547,11 @@ elliptic@^6.5.3:
     minimalistic-assert "^1.0.1"
     minimalistic-crypto-utils "^1.0.1"
 
+emoji-regex@^10.0.0:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.2.1.tgz#a41c330d957191efd3d9dfe6e1e8e1e9ab048b3f"
+  integrity sha512-97g6QgOk8zlDRdgq1WxwgTMgEWGVAQvB5Fdpgc1MkNy56la5SKP9GsMXKDOdqwn90/41a8yPwIGk1Y6WVbeMQA==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -3642,6 +3675,20 @@ es-abstract@^1.20.0:
     string.prototype.trimstart "^1.0.5"
     unbox-primitive "^1.0.2"
 
+es-get-iterator@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz#9234c54aba713486d7ebde0220864af5e2b283f7"
+  integrity sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.0"
+    has-symbols "^1.0.1"
+    is-arguments "^1.1.0"
+    is-map "^2.0.2"
+    is-set "^2.0.2"
+    is-string "^1.0.5"
+    isarray "^2.0.5"
+
 es-module-lexer@^0.9.0:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
@@ -3788,6 +3835,15 @@ eslint-plugin-vue@^9.7.0:
     vue-eslint-parser "^9.0.1"
     xml-name-validator "^4.0.0"
 
+eslint-plugin-vuejs-accessibility@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vuejs-accessibility/-/eslint-plugin-vuejs-accessibility-2.0.0.tgz#29d1e96cce4d73a0a74bb6fb65b05e3ba4e8af1f"
+  integrity sha512-mjbXnncDT9+5K+/QXXhOVWhEU6OOJck/JNlC6tewo3R+Kzsbaecyq3ylN1NqmyKo78vsgun34JLd+vGdxSPFWQ==
+  dependencies:
+    aria-query ">=5.0.0"
+    emoji-regex "^10.0.0"
+    vue-eslint-parser "^9.0.1"
+
 eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
@@ -4463,6 +4519,13 @@ globby@^13.1.1:
     merge2 "^1.4.1"
     slash "^4.0.0"
 
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"
+
 got@^11.8.5:
   version "11.8.5"
   resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046"
@@ -4924,7 +4987,7 @@ ipaddr.js@^2.0.1:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0"
   integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
 
-is-arguments@^1.0.4:
+is-arguments@^1.0.4, is-arguments@^1.1.0, is-arguments@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
   integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
@@ -4995,7 +5058,7 @@ is-core-module@^2.9.0:
   dependencies:
     has "^1.0.3"
 
-is-date-object@^1.0.1:
+is-date-object@^1.0.1, is-date-object@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
   integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
@@ -5036,6 +5099,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-map@^2.0.1, is-map@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
+  integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
+
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@@ -5078,6 +5146,11 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-set@^2.0.1, is-set@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
+  integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
+
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -5104,6 +5177,17 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
+is-typed-array@^1.1.10:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
+  integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+
 is-typed-array@^1.1.3, is-typed-array@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.9.tgz#246d77d2871e7d9f5aeb1d54b9f52c71329ece67"
@@ -5120,6 +5204,11 @@ is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+is-weakmap@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
+  integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
+
 is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
@@ -5127,6 +5216,14 @@ is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
+is-weakset@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d"
+  integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
+
 is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
@@ -5134,6 +5231,11 @@ is-wsl@^2.2.0:
   dependencies:
     is-docker "^2.0.0"
 
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
+
 isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -6008,6 +6110,14 @@ object-inspect@^1.12.2:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
   integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
 
+object-is@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
+  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
 object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -8412,6 +8522,16 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
+which-collection@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
+  integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
+  dependencies:
+    is-map "^2.0.1"
+    is-set "^2.0.1"
+    is-weakmap "^2.0.1"
+    is-weakset "^2.0.1"
+
 which-typed-array@^1.1.2:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.8.tgz#0cfd53401a6f334d90ed1125754a42ed663eb01f"
@@ -8424,6 +8544,18 @@ which-typed-array@^1.1.2:
     has-tostringtag "^1.0.0"
     is-typed-array "^1.1.9"
 
+which-typed-array@^1.1.8:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
+  integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+    is-typed-array "^1.1.10"
+
 which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"

From 10f9bf6d79726933542e8c039c66d742f4da0dfe Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Mon, 12 Dec 2022 07:03:01 +0100
Subject: [PATCH 054/301] Add keyboard shortcuts to jump to the next and
 previous chapters (#2912)

* Add keyboard shortcuts to jump to the next and previous chapters

* Change shortcut to Cmd for macOS
---
 .../ft-video-player/ft-video-player.js        | 42 ++++++++++++++++---
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
index ba1b24cf5215..ec91441c6ef3 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -1767,9 +1767,31 @@ export default Vue.extend({
       return listContentHTML
     },
 
+    /**
+     * determines whether the jump to the previous or next chapter
+     * with the the keyboard shortcuts, should be done
+     * first it checks whether there are any chapters (the array is also empty if chapters are hidden)
+     * it also checks that the approprate combination was used ALT/OPTION on macOS and CTRL everywhere else
+     * @param {KeyboardEvent} event the keyboard event
+     * @param {string} direction the direction of the jump either previous or next
+     * @returns {boolean}
+     */
+    canChapterJump: function (event, direction) {
+      const currentChapter = this.$parent.videoCurrentChapterIndex
+      return this.chapters.length > 0 &&
+        (direction === 'previous' ? currentChapter > 0 : this.chapters.length - 1 !== currentChapter) &&
+        ((process.platform !== 'darwin' && event.ctrlKey) ||
+          (process.platform === 'darwin' && event.metaKey))
+    },
+
     // This function should always be at the bottom of this file
     keyboardShortcutHandler: function (event) {
-      if (event.ctrlKey || document.activeElement.classList.contains('ft-input')) {
+      if (document.activeElement.classList.contains('ft-input')) {
+        return
+      }
+
+      // allow chapter jump keyboard shortcuts
+      if (event.ctrlKey && (process.platform === 'darwin' || (event.key !== 'ArrowLeft' && event.key !== 'ArrowRight'))) {
         return
       }
 
@@ -1842,14 +1864,24 @@ export default Vue.extend({
             this.changeVolume(-0.05)
             break
           case 'ArrowLeft':
-            // Rewind by the time-skip interval (in seconds)
             event.preventDefault()
-            this.changeDurationBySeconds(-this.defaultSkipInterval * this.player.playbackRate())
+            if (this.canChapterJump(event, 'previous')) {
+              // Jump to the previous chapter
+              this.player.currentTime(this.chapters[this.$parent.videoCurrentChapterIndex - 1].startSeconds)
+            } else {
+              // Rewind by the time-skip interval (in seconds)
+              this.changeDurationBySeconds(-this.defaultSkipInterval * this.player.playbackRate())
+            }
             break
           case 'ArrowRight':
-            // Fast-Forward by the time-skip interval (in seconds)
             event.preventDefault()
-            this.changeDurationBySeconds(this.defaultSkipInterval * this.player.playbackRate())
+            if (this.canChapterJump(event, 'next')) {
+              // Jump to the next chapter
+              this.player.currentTime(this.chapters[this.$parent.videoCurrentChapterIndex + 1].startSeconds)
+            } else {
+              // Fast-Forward by the time-skip interval (in seconds)
+              this.changeDurationBySeconds(this.defaultSkipInterval * this.player.playbackRate())
+            }
             break
           case 'I':
           case 'i':

From a8769cb0fa5162f9cb89346aea9c809fc658a404 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Dec 2022 06:09:34 -0500
Subject: [PATCH 055/301] Bump prettier from 2.8.0 to 2.8.1 (#2949)

Bumps [prettier](https://github.com/prettier/prettier) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.8.0...2.8.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e7c0e287b8fd..105982836700 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "lefthook": "^1.2.4",
     "mini-css-extract-plugin": "^2.7.2",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.8.0",
+    "prettier": "^2.8.1",
     "rimraf": "^3.0.2",
     "sass": "^1.56.1",
     "sass-loader": "^13.2.0",
diff --git a/yarn.lock b/yarn.lock
index 2e32484a5d01..7560dd7ef0e9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6711,10 +6711,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-"prettier@^1.18.2 || ^2.0.0", prettier@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.0.tgz#c7df58393c9ba77d6fba3921ae01faf994fb9dc9"
-  integrity sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==
+"prettier@^1.18.2 || ^2.0.0", prettier@^2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.1.tgz#4e1fd11c34e2421bc1da9aea9bd8127cd0a35efc"
+  integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==
 
 pretty-error@^4.0.0:
   version "4.0.0"

From 10d5820ef7949204fe6c980c31198e3f1aa0c6e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Dec 2022 06:10:29 -0500
Subject: [PATCH 056/301] Bump marked from 4.2.3 to 4.2.4 (#2944)

Bumps [marked](https://github.com/markedjs/marked) from 4.2.3 to 4.2.4.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v4.2.3...v4.2.4)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 105982836700..15d7b280ec13 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "http-proxy-agent": "^5.0.0",
     "https-proxy-agent": "^5.0.0",
     "lodash.debounce": "^4.0.8",
-    "marked": "^4.2.3",
+    "marked": "^4.2.4",
     "nedb-promises": "^6.2.1",
     "process": "^0.11.10",
     "socks-proxy-agent": "^7.0.0",
diff --git a/yarn.lock b/yarn.lock
index 7560dd7ef0e9..1d93195e116d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5701,10 +5701,10 @@ make-dir@^3.0.2:
   dependencies:
     semver "^6.0.0"
 
-marked@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.3.tgz#bd76a5eb510ff1d8421bc6c3b2f0b93488c15bea"
-  integrity sha512-slWRdJkbTZ+PjkyJnE30Uid64eHwbwa1Q25INCAYfZlK4o6ylagBy/Le9eWntqJFoFT93ikUKMv47GZ4gTwHkw==
+marked@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.4.tgz#5a4ce6c7a1ae0c952601fce46376ee4cf1797e1c"
+  integrity sha512-Wcc9ikX7Q5E4BYDPvh1C6QNSxrjC9tBgz+A/vAhp59KXUgachw++uMvMKiSW8oA85nopmPZcEvBoex/YLMsiyA==
 
 matcher@^3.0.0:
   version "3.0.0"

From e54552ccee64c7f63a8cd31e16e2fa72048daa04 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Dec 2022 06:10:48 -0500
Subject: [PATCH 057/301] Bump sass from 1.56.1 to 1.56.2 (#2946)

Bumps [sass](https://github.com/sass/dart-sass) from 1.56.1 to 1.56.2.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.56.1...1.56.2)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 15d7b280ec13..4cc69e3460be 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.1",
     "rimraf": "^3.0.2",
-    "sass": "^1.56.1",
+    "sass": "^1.56.2",
     "sass-loader": "^13.2.0",
     "tree-kill": "1.2.2",
     "vue-devtools": "^5.1.4",
diff --git a/yarn.lock b/yarn.lock
index 1d93195e116d..0a8b06c982fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7223,10 +7223,10 @@ sass-loader@^13.2.0:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
-sass@^1.56.1:
-  version "1.56.1"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.56.1.tgz#94d3910cd468fd075fa87f5bb17437a0b617d8a7"
-  integrity sha512-VpEyKpyBPCxE7qGDtOcdJ6fFbcpOM+Emu7uZLxVrkX8KVU/Dp5UF7WLvzqRuUhB6mqqQt1xffLoG+AndxTZrCQ==
+sass@^1.56.2:
+  version "1.56.2"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.56.2.tgz#9433b345ab3872996c82a53a58c014fd244fd095"
+  integrity sha512-ciEJhnyCRwzlBCB+h5cCPM6ie/6f8HrhZMQOf5vlU60Y1bI1rx5Zb0vlDZvaycHsg/MqFfF1Eq2eokAa32iw8w==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From fab81b97a0d699d5559bd698b8fb8653be1f90a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Dec 2022 06:11:10 -0500
Subject: [PATCH 058/301] Bump @fortawesome/free-solid-svg-icons from 6.2.0 to
 6.2.1 (#2945)

Bumps [@fortawesome/free-solid-svg-icons](https://github.com/FortAwesome/Font-Awesome) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.2.0...6.2.1)

---
updated-dependencies:
- dependency-name: "@fortawesome/free-solid-svg-icons"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 4cc69e3460be..07362256c13a 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
-    "@fortawesome/free-solid-svg-icons": "^6.2.0",
+    "@fortawesome/free-solid-svg-icons": "^6.2.1",
     "@fortawesome/vue-fontawesome": "^2.0.8",
     "@freetube/youtube-chat": "^1.1.2",
     "@freetube/yt-comment-scraper": "^6.2.0",
diff --git a/yarn.lock b/yarn.lock
index 0a8b06c982fe..c5c276405ce7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1014,11 +1014,6 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@fortawesome/fontawesome-common-types@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz#76467a94aa888aeb22aafa43eb6ff889df3a5a7f"
-  integrity sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg==
-
 "@fortawesome/fontawesome-common-types@6.2.1":
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz#411e02a820744d3f7e0d8d9df9d82b471beaa073"
@@ -1038,12 +1033,12 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "6.2.1"
 
-"@fortawesome/free-solid-svg-icons@^6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.0.tgz#8dcde48109354fd7a5ece8ea48d678bb91d4b5f0"
-  integrity sha512-UjCILHIQ4I8cN46EiQn0CZL/h8AwCGgR//1c4R96Q5viSRwuKVo0NdQEc4bm+69ZwC0dUvjbDqAHF1RR5FA3XA==
+"@fortawesome/free-solid-svg-icons@^6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz#2290ea5adcf1537cbd0c43de6feb38af02141d27"
+  integrity sha512-oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.2.0"
+    "@fortawesome/fontawesome-common-types" "6.2.1"
 
 "@fortawesome/vue-fontawesome@^2.0.8":
   version "2.0.8"

From b6a2b6aeec89113c6fb036a20a3e88ab9ee067c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Dec 2022 06:12:15 -0500
Subject: [PATCH 059/301] Bump eslint-plugin-vue from 9.7.0 to 9.8.0 (#2948)

Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 9.7.0 to 9.8.0.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v9.7.0...v9.8.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-vue
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 07362256c13a..2f06d56e47e0 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-standard": "^5.0.0",
-    "eslint-plugin-vue": "^9.7.0",
+    "eslint-plugin-vue": "^9.8.0",
     "eslint-plugin-vuejs-accessibility": "^2.0.0",
     "html-webpack-plugin": "^5.3.2",
     "js-yaml": "^4.1.0",
diff --git a/yarn.lock b/yarn.lock
index c5c276405ce7..e273d241e4a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3817,10 +3817,10 @@ eslint-plugin-standard@^5.0.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-5.0.0.tgz#c43f6925d669f177db46f095ea30be95476b1ee4"
   integrity sha512-eSIXPc9wBM4BrniMzJRBm2uoVuXz2EPa+NXPk2+itrVt+r5SbKFERx/IgrK/HmfjddyKVz2f+j+7gBRvu19xLg==
 
-eslint-plugin-vue@^9.7.0:
-  version "9.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.7.0.tgz#d391b9864f128ea2d1ee4dabeafb5f7c0cea981f"
-  integrity sha512-DrOO3WZCZEwcLsnd3ohFwqCoipGRSTKTBTnLwdhqAbYZtzWl0o7D+D8ZhlmiZvABKTEl8AFsqH1GHGdybyoQmw==
+eslint-plugin-vue@^9.8.0:
+  version "9.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.8.0.tgz#91de2aabbee8cdbef078ccd4f650a9ecfa445f4f"
+  integrity sha512-E/AXwcTzunyzM83C2QqDHxepMzvI2y6x+mmeYHbVDQlKFqmKYvRrhaVixEeeG27uI44p9oKDFiyCRw4XxgtfHA==
   dependencies:
     eslint-utils "^3.0.0"
     natural-compare "^1.4.0"

From b1d84405a528ac0142d5910a6bcba66cb669829b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Dec 2022 12:21:38 +0100
Subject: [PATCH 060/301] Bump youtubei.js from 2.5.0 to 2.5.3 (#2950)

Bumps [youtubei.js](https://github.com/LuanRT/YouTube.js) from 2.5.0 to 2.5.3.
- [Release notes](https://github.com/LuanRT/YouTube.js/releases)
- [Commits](https://github.com/LuanRT/YouTube.js/commits)

---
updated-dependencies:
- dependency-name: youtubei.js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2f06d56e47e0..a580f3fc8e90 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
-    "youtubei.js": "^2.5.0",
+    "youtubei.js": "^2.5.3",
     "yt-channel-info": "^3.2.1",
     "yt-dash-manifest-generator": "1.1.0",
     "ytdl-core": "https://github.com/absidue/node-ytdl-core#fix-likes-extraction",
diff --git a/yarn.lock b/yarn.lock
index e273d241e4a4..7096cab03288 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8667,10 +8667,10 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-youtubei.js@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-2.5.0.tgz#bd209a8b1edccc106ef0d77c6a619f3e3085913a"
-  integrity sha512-RnRXF4+HESqpJQ1FIWXZ/6M+0Sdt8OndTTD0yYex+zWR+7YOBRrWcXRuKSsWgw3v3ctuzW7TJ8+t/s/8/ImFHw==
+youtubei.js@^2.5.3:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-2.5.3.tgz#61e34e5cc541e4a0d213d812d06a2c0ee71a6fa7"
+  integrity sha512-j6njcwg0OhmAm8rhiwa+uMnAb1FKzzbwizYsjX9Vr+VC1RXJ5s4q6BxXYlkjV26yVlXWDl8/S9wCQNA/9r0M8A==
   dependencies:
     "@protobuf-ts/runtime" "^2.7.0"
     jintr "^0.3.1"

From 6976b015d3d30303e80145bd5c2fd47112871f15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Dec 2022 19:54:35 +0800
Subject: [PATCH 061/301] Bump @fortawesome/vue-fontawesome from 2.0.8 to 2.0.9
 (#2947)

Bumps [@fortawesome/vue-fontawesome](https://github.com/FortAwesome/vue-fontawesome) from 2.0.8 to 2.0.9.
- [Release notes](https://github.com/FortAwesome/vue-fontawesome/releases)
- [Changelog](https://github.com/FortAwesome/vue-fontawesome/blob/2.x/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/vue-fontawesome/compare/2.0.8...2.0.9)

---
updated-dependencies:
- dependency-name: "@fortawesome/vue-fontawesome"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a580f3fc8e90..e6ea61b016e4 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
-    "@fortawesome/vue-fontawesome": "^2.0.8",
+    "@fortawesome/vue-fontawesome": "^2.0.9",
     "@freetube/youtube-chat": "^1.1.2",
     "@freetube/yt-comment-scraper": "^6.2.0",
     "@freetube/yt-trending-scraper": "^3.1.1",
diff --git a/yarn.lock b/yarn.lock
index 7096cab03288..ba57aca749d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1040,10 +1040,10 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "6.2.1"
 
-"@fortawesome/vue-fontawesome@^2.0.8":
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.8.tgz#9c9ae1cd2cbe7f4b0c63dd53709c26167d541aa6"
-  integrity sha512-SRmP0q9Ox4zq8ydDR/hrH+23TVU1bdwYVnugLVaAIwklOHbf56gx6JUGlwES7zjuNYqzKgl8e39iYf6ph8qSQw==
+"@fortawesome/vue-fontawesome@^2.0.9":
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.9.tgz#7df35818135be54fd87568f16ec7b998a3d0cce8"
+  integrity sha512-tUmO92PFHbLOplitjHNBVGMJm6S57vp16tBXJVPKSI/6CfjrgLycqKxEpC6f7qsOqUdoXs5nIv4HLUfrOMHzuw==
 
 "@freetube/youtube-chat@^1.1.2":
   version "1.1.2"

From c6299e69f2c34971dce544b9cd4e7e5b5767d015 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 13 Dec 2022 10:39:22 +0100
Subject: [PATCH 062/301] Copy in-app links as YouTube links (#2951)

* Copy in-app links as YouTube links

* Store the split URL in a variable instead of splitting it multiple times
---
 src/main/index.js | 81 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 79 insertions(+), 2 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index bc06dfef94b0..4232a8da96bd 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -1,6 +1,7 @@
 import {
   app, BrowserWindow, dialog, Menu, ipcMain,
-  powerSaveBlocker, screen, session, shell, nativeTheme, net, protocol
+  powerSaveBlocker, screen, session, shell,
+  nativeTheme, net, protocol, clipboard
 } from 'electron'
 import path from 'path'
 import cp from 'child_process'
@@ -22,6 +23,7 @@ function runApp() {
     showSaveImageAs: true,
     showCopyImageAddress: true,
     showSelectAll: false,
+    showCopyLink: false,
     prepend: (defaultActions, parameters, browserWindow) => [
       {
         label: 'Show / Hide Video Statistics',
@@ -47,7 +49,82 @@ function runApp() {
           browserWindow.webContents.selectAll()
         }
       }
-    ]
+    ],
+    // only show the copy link entry for external links and the /playlist, /channel and /watch in-app URLs
+    // the /playlist, /channel and /watch in-app URLs get transformed to their equivalent YouTube URLs
+    append: (defaultActions, parameters, browserWindow) => {
+      let visible = false
+      const urlParts = parameters.linkURL.split('#')
+      const isInAppUrl = urlParts[0] === browserWindow.webContents.getURL().split('#')[0]
+
+      if (parameters.linkURL.length > 0) {
+        if (isInAppUrl) {
+          const path = urlParts[1]
+
+          if (path) {
+            visible = ['/playlist', '/channel', '/watch'].some(p => path.startsWith(p))
+          }
+        } else {
+          visible = true
+        }
+      }
+
+      return [{
+        label: 'Copy Lin&k',
+        visible: visible,
+        click: () => {
+          let url = parameters.linkURL
+
+          if (isInAppUrl) {
+            const [path, query] = urlParts[1].split('?')
+            const [route, id] = path.split('/').filter(p => p)
+
+            switch (route) {
+              case 'playlist':
+                url = `https://youtube.com/playlist?list=${id}`
+                break
+              case 'channel':
+                url = `https://www.youtube.com/channel/${id}`
+                break
+              case 'watch': {
+                url = `https://youtu.be/${id}`
+
+                if (query) {
+                  const params = new URLSearchParams(query)
+                  const newParams = new URLSearchParams()
+                  let hasParams = false
+
+                  if (params.has('playlistId')) {
+                    newParams.set('list', params.get('playlistId'))
+                    hasParams = true
+                  }
+
+                  if (params.has('timestamp')) {
+                    newParams.set('t', params.get('timestamp'))
+                    hasParams = true
+                  }
+
+                  if (hasParams) {
+                    url += '?' + newParams.toString()
+                  }
+                }
+
+                break
+              }
+            }
+          }
+
+          if (parameters.linkText) {
+            clipboard.write({
+              bookmark: parameters.linkText,
+              text: url
+            })
+          } else {
+            clipboard.writeText(url)
+          }
+        }
+      }]
+    }
   })
 
   // disable electron warning

From 36fc9468c2f820de71279ce87e1a099b08d6be2b Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 13 Dec 2022 14:19:16 +0100
Subject: [PATCH 063/301] Migrate the Playlist page to youtubei.js (#2903)

* Migrate the Playlist page to youtubei.js

* Make the extraction more tolerant to missing info
---
 .../components/playlist-info/playlist-info.js |  4 +-
 src/renderer/helpers/api/local.js             |  5 +++
 src/renderer/helpers/utils.js                 |  8 ++++
 src/renderer/views/Playlist/Playlist.js       | 40 +++++++++----------
 4 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/renderer/components/playlist-info/playlist-info.js b/src/renderer/components/playlist-info/playlist-info.js
index a96819326478..a8b448ac0ec0 100644
--- a/src/renderer/components/playlist-info/playlist-info.js
+++ b/src/renderer/components/playlist-info/playlist-info.js
@@ -93,11 +93,11 @@ export default Vue.extend({
     this.infoSource = this.data.infoSource
 
     // Causes errors if not put inside of a check
-    if (typeof (this.data.viewCount) !== 'undefined') {
+    if (typeof (this.data.viewCount) !== 'undefined' && !isNaN(this.data.viewCount)) {
       this.viewCount = this.hideViews ? null : Intl.NumberFormat(this.currentLocale).format(this.data.viewCount)
     }
 
-    if (typeof (this.data.videoCount) !== 'undefined') {
+    if (typeof (this.data.videoCount) !== 'undefined' && !isNaN(this.data.videoCount)) {
       this.videoCount = Intl.NumberFormat(this.currentLocale).format(this.data.videoCount)
     }
 
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 2af7d7911ede..f61004781b3e 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -56,3 +56,8 @@ export async function getLocalSearchSuggestions(query) {
 export function clearLocalSearchSuggestionsSession() {
   searchSuggestionsSession = null
 }
+
+export async function getLocalPlaylist(id) {
+  const innertube = await createInnertube()
+  return await innertube.getPlaylist(id)
+}
diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index 5cba3e30e56f..83334c118099 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -488,3 +488,11 @@ export async function getPicturesPath() {
     return null
   }
 }
+
+export function extractNumberFromString(str) {
+  if (typeof str === 'string') {
+    return parseInt(str.replace(/\D+/, ''))
+  } else {
+    return NaN
+  }
+}
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index 611c891c01b5..cb9400a9e94d 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -5,6 +5,8 @@ import FtCard from '../../components/ft-card/ft-card.vue'
 import PlaylistInfo from '../../components/playlist-info/playlist-info.vue'
 import FtListVideo from '../../components/ft-list-video/ft-list-video.vue'
 import i18n from '../../i18n/index'
+import { getLocalPlaylist } from '../../helpers/api/local'
+import { extractNumberFromString } from '../../helpers/utils'
 
 export default Vue.extend({
   name: 'Playlist',
@@ -64,18 +66,18 @@ export default Vue.extend({
     getPlaylistLocal: function () {
       this.isLoading = true
 
-      this.ytGetPlaylistInfo(this.playlistId).then((result) => {
+      getLocalPlaylist(this.playlistId).then((result) => {
         this.infoData = {
-          id: result.id,
-          title: result.title,
-          description: result.description ? result.description : '',
+          id: this.playlistId,
+          title: result.info.title,
+          description: result.info.description ?? '',
           firstVideoId: result.items[0].id,
-          viewCount: result.views,
-          videoCount: result.estimatedItemCount,
-          lastUpdated: result.lastUpdated ? result.lastUpdated : '',
-          channelName: result.author ? result.author.name : '',
-          channelThumbnail: result.author ? result.author.bestAvatar.url : '',
-          channelId: result.author ? result.author.channelID : '',
+          viewCount: extractNumberFromString(result.info.views),
+          videoCount: extractNumberFromString(result.info.total_items),
+          lastUpdated: result.info.last_updated ?? '',
+          channelName: result.info.author?.name ?? '',
+          channelThumbnail: result.info.author?.best_thumbnail?.url ?? '',
+          channelId: result.info.author?.id,
           infoSource: 'local'
         }
 
@@ -86,18 +88,13 @@ export default Vue.extend({
         })
 
         this.playlistItems = result.items.map((video) => {
-          if (typeof video.author !== 'undefined') {
-            const channelName = video.author.name
-            const channelId = video.author.channelID ? video.author.channelID : channelName
-            video.author = channelName
-            video.authorId = channelId
-          } else {
-            video.author = ''
-            video.authorId = ''
+          return {
+            videoId: video.id,
+            title: video.title,
+            author: video.author.name,
+            authorId: video.author.id,
+            lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds
           }
-          video.videoId = video.id
-          video.lengthSeconds = video.duration
-          return video
         })
 
         this.isLoading = false
@@ -177,7 +174,6 @@ export default Vue.extend({
     },
 
     ...mapActions([
-      'ytGetPlaylistInfo',
       'invidiousGetPlaylistInfo',
       'updateSubscriptionDetails'
     ])

From c6e4221966244518054a1643e3e2ab4ccf586ad9 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Tue, 13 Dec 2022 15:36:18 -0500
Subject: [PATCH 064/301] Fix ft-input keyboard naviagation (#2943)

---
 src/renderer/components/ft-input/ft-input.js  | 45 +++++++++++--------
 src/renderer/components/ft-input/ft-input.vue |  1 -
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/renderer/components/ft-input/ft-input.js b/src/renderer/components/ft-input/ft-input.js
index 54ac740e414e..5462bcd4de96 100644
--- a/src/renderer/components/ft-input/ft-input.js
+++ b/src/renderer/components/ft-input/ft-input.js
@@ -196,27 +196,36 @@ export default Vue.extend({
 
     handleKeyDown: function (event) {
       if (this.visibleDataList.length === 0) { return }
-      // Update selectedOption based on arrow key pressed
-      if (event.key === 'ArrowDown') {
-        this.searchState.selectedOption = (this.searchState.selectedOption + 1) % this.visibleDataList.length
-      } else if (event.key === 'ArrowUp') {
-        if (this.searchState.selectedOption < 1) {
-          this.searchState.selectedOption = this.visibleDataList.length - 1
-        } else {
-          this.searchState.selectedOption--
+      if (event.key === 'Enter') {
+        this.inputData = this.visibleDataList[this.searchState.selectedOption]
+        // Update Input box value if enter key was pressed and option selected
+        if (this.searchState.selectedOption !== -1) {
+          this.searchState.showOptions = false
+          event.preventDefault()
+          this.inputData = this.visibleDataList[this.searchState.selectedOption]
+          this.handleClick()
         }
       } else {
-        this.searchState.selectedOption = -1
-      }
-
-      // Key pressed isn't enter
-      if (event.key !== 'Enter') {
         this.searchState.showOptions = true
-      }
-      // Update Input box value if arrow keys were pressed
-      if ((event.key === 'ArrowDown' || event.key === 'ArrowUp') && this.searchState.selectedOption !== -1) {
-        event.preventDefault()
-        this.inputData = this.visibleDataList[this.searchState.selectedOption]
+        const isArrow = event.key === 'ArrowDown' || event.key === 'ArrowUp'
+        if (isArrow) {
+          if (event.key === 'ArrowDown') {
+            this.searchState.selectedOption = (this.searchState.selectedOption + 1) % this.visibleDataList.length
+          } else if (event.key === 'ArrowUp') {
+            if (this.searchState.selectedOption < 1) {
+              this.searchState.selectedOption = this.visibleDataList.length - 1
+            } else {
+              this.searchState.selectedOption--
+            }
+          }
+          if (this.searchState.selectedOption < 0) {
+            this.searchState.selectedOption = this.visibleDataList.length
+          } else if (this.searchState.selectedOption > this.visibleDataList.length - 1) {
+            this.searchState.selectedOption = 0
+          }
+        } else {
+          this.searchState.selectedOption = -1
+        }
       }
     },
 
diff --git a/src/renderer/components/ft-input/ft-input.vue b/src/renderer/components/ft-input/ft-input.vue
index bdc007b5dfc4..a0709b6ea6df 100644
--- a/src/renderer/components/ft-input/ft-input.vue
+++ b/src/renderer/components/ft-input/ft-input.vue
@@ -51,7 +51,6 @@
       @focus="handleFocus"
       @blur="handleInputBlur"
       @keydown="handleKeyDown"
-      @keydown.enter="handleClick"
     >
     <font-awesome-icon
       v-if="showActionButton"

From 5b04352bdf25df9bebf288a6bbe249424093c1fd Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Wed, 14 Dec 2022 02:12:52 +0100
Subject: [PATCH 065/301] Implement playlist pagination for the local API
 (#2956)

* Implement playlist pagination for the local API

* Check the info source when loading more comments so that backend fallback works
---
 src/renderer/views/Playlist/Playlist.css |  5 ++
 src/renderer/views/Playlist/Playlist.js  | 73 +++++++++++++++---------
 src/renderer/views/Playlist/Playlist.vue | 16 ++++++
 3 files changed, 67 insertions(+), 27 deletions(-)

diff --git a/src/renderer/views/Playlist/Playlist.css b/src/renderer/views/Playlist/Playlist.css
index c6f13f0a5c1e..b8318e3828c1 100644
--- a/src/renderer/views/Playlist/Playlist.css
+++ b/src/renderer/views/Playlist/Playlist.css
@@ -34,6 +34,11 @@
   color: var(--tertiary-text-color);
 }
 
+.loadNextPageWrapper {
+  /* about the same height as the button */
+  max-height: 7vh;
+}
+
 @media only screen and (max-width: 850px) {
   .routerView {
     flex-direction: column;
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index cb9400a9e94d..ad2803bea116 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -4,6 +4,8 @@ import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import PlaylistInfo from '../../components/playlist-info/playlist-info.vue'
 import FtListVideo from '../../components/ft-list-video/ft-list-video.vue'
+import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
+import FtButton from '../../components/ft-button/ft-button.vue'
 import i18n from '../../i18n/index'
 import { getLocalPlaylist } from '../../helpers/api/local'
 import { extractNumberFromString } from '../../helpers/utils'
@@ -14,17 +16,18 @@ export default Vue.extend({
     'ft-loader': FtLoader,
     'ft-card': FtCard,
     'playlist-info': PlaylistInfo,
-    'ft-list-video': FtListVideo
+    'ft-list-video': FtListVideo,
+    'ft-flex-box': FtFlexBox,
+    'ft-button': FtButton
   },
   data: function () {
     return {
       isLoading: false,
       playlistId: null,
-      nextPageRef: '',
-      lastSearchQuery: '',
-      playlistPage: 1,
       infoData: {},
-      playlistItems: []
+      playlistItems: [],
+      continuationData: null,
+      isLoadingMore: false
     }
   },
   computed: {
@@ -87,15 +90,11 @@ export default Vue.extend({
           channelId: this.infoData.channelId
         })
 
-        this.playlistItems = result.items.map((video) => {
-          return {
-            videoId: video.id,
-            title: video.title,
-            author: video.author.name,
-            authorId: video.author.id,
-            lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds
-          }
-        })
+        this.playlistItems = result.items.map(this.parseVideoLocal)
+
+        if (result.has_continuation) {
+          this.continuationData = result
+        }
 
         this.isLoading = false
       }).catch((err) => {
@@ -109,6 +108,16 @@ export default Vue.extend({
       })
     },
 
+    parseVideoLocal: function (video) {
+      return {
+        videoId: video.id,
+        title: video.title.text,
+        author: video.author.name,
+        authorId: video.author.id,
+        lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds
+      }
+    },
+
     getPlaylistInvidious: function () {
       this.isLoading = true
 
@@ -155,22 +164,32 @@ export default Vue.extend({
       })
     },
 
-    nextPage: function () {
-      const payload = {
-        query: this.query,
-        options: {
-          nextpageRef: this.nextPageRef
-        },
-        nextPage: true
+    getNextPage: function () {
+      switch (this.infoData.infoSource) {
+        case 'local':
+          this.getNextPageLocal()
+          break
+        case 'invidious':
+          console.error('Playlist pagination is not currently supported when the Invidious backend is selected.')
+          break
       }
-
-      this.performSearch(payload)
     },
 
-    replaceShownResults: function (history) {
-      this.shownResults = history.data
-      this.nextPageRef = history.nextPageRef
-      this.isLoading = false
+    getNextPageLocal: function () {
+      this.isLoadingMore = true
+
+      this.continuationData.getContinuation().then((result) => {
+        const parsedVideos = result.items.map(this.parseVideoLocal)
+        this.playlistItems = this.playlistItems.concat(parsedVideos)
+
+        if (result.has_continuation) {
+          this.continuationData = result
+        } else {
+          this.continuationData = null
+        }
+
+        this.isLoadingMore = false
+      })
     },
 
     ...mapActions([
diff --git a/src/renderer/views/Playlist/Playlist.vue b/src/renderer/views/Playlist/Playlist.vue
index 7b65c9c00281..6cc23d7a7798 100644
--- a/src/renderer/views/Playlist/Playlist.vue
+++ b/src/renderer/views/Playlist/Playlist.vue
@@ -33,6 +33,22 @@
           force-list-type="list"
         />
       </div>
+      <ft-flex-box
+        v-if="continuationData !== null && !isLoadingMore"
+      >
+        <ft-button
+          :label="$t('Subscriptions.Load More Videos')"
+          background-color="var(--primary-color)"
+          text-color="var(--text-with-main-color)"
+          @click="getNextPage"
+        />
+      </ft-flex-box>
+      <div
+        v-if="isLoadingMore"
+        class="loadNextPageWrapper"
+      >
+        <ft-loader />
+      </div>
     </ft-card>
   </div>
 </template>

From 29f5e38623d02f2e19a0d396aa615fbebf3d1238 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Wed, 14 Dec 2022 02:18:36 +0100
Subject: [PATCH 066/301] Add context menu entries to copy YouTube and
 Invidious links (#2957)

---
 src/main/index.js | 128 ++++++++++++++++++++++++++++------------------
 1 file changed, 79 insertions(+), 49 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index 4232a8da96bd..e6c3e1f64730 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -51,7 +51,7 @@ function runApp() {
       }
     ],
     // only show the copy link entry for external links and the /playlist, /channel and /watch in-app URLs
-    // the /playlist, /channel and /watch in-app URLs get transformed to their equivalent YouTube URLs
+    // the /playlist, /channel and /watch in-app URLs get transformed to their equivalent YouTube or Invidious URLs
     append: (defaultActions, parameters, browserWindow) => {
       let visible = false
       const urlParts = parameters.linkURL.split('#')
@@ -69,61 +69,91 @@ function runApp() {
         }
       }
 
-      return [{
-        label: 'Copy Lin&k',
-        visible: visible,
-        click: () => {
-          let url = parameters.linkURL
-
-          if (isInAppUrl) {
-            const [path, query] = urlParts[1].split('?')
-            const [route, id] = path.split('/').filter(p => p)
-
-            switch (route) {
-              case 'playlist':
-                url = `https://youtube.com/playlist?list=${id}`
-                break
-              case 'channel':
-                url = `https://www.youtube.com/channel/${id}`
-                break
-              case 'watch': {
-                url = `https://youtu.be/${id}`
-
-                if (query) {
-                  const params = new URLSearchParams(query)
-                  const newParams = new URLSearchParams()
-                  let hasParams = false
-
-                  if (params.has('playlistId')) {
-                    newParams.set('list', params.get('playlistId'))
-                    hasParams = true
-                  }
-
-                  if (params.has('timestamp')) {
-                    newParams.set('t', params.get('timestamp'))
-                    hasParams = true
-                  }
-
-                  if (hasParams) {
-                    url += '?' + newParams.toString()
-                  }
-                }
+      const copy = (url) => {
+        if (parameters.linkText) {
+          clipboard.write({
+            bookmark: parameters.linkText,
+            text: url
+          })
+        } else {
+          clipboard.writeText(url)
+        }
+      }
+
+      const transformURL = (toYouTube) => {
+        let origin
+
+        if (toYouTube) {
+          origin = 'https://www.youtube.com'
+        } else {
+          origin = 'https://redirect.invidious.io'
+        }
+
+        const [path, query] = urlParts[1].split('?')
+        const [route, id] = path.split('/').filter(p => p)
+
+        switch (route) {
+          case 'playlist':
+            return `${origin}/playlist?list=${id}`
+          case 'channel':
+            return `${origin}/channel/${id}`
+          case 'watch': {
+            let url
+
+            if (toYouTube) {
+              url = `https://youtu.be/${id}`
+            } else {
+              url = `https://redirect.invidious.io/watch?v=${id}`
+            }
+
+            if (query) {
+              const params = new URLSearchParams(query)
+              const newParams = new URLSearchParams()
+              let hasParams = false
+
+              if (params.has('playlistId')) {
+                newParams.set('list', params.get('playlistId'))
+                hasParams = true
+              }
 
-                break
+              if (params.has('timestamp')) {
+                newParams.set('t', params.get('timestamp'))
+                hasParams = true
+              }
+
+              if (hasParams) {
+                url += '?' + newParams.toString()
               }
             }
+
+            return url
           }
+        }
+      }
 
-          if (parameters.linkText) {
-            clipboard.write({
-              bookmark: parameters.linkText,
-              text: url
-            })
-          } else {
-            clipboard.writeText(url)
+      return [
+        {
+          label: 'Copy Lin&k',
+          visible: visible && !isInAppUrl,
+          click: () => {
+            copy(parameters.linkURL)
+          }
+        },
+        {
+          label: 'Copy YouTube Link',
+          visible: visible && isInAppUrl,
+          click: () => {
+            copy(transformURL(true))
+          }
+        },
+        {
+          label: 'Copy Invidious Link',
+          visible: visible && isInAppUrl,
+          click: () => {
+            copy(transformURL(false))
           }
         }
-      }]
+      ]
     }
   })
 

From 083ae0e622d4fd90d42f23969a5b8ed612229383 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Wed, 14 Dec 2022 01:55:29 -0500
Subject: [PATCH 067/301] fix error when searching (#2960)

---
 src/renderer/components/ft-input/ft-input.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/renderer/components/ft-input/ft-input.js b/src/renderer/components/ft-input/ft-input.js
index 5462bcd4de96..b0db7be28fb5 100644
--- a/src/renderer/components/ft-input/ft-input.js
+++ b/src/renderer/components/ft-input/ft-input.js
@@ -197,14 +197,13 @@ export default Vue.extend({
     handleKeyDown: function (event) {
       if (this.visibleDataList.length === 0) { return }
       if (event.key === 'Enter') {
-        this.inputData = this.visibleDataList[this.searchState.selectedOption]
         // Update Input box value if enter key was pressed and option selected
         if (this.searchState.selectedOption !== -1) {
           this.searchState.showOptions = false
           event.preventDefault()
           this.inputData = this.visibleDataList[this.searchState.selectedOption]
-          this.handleClick()
         }
+        this.handleClick()
       } else {
         this.searchState.showOptions = true
         const isArrow = event.key === 'ArrowDown' || event.key === 'ArrowUp'

From 5603b4030197d7938ae68ca66f4643bba69b8071 Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Fri, 16 Dec 2022 00:57:00 +0800
Subject: [PATCH 068/301] ! Fix enter on input doesn't work with empty visible
 data list (#2966)

---
 src/renderer/components/ft-input/ft-input.js | 43 +++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/renderer/components/ft-input/ft-input.js b/src/renderer/components/ft-input/ft-input.js
index b0db7be28fb5..37f01f7c81da 100644
--- a/src/renderer/components/ft-input/ft-input.js
+++ b/src/renderer/components/ft-input/ft-input.js
@@ -195,7 +195,6 @@ export default Vue.extend({
     },
 
     handleKeyDown: function (event) {
-      if (this.visibleDataList.length === 0) { return }
       if (event.key === 'Enter') {
         // Update Input box value if enter key was pressed and option selected
         if (this.searchState.selectedOption !== -1) {
@@ -204,27 +203,31 @@ export default Vue.extend({
           this.inputData = this.visibleDataList[this.searchState.selectedOption]
         }
         this.handleClick()
-      } else {
-        this.searchState.showOptions = true
-        const isArrow = event.key === 'ArrowDown' || event.key === 'ArrowUp'
-        if (isArrow) {
-          if (event.key === 'ArrowDown') {
-            this.searchState.selectedOption = (this.searchState.selectedOption + 1) % this.visibleDataList.length
-          } else if (event.key === 'ArrowUp') {
-            if (this.searchState.selectedOption < 1) {
-              this.searchState.selectedOption = this.visibleDataList.length - 1
-            } else {
-              this.searchState.selectedOption--
-            }
-          }
-          if (this.searchState.selectedOption < 0) {
-            this.searchState.selectedOption = this.visibleDataList.length
-          } else if (this.searchState.selectedOption > this.visibleDataList.length - 1) {
-            this.searchState.selectedOption = 0
+        // Early return
+        return
+      }
+
+      if (this.visibleDataList.length === 0) { return }
+
+      this.searchState.showOptions = true
+      const isArrow = event.key === 'ArrowDown' || event.key === 'ArrowUp'
+      if (isArrow) {
+        if (event.key === 'ArrowDown') {
+          this.searchState.selectedOption = (this.searchState.selectedOption + 1) % this.visibleDataList.length
+        } else if (event.key === 'ArrowUp') {
+          if (this.searchState.selectedOption < 1) {
+            this.searchState.selectedOption = this.visibleDataList.length - 1
+          } else {
+            this.searchState.selectedOption--
           }
-        } else {
-          this.searchState.selectedOption = -1
         }
+        if (this.searchState.selectedOption < 0) {
+          this.searchState.selectedOption = this.visibleDataList.length
+        } else if (this.searchState.selectedOption > this.visibleDataList.length - 1) {
+          this.searchState.selectedOption = 0
+        }
+      } else {
+        this.searchState.selectedOption = -1
       }
     },
 

From 30979856bc83acc8e3ca18588634bb2dfa2c00f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9A=D0=BE=D1=82=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B1=D0=B0=D0=B9?= <artemkotlubai@yandex.ru>
Date: Thu, 15 Dec 2022 19:38:50 +0000
Subject: [PATCH 069/301] Translated using Weblate (Russian)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index ad65f69c2030..7b40650d413e 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -909,8 +909,8 @@ External link opening has been disabled in the general settings: Открыти
 Search Bar:
   Clear Input: Очистить
 Are you sure you want to open this link?: Вы действительно хотите открыть эту ссылку?
-Starting download: Запуск загрузки "{videoTitle}"
-Downloading has completed: '"{videoTitle}" закончил загрузку'
+Starting download: Запуск загрузки «{videoTitle}»
+Downloading has completed: '«{videoTitle}» закончил загрузку'
 Downloading failed: Возникла проблема с загрузкой "{videoTitle}"
 Screenshot Success: Снимок экрана сохранён как "{filePath}"
 Screenshot Error: Снимок экрана не удался. {error}

From ac509bd17b95eee653cc7d89655d04d5ab2a8d6c Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Fri, 16 Dec 2022 05:06:18 +0100
Subject: [PATCH 070/301] Make some more elements right-clickable (#2968)

---
 .../watch-video-playlist.css                   |  6 +++---
 .../watch-video-playlist.js                    |  8 --------
 .../watch-video-playlist.vue                   | 18 ++++++++++--------
 .../SubscribedChannels/SubscribedChannels.css  |  3 +--
 .../SubscribedChannels/SubscribedChannels.js   |  4 ----
 .../SubscribedChannels/SubscribedChannels.vue  | 14 ++++++++------
 6 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.css b/src/renderer/components/watch-video-playlist/watch-video-playlist.css
index 6ce695d1a77a..16b10972e08b 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.css
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.css
@@ -1,10 +1,10 @@
-.pointer {
-  cursor: pointer;
+.playlistTitle, .channelName {
+  text-decoration: none;
+  color: inherit;
 }
 
 .channelName {
   font-size: 15px;
-  cursor: pointer;
   position: relative;
   bottom: 15px;
 }
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.js b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
index 85496e75d11d..6dc4d8eacf44 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.js
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
@@ -99,14 +99,6 @@ export default Vue.extend({
     }
   },
   methods: {
-    goToPlaylist: function () {
-      this.$router.push({ path: `/playlist/${this.playlistId}` })
-    },
-
-    goToChannel: function () {
-      this.$router.push({ path: `/channel/${this.channelId}` })
-    },
-
     toggleLoop: function () {
       if (this.loopEnabled) {
         this.loopEnabled = false
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
index 0e21856d9170..6f8e8113f723 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
@@ -6,18 +6,20 @@
     <div
       v-else
     >
-      <h3
-        class="pointer"
-        @click="goToPlaylist"
-      >
-        {{ playlistTitle }}
+      <h3>
+        <router-link
+          class="playlistTitle"
+          :to="`/playlist/${playlistId}`"
+        >
+          {{ playlistTitle }}
+        </router-link>
       </h3>
-      <span
+      <router-link
         class="channelName"
-        @click="goToChannel"
+        :to="`/channel/${channelId}`"
       >
         {{ channelName }}
-      </span>
+      </router-link>
       <span
         class="playlistIndex"
       >
diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.css b/src/renderer/views/SubscribedChannels/SubscribedChannels.css
index 49d70617aff7..b8e03f017ae2 100644
--- a/src/renderer/views/SubscribedChannels/SubscribedChannels.css
+++ b/src/renderer/views/SubscribedChannels/SubscribedChannels.css
@@ -37,12 +37,11 @@
 .channelThumbnail {
   height: 120px;
   border-radius: 50%;
-  cursor: pointer;
 }
 
 .channelName {
   flex-grow: 1;
-  cursor: pointer;
+  color: inherit;
   font-size: 1.1rem;
   text-decoration: none;
   text-align: center;
diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.js b/src/renderer/views/SubscribedChannels/SubscribedChannels.js
index 18ec467664b9..b3f142c6f37c 100644
--- a/src/renderer/views/SubscribedChannels/SubscribedChannels.js
+++ b/src/renderer/views/SubscribedChannels/SubscribedChannels.js
@@ -204,10 +204,6 @@ export default Vue.extend({
       }
     },
 
-    goToChannel: function (id) {
-      this.$router.push({ path: `/channel/${id}` })
-    },
-
     ...mapActions([
       'updateProfile',
       'updateSubscriptionDetails',
diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.vue b/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
index e61b70f087fa..1250607ac94e 100644
--- a/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
+++ b/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
@@ -29,21 +29,23 @@
             :key="channel.key"
             class="channel"
           >
-            <div class="thumbnailContainer">
+            <router-link
+              class="thumbnailContainer"
+              :to="`/channel/${channel.id}`"
+            >
               <img
                 class="channelThumbnail"
                 :src="thumbnailURL(channel.thumbnail)"
-                @click="goToChannel(channel.id)"
                 @error.once="updateThumbnail(channel)"
               >
-            </div>
-            <div
+            </router-link>
+            <router-link
               class="channelName"
               :title="channel.name"
-              @click="goToChannel(channel.id)"
+              :to="`/channel/${channel.id}`"
             >
               {{ channel.name }}
-            </div>
+            </router-link>
             <div
               v-if="!hideUnsubscribeButton"
               class="unsubscribeContainer"

From c9124359a505431a42647afe86602646fa298267 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Fri, 16 Dec 2022 18:08:56 +0100
Subject: [PATCH 071/301] Migrate playlists on the watch page to YouTube.js
 (#2969)

---
 _scripts/build.js                             |  2 +-
 _scripts/webpack.renderer.config.js           |  4 +-
 _scripts/webpack.web.config.js                |  1 -
 package.json                                  |  1 -
 .../watch-video-playlist.js                   | 51 +++++++++----------
 src/renderer/helpers/api/local.js             | 17 +++++++
 src/renderer/store/modules/ytdl.js            | 28 ----------
 src/renderer/views/Playlist/Playlist.js       | 16 ++----
 yarn.lock                                     |  7 ---
 9 files changed, 46 insertions(+), 81 deletions(-)

diff --git a/_scripts/build.js b/_scripts/build.js
index 78b1ed622ee5..91b92f93b0e0 100644
--- a/_scripts/build.js
+++ b/_scripts/build.js
@@ -64,7 +64,7 @@ const config = {
     '!node_modules/**/*',
 
     // renderer
-    'node_modules/{miniget,ytpl,ytsr}/**/*',
+    'node_modules/{miniget,ytsr}/**/*',
 
     '!**/README.md',
     '!**/*.js.map',
diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
index 2f78d7dcb460..5425e605c014 100644
--- a/_scripts/webpack.renderer.config.js
+++ b/_scripts/webpack.renderer.config.js
@@ -28,10 +28,10 @@ const config = {
     path: path.join(__dirname, '../dist'),
     filename: '[name].js',
   },
-  // webpack spits out errors while inlining ytpl and ytsr as
+  // webpack spits out errors while inlining ytsr as
   // they dynamically import their package.json file to extract the bug report URL
   // the error: "Critical dependency: the request of a dependency is an expression"
-  externals: ['ytpl', 'ytsr'],
+  externals: ['ytsr'],
   module: {
     rules: [
       {
diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
index 169f428ba7f9..df1b3f4fd79e 100644
--- a/_scripts/webpack.web.config.js
+++ b/_scripts/webpack.web.config.js
@@ -27,7 +27,6 @@ const config = {
   externals: {
     electron: '{}',
     'youtubei.js': '{}',
-    ytpl: '{}',
     ytsr: '{}'
   },
   module: {
diff --git a/package.json b/package.json
index e6ea61b016e4..35fc28ab286d 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,6 @@
     "yt-channel-info": "^3.2.1",
     "yt-dash-manifest-generator": "1.1.0",
     "ytdl-core": "https://github.com/absidue/node-ytdl-core#fix-likes-extraction",
-    "ytpl": "^2.3.0",
     "ytsr": "^3.8.0"
   },
   "devDependencies": {
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.js b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
index 6dc4d8eacf44..c4fef2ba8901 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.js
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
@@ -4,6 +4,7 @@ import FtLoader from '../ft-loader/ft-loader.vue'
 import FtCard from '../ft-card/ft-card.vue'
 import FtListVideo from '../ft-list-video/ft-list-video.vue'
 import { copyToClipboard, showToast } from '../../helpers/utils'
+import { getLocalPlaylist, parseLocalPlaylistVideo } from '../../helpers/api/local'
 
 export default Vue.extend({
   name: 'WatchVideoPlaylist',
@@ -241,36 +242,31 @@ export default Vue.extend({
       }
     },
 
-    getPlaylistInformationLocal: function () {
+    getPlaylistInformationLocal: async function () {
       this.isLoading = true
 
-      this.ytGetPlaylistInfo(this.playlistId).then((result) => {
-        this.playlistTitle = result.title
-        this.playlistItems = result.items
-        this.videoCount = result.estimatedItemCount
-        this.channelName = result.author.name
-        this.channelThumbnail = result.author.bestAvatar.url
-        this.channelId = result.author.channelID
-
-        this.playlistItems = result.items.filter((video) => {
-          return !(video.title === '[Private video]' || video.title === '[Deleted video]')
-        }).map((video) => {
-          if (typeof video.author !== 'undefined') {
-            const channelName = video.author.name
-            const channelId = video.author.channelID
-            video.author = channelName
-            video.authorId = channelId
-          } else {
-            video.author = ''
-            video.authorId = ''
-          }
-          video.videoId = video.id
-          video.lengthSeconds = video.duration
-          return video
-        })
+      try {
+        let playlist = await getLocalPlaylist(this.playlistId)
+
+        this.playlistTitle = playlist.info.title
+        this.videoCount = playlist.info.total_items
+        this.channelName = playlist.info.author?.name
+        this.channelThumbnail = playlist.info.author?.best_thumbnail?.url
+        this.channelId = playlist.info.author?.id
+
+        const videos = playlist.items.map(parseLocalPlaylistVideo)
+
+        while (playlist.has_continuation) {
+          playlist = await playlist.getContinuation()
+
+          const parsedVideos = playlist.items.map(parseLocalPlaylistVideo)
+          videos.push(...parsedVideos)
+        }
+
+        this.playlistItems = videos
 
         this.isLoading = false
-      }).catch((err) => {
+      } catch (err) {
         console.error(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
         showToast(`${errorMessage}: ${err}`, 10000, () => {
@@ -282,7 +278,7 @@ export default Vue.extend({
         } else {
           this.isLoading = false
         }
-      })
+      }
     },
 
     getPlaylistInformationInvidious: function () {
@@ -339,7 +335,6 @@ export default Vue.extend({
     },
 
     ...mapActions([
-      'ytGetPlaylistInfo',
       'invidiousGetPlaylistInfo'
     ])
   }
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index f61004781b3e..398bee391f15 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -61,3 +61,20 @@ export async function getLocalPlaylist(id) {
   const innertube = await createInnertube()
   return await innertube.getPlaylist(id)
 }
+
+/**
+ * @typedef {import('youtubei.js/dist/src/parser/classes/PlaylistVideo').default} PlaylistVideo
+ */
+
+/**
+ * @param {PlaylistVideo} video
+ */
+export function parseLocalPlaylistVideo(video) {
+  return {
+    videoId: video.id,
+    title: video.title.text,
+    author: video.author.name,
+    authorId: video.author.id,
+    lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds
+  }
+}
diff --git a/src/renderer/store/modules/ytdl.js b/src/renderer/store/modules/ytdl.js
index 528fb5ad7f12..03299b7451c5 100644
--- a/src/renderer/store/modules/ytdl.js
+++ b/src/renderer/store/modules/ytdl.js
@@ -1,12 +1,10 @@
 import ytdl from 'ytdl-core'
 import ytsr from 'ytsr'
-import ytpl from 'ytpl'
 
 import { SocksProxyAgent } from 'socks-proxy-agent'
 import { HttpsProxyAgent } from 'https-proxy-agent'
 import { HttpProxyAgent } from 'http-proxy-agent'
 
-import i18n from '../../i18n/index'
 import { searchFiltersMatch } from '../../helpers/utils'
 
 const state = {
@@ -193,32 +191,6 @@ const actions = {
     })
   },
 
-  ytGetPlaylistInfo ({ rootState }, playlistId) {
-    return new Promise((resolve, reject) => {
-      let agent = null
-      const settings = rootState.settings
-
-      if (settings.useProxy) {
-        agent = createProxyAgent(settings.proxyProtocol, settings.proxyHostname, settings.proxyPort)
-      }
-      let locale = i18n.locale.replace('_', '-')
-
-      if (locale === 'nn') {
-        locale = 'no'
-      }
-
-      ytpl(playlistId, {
-        hl: locale,
-        limit: Infinity,
-        requestOptions: { agent }
-      }).then((result) => {
-        resolve(result)
-      }).catch((err) => {
-        reject(err)
-      })
-    })
-  },
-
   ytGetVideoInformation ({ rootState }, videoId) {
     return new Promise((resolve, reject) => {
       let agent = null
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index ad2803bea116..1ace5cd3b7db 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -7,7 +7,7 @@ import FtListVideo from '../../components/ft-list-video/ft-list-video.vue'
 import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
 import FtButton from '../../components/ft-button/ft-button.vue'
 import i18n from '../../i18n/index'
-import { getLocalPlaylist } from '../../helpers/api/local'
+import { getLocalPlaylist, parseLocalPlaylistVideo } from '../../helpers/api/local'
 import { extractNumberFromString } from '../../helpers/utils'
 
 export default Vue.extend({
@@ -90,7 +90,7 @@ export default Vue.extend({
           channelId: this.infoData.channelId
         })
 
-        this.playlistItems = result.items.map(this.parseVideoLocal)
+        this.playlistItems = result.items.map(parseLocalPlaylistVideo)
 
         if (result.has_continuation) {
           this.continuationData = result
@@ -108,16 +108,6 @@ export default Vue.extend({
       })
     },
 
-    parseVideoLocal: function (video) {
-      return {
-        videoId: video.id,
-        title: video.title.text,
-        author: video.author.name,
-        authorId: video.author.id,
-        lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds
-      }
-    },
-
     getPlaylistInvidious: function () {
       this.isLoading = true
 
@@ -179,7 +169,7 @@ export default Vue.extend({
       this.isLoadingMore = true
 
       this.continuationData.getContinuation().then((result) => {
-        const parsedVideos = result.items.map(this.parseVideoLocal)
+        const parsedVideos = result.items.map(parseLocalPlaylistVideo)
         this.playlistItems = this.playlistItems.concat(parsedVideos)
 
         if (result.has_continuation) {
diff --git a/yarn.lock b/yarn.lock
index ba57aca749d6..ff1fdbb14088 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8710,13 +8710,6 @@ ytdl-core@^3.2.2:
     miniget "^4.2.2"
     sax "^1.1.3"
 
-ytpl@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/ytpl/-/ytpl-2.3.0.tgz#74633b6e582e22ff03e409dfb65d200c1a4ca0d2"
-  integrity sha512-Cfw2rxq3PFK6qgWr2Z8gsRefVahEzbn9XEuiJldqdXHE6GhO7kTfEvbZKdfXing1SmgW635uJ/UL2g8r0fvu2Q==
-  dependencies:
-    miniget "^4.2.2"
-
 ytsr@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/ytsr/-/ytsr-3.8.0.tgz#49a8e5dc413f41515fc3d79d93ee3e073d10e772"

From d59af75123a0ebfd1c3c130c4aefe19e0482e6d3 Mon Sep 17 00:00:00 2001
From: Fjuro <ifjuro@proton.me>
Date: Sat, 17 Dec 2022 10:31:24 +0000
Subject: [PATCH 072/301] Translated using Weblate (Czech)

Currently translated at 100.0% (639 of 639 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/cs/
---
 static/locales/cs.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml
index e9ba54d9d6fd..2a60e2b0f526 100644
--- a/static/locales/cs.yaml
+++ b/static/locales/cs.yaml
@@ -772,7 +772,7 @@ Comments:
   View: 'Zobrazit'
   Hide: 'Skrýt'
   Replies: 'Odpovědi'
-  Reply: 'Odpovědět'
+  Reply: 'Odpověď'
   There are no comments available for this video: 'K tomuto videu nejsou dostupné
     žádné komentáře'
   Load More Comments: 'Načíst další komentáře'

From 79cd65c3121f68bb997e15a95227c62aefaa9230 Mon Sep 17 00:00:00 2001
From: Emma Jiang <31319479+emmayjiang@users.noreply.github.com>
Date: Sat, 17 Dec 2022 05:46:43 -0800
Subject: [PATCH 073/301] Display long names in profile select (#2964)

* fix the display of names that are too long to fit in the profile select menu

* revert flexbox addition
---
 .../components/ft-profile-selector/ft-profile-selector.css   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/ft-profile-selector/ft-profile-selector.css b/src/renderer/components/ft-profile-selector/ft-profile-selector.css
index 51897b9934a6..580141940474 100644
--- a/src/renderer/components/ft-profile-selector/ft-profile-selector.css
+++ b/src/renderer/components/ft-profile-selector/ft-profile-selector.css
@@ -61,7 +61,10 @@
 }
 
 .profileName {
-  line-height: 50px;
+  display: flex;
+  align-items: center;
+  height: 50px;
+  padding-right: 10px;
 }
 
 .profileListTitle {

From dbb54737c4fc81e784de0d649a5a04c52be2825a Mon Sep 17 00:00:00 2001
From: Simon Epstein <simon@simondo.com>
Date: Sat, 17 Dec 2022 14:28:17 +0000
Subject: [PATCH 074/301] Password protect settings (#2932)

* Hide unsubscribe button on channel list if this is set in parental
controls.

* Fix github linting errors

* Removed trailing whitespace.

* Reverted yarn.lock change

* Remove package-lock.json

* Added support for password protecting settings.

* Push password handling code inside password-settings component.

* Added incorrect password message

* Replace update method with watch.

* Use updateSettingsPassword to commit value to database.

* Move password settings to the bottom (review comment)

* Moved unlock into separate component (review feedback)

* Styling password dialog

* Removed incorrect (and unused) prop value - review comment.

* Removed unused component imports

Co-authored-by: Simon Epstein <simon.epstein@67bricks.com>
---
 src/renderer/components/ft-input/ft-input.js  | 14 +++++
 src/renderer/components/ft-input/ft-input.vue |  2 +-
 .../password-dialog/password-dialog.css       | 10 +++
 .../password-dialog/password-dialog.js        | 58 ++++++++++++++++++
 .../password-dialog/password-dialog.vue       | 31 ++++++++++
 .../password-settings/password-settings.js    | 58 ++++++++++++++++++
 .../password-settings/password-settings.vue   | 36 +++++++++++
 src/renderer/store/modules/settings.js        |  3 +-
 src/renderer/views/Settings/Settings.js       | 18 +++++-
 src/renderer/views/Settings/Settings.vue      | 61 +++++++++++--------
 static/locales/en-US.yaml                     | 11 ++++
 11 files changed, 273 insertions(+), 29 deletions(-)
 create mode 100644 src/renderer/components/password-dialog/password-dialog.css
 create mode 100644 src/renderer/components/password-dialog/password-dialog.js
 create mode 100644 src/renderer/components/password-dialog/password-dialog.vue
 create mode 100644 src/renderer/components/password-settings/password-settings.js
 create mode 100644 src/renderer/components/password-settings/password-settings.vue

diff --git a/src/renderer/components/ft-input/ft-input.js b/src/renderer/components/ft-input/ft-input.js
index 37f01f7c81da..16f67c25e1d2 100644
--- a/src/renderer/components/ft-input/ft-input.js
+++ b/src/renderer/components/ft-input/ft-input.js
@@ -8,6 +8,11 @@ export default Vue.extend({
     'ft-tooltip': FtTooltip
   },
   props: {
+    inputType: {
+      type: String,
+      required: false,
+      default: 'text'
+    },
     placeholder: {
       type: String,
       required: true
@@ -97,6 +102,11 @@ export default Vue.extend({
       if (val !== oldVal) {
         this.updateVisibleDataList()
       }
+    },
+    value(val, oldVal) {
+      if (val !== oldVal) {
+        this.inputData = val
+      }
     }
   },
   mounted: function () {
@@ -264,6 +274,10 @@ export default Vue.extend({
       this.inputData = text
     },
 
+    focus() {
+      this.$refs.input.focus()
+    },
+
     ...mapActions([
       'getYoutubeUrlInfo'
     ])
diff --git a/src/renderer/components/ft-input/ft-input.vue b/src/renderer/components/ft-input/ft-input.vue
index a0709b6ea6df..af244a40f347 100644
--- a/src/renderer/components/ft-input/ft-input.vue
+++ b/src/renderer/components/ft-input/ft-input.vue
@@ -43,7 +43,7 @@
       v-model="inputData"
       :list="idDataList"
       class="ft-input"
-      type="text"
+      :type="inputType"
       :placeholder="placeholder"
       :disabled="disabled"
       :spellcheck="spellcheck"
diff --git a/src/renderer/components/password-dialog/password-dialog.css b/src/renderer/components/password-dialog/password-dialog.css
new file mode 100644
index 000000000000..8769c42f1af6
--- /dev/null
+++ b/src/renderer/components/password-dialog/password-dialog.css
@@ -0,0 +1,10 @@
+.card {
+    position: relative;
+    width: 85%;
+    height: 25%;
+    margin: auto;
+    box-sizing: border-box;
+}
+.passwordInput {
+    width: 100%;
+}
diff --git a/src/renderer/components/password-dialog/password-dialog.js b/src/renderer/components/password-dialog/password-dialog.js
new file mode 100644
index 000000000000..1e2212157147
--- /dev/null
+++ b/src/renderer/components/password-dialog/password-dialog.js
@@ -0,0 +1,58 @@
+import Vue from 'vue'
+import { mapActions } from 'vuex'
+import FtCard from '../ft-card/ft-card.vue'
+import FtInput from '../ft-input/ft-input.vue'
+import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
+import FtPrompt from '../ft-prompt/ft-prompt.vue'
+
+export default Vue.extend({
+  name: 'PasswordDialog',
+  components: {
+    'ft-input': FtInput,
+    'ft-card': FtCard,
+    'ft-flex-box': FtFlexBox,
+    'ft-prompt': FtPrompt,
+  },
+  emits: ['settingsUnlocked'],
+  data: function() {
+    return {
+      password: '',
+      showIncorrectPassword: false
+    }
+  },
+  computed: {
+    getStoredPassword: function() {
+      return this.$store.getters.getSettingsPassword
+    },
+    incorrectPassword: function() {
+      return this.password !== '' && !this.unlocked
+    },
+    unlocked: function() {
+      return this.getStoredPassword === '' || this.password === this.getStoredPassword
+    }
+  },
+  watch: {
+    unlocked(val, oldVal) {
+      if (val !== oldVal) {
+        this.propagateUnlockStatus()
+      }
+    },
+  },
+  mounted: function () {
+    this.propagateUnlockStatus()
+    this.$refs.password.focus()
+  },
+  methods: {
+    handleLock: function () {
+      this.password = ''
+      this.showIncorrectPassword = false
+    },
+    propagateUnlockStatus: function() {
+      this.$emit('settingsUnlocked', this.unlocked)
+    },
+    ...mapActions([
+      'updateSettingsPassword'
+    ]),
+
+  }
+})
diff --git a/src/renderer/components/password-dialog/password-dialog.vue b/src/renderer/components/password-dialog/password-dialog.vue
new file mode 100644
index 000000000000..f7b6300d1584
--- /dev/null
+++ b/src/renderer/components/password-dialog/password-dialog.vue
@@ -0,0 +1,31 @@
+<template>
+  <div>
+    <ft-card
+      class="card"
+    >
+      <h3>{{ $t("Settings.Password Dialog.Enter Password To Unlock") }}</h3>
+
+      <ft-flex-box>
+        <ft-input
+          ref="password"
+          :placeholder="$t('Settings.Password Dialog.Password')"
+          :show-action-button="false"
+          input-type="password"
+          class="passwordInput"
+          :value="password"
+          @input="e => password = e"
+        />
+      </ft-flex-box>
+      <ft-prompt
+        v-if="showIncorrectPassword"
+        :label="$t('Settings.Password Dialog.Password Incorrect')"
+        :option-names="[$t('Ok')]"
+        :option-values="['ok']"
+        @click="handleLock"
+      />
+    </ft-card>
+  </div>
+</template>
+
+<script src="./password-dialog.js" />
+<style scoped src="./password-dialog.css" />
diff --git a/src/renderer/components/password-settings/password-settings.js b/src/renderer/components/password-settings/password-settings.js
new file mode 100644
index 000000000000..40e9f482f260
--- /dev/null
+++ b/src/renderer/components/password-settings/password-settings.js
@@ -0,0 +1,58 @@
+import Vue from 'vue'
+import { mapActions } from 'vuex'
+import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
+import FtInput from '../ft-input/ft-input.vue'
+import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
+import FtButton from '../ft-button/ft-button.vue'
+
+export default Vue.extend({
+  name: 'PasswordSettings',
+  components: {
+    'ft-settings-section': FtSettingsSection,
+    'ft-input': FtInput,
+    'ft-flex-box': FtFlexBox,
+    'ft-button': FtButton,
+  },
+  emits: ['settingsUnlocked'],
+  data: function() {
+    return {
+      password: '',
+    }
+  },
+  computed: {
+    getStoredPassword: function() {
+      return this.$store.getters.getSettingsPassword
+    },
+    hasStoredPassword: function() {
+      return this.getStoredPassword !== ''
+    },
+    unlocked: function() {
+      return this.getStoredPassword === '' || this.password === this.getStoredPassword
+    }
+  },
+  watch: {
+    unlocked(val, oldVal) {
+      if (val !== oldVal) {
+        this.propagateUnlockStatus()
+      }
+    },
+  },
+  methods: {
+    handleSetPassword: function () {
+      this.updateSettingsPassword(this.password)
+      this.password = ''
+    },
+    handleRemovePassword: function () {
+      this.updateSettingsPassword('')
+      this.password = ''
+    },
+    propagateUnlockStatus: function() {
+      this.$emit('settingsUnlocked', this.unlocked)
+    },
+
+    ...mapActions([
+      'updateSettingsPassword'
+    ]),
+
+  }
+})
diff --git a/src/renderer/components/password-settings/password-settings.vue b/src/renderer/components/password-settings/password-settings.vue
new file mode 100644
index 000000000000..5ba0279b7e94
--- /dev/null
+++ b/src/renderer/components/password-settings/password-settings.vue
@@ -0,0 +1,36 @@
+<template>
+  <ft-settings-section
+    :title="$t('Settings.Password Settings.Password Settings')"
+  >
+    <div>
+      <ft-flex-box
+        v-if="hasStoredPassword"
+        class="settingsFlexStart460px"
+      >
+        <ft-button
+          :label="$t('Settings.Password Settings.Remove Password')"
+          @click="handleRemovePassword"
+        />
+      </ft-flex-box>
+      <ft-flex-box
+        v-else
+        class="settingsFlexStart460px"
+      >
+        <ft-input
+          :placeholder="$t('Settings.Password Settings.Set Password To Prevent Access')"
+          :show-action-button="false"
+          :show-label="true"
+          input-type="password"
+          :value="password"
+          @input="e => password = e"
+        />
+        <ft-button
+          :label="$t('Settings.Password Settings.Set Password')"
+          @click="handleSetPassword"
+        />
+      </ft-flex-box>
+    </div>
+  </ft-settings-section>
+</template>
+
+<script src="./password-settings.js" />
diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
index 40090fd358b8..9e4873f33ad5 100644
--- a/src/renderer/store/modules/settings.js
+++ b/src/renderer/store/modules/settings.js
@@ -274,7 +274,8 @@ const state = {
   screenshotAskPath: false,
   screenshotFolderPath: '',
   screenshotFilenamePattern: '%Y%M%D-%H%N%S',
-  fetchSubscriptionsAutomatically: true
+  fetchSubscriptionsAutomatically: true,
+  settingsPassword: ''
 }
 
 const stateWithSideEffects = {
diff --git a/src/renderer/views/Settings/Settings.js b/src/renderer/views/Settings/Settings.js
index 92ce91804c16..b88fc425e755 100644
--- a/src/renderer/views/Settings/Settings.js
+++ b/src/renderer/views/Settings/Settings.js
@@ -12,6 +12,8 @@ import ProxySettings from '../../components/proxy-settings/proxy-settings.vue'
 import SponsorBlockSettings from '../../components/sponsor-block-settings/sponsor-block-settings.vue'
 import ParentControlSettings from '../../components/parental-control-settings/parental-control-settings.vue'
 import ExperimentalSettings from '../../components/experimental-settings/experimental-settings.vue'
+import PasswordSettings from '../../components/password-settings/password-settings.vue'
+import PasswordDialog from '../../components/password-dialog/password-dialog.vue'
 
 export default Vue.extend({
   name: 'Settings',
@@ -28,11 +30,23 @@ export default Vue.extend({
     'sponsor-block-settings': SponsorBlockSettings,
     'download-settings': DownloadSettings,
     'parental-control-settings': ParentControlSettings,
-    'experimental-settings': ExperimentalSettings
+    'experimental-settings': ExperimentalSettings,
+    'password-settings': PasswordSettings,
+    'password-dialog': PasswordDialog,
+  },
+  data: function () {
+    return {
+      settingsUnlocked: false
+    }
   },
   computed: {
     usingElectron: function () {
       return process.env.IS_ELECTRON
-    }
+    },
+  },
+  methods: {
+    handleSettingsUnlocked: function (n) {
+      this.settingsUnlocked = n
+    },
   }
 })
diff --git a/src/renderer/views/Settings/Settings.vue b/src/renderer/views/Settings/Settings.vue
index 56f18ec58c32..e7618dfbb29c 100644
--- a/src/renderer/views/Settings/Settings.vue
+++ b/src/renderer/views/Settings/Settings.vue
@@ -1,30 +1,41 @@
 <template>
   <div>
-    <general-settings />
-    <hr>
-    <theme-settings />
-    <hr>
-    <player-settings />
-    <hr>
-    <external-player-settings v-if="usingElectron" />
-    <hr v-if="usingElectron">
-    <subscription-settings />
-    <hr>
-    <distraction-settings />
-    <hr>
-    <privacy-settings />
-    <hr>
-    <data-settings />
-    <hr>
-    <proxy-settings />
-    <hr>
-    <download-settings v-if="usingElectron" />
-    <hr v-if="usingElectron">
-    <parental-control-settings />
-    <hr>
-    <sponsor-block-settings />
-    <hr v-if="usingElectron">
-    <experimental-settings v-if="usingElectron" />
+    <div v-if="settingsUnlocked">
+      <general-settings />
+      <hr>
+      <theme-settings />
+      <hr>
+      <player-settings />
+      <hr>
+      <external-player-settings v-if="usingElectron" />
+      <hr v-if="usingElectron">
+      <subscription-settings />
+      <hr>
+      <distraction-settings />
+      <hr>
+      <privacy-settings />
+      <hr>
+      <data-settings />
+      <hr>
+      <proxy-settings />
+      <hr>
+      <download-settings v-if="usingElectron" />
+      <hr v-if="usingElectron">
+      <parental-control-settings />
+      <hr>
+      <sponsor-block-settings />
+      <hr v-if="usingElectron">
+      <experimental-settings v-if="usingElectron" />
+      <hr>
+      <password-settings
+        @settingsUnlocked="handleSettingsUnlocked"
+      />
+    </div>
+    <div v-else>
+      <password-dialog
+        @settingsUnlocked="handleSettingsUnlocked"
+      />
+    </div>
   </div>
 </template>
 
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index f70dd7f48526..e66ace19d2bb 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -414,6 +414,16 @@ Settings:
     Experimental Settings: Experimental Settings
     Warning: These settings are experimental, they make cause crashes while enabled. Making backups is highly recommended. Use at your own risk!
     Replace HTTP Cache: Replace HTTP Cache
+  Password Dialog:
+    Password: Password
+    Enter Password To Unlock: Enter password to unlock settings
+    Password Incorrect: Password Incorrect
+    Unlock: Unlock
+  Password Settings:
+    Password Settings: Password Settings
+    Set Password To Prevent Access: Set a password to prevent access to settings
+    Set Password: Set Password
+    Remove Password: Remove Password
 About:
   #On About page
   About: About
@@ -825,3 +835,4 @@ Screenshot Error: Screenshot failed. {error}
 
 Yes: Yes
 No: No
+Ok: Ok

From f33f14268f0533c5ed7a8b4c5c48bd334bd73dbf Mon Sep 17 00:00:00 2001
From: petaded <74797538+petaded@users.noreply.github.com>
Date: Sat, 17 Dec 2022 15:49:44 +0000
Subject: [PATCH 075/301] Option to hide videos from certain channels (#2849)

* add logic to hide channels

* Add new ft-input-tags ui element and use this for channel hiding

* remove unused tooltip code

* Add tooltip to the ft-input-tags and the new setting

* Add spacer between toggle options and ft-flex-box

* Swap to stringify from semicolon + add focus to label

* Simplify the input_tags code + rename setting to channelsHidden

* Fix issue shown by linter

* Recentralize input button + fix tooltip for small windows

* Improve accessiblity

* fix hiding playlist when channel ID entered

* pass tag directly to removeTag function

Co-authored-by: petaded <code@zikl.co.uk>
Co-authored-by: petaded <petaded@zikl.co.uk>
---
 .../distraction-settings.js                   | 15 ++++-
 .../distraction-settings.vue                  | 11 ++++
 .../ft-input-tags/ft-input-tags.css           | 50 +++++++++++++++++
 .../components/ft-input-tags/ft-input-tags.js | 55 +++++++++++++++++++
 .../ft-input-tags/ft-input-tags.vue           | 39 +++++++++++++
 src/renderer/components/ft-input/ft-input.css |  6 ++
 src/renderer/components/ft-input/ft-input.js  | 35 ++++++++----
 src/renderer/components/ft-input/ft-input.vue |  6 +-
 .../ft-list-lazy-wrapper.js                   | 23 ++++++++
 .../ft-settings-section.sass                  |  6 +-
 src/renderer/store/modules/settings.js        |  1 +
 static/locales/en-US.yaml                     |  5 ++
 12 files changed, 235 insertions(+), 17 deletions(-)
 create mode 100644 src/renderer/components/ft-input-tags/ft-input-tags.css
 create mode 100644 src/renderer/components/ft-input-tags/ft-input-tags.js
 create mode 100644 src/renderer/components/ft-input-tags/ft-input-tags.vue

diff --git a/src/renderer/components/distraction-settings/distraction-settings.js b/src/renderer/components/distraction-settings/distraction-settings.js
index 07fd89d1b9bd..90870b5b3828 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.js
+++ b/src/renderer/components/distraction-settings/distraction-settings.js
@@ -2,12 +2,16 @@ import Vue from 'vue'
 import { mapActions } from 'vuex'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
+import FtInputTags from '../../components/ft-input-tags/ft-input-tags.vue'
+import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 
 export default Vue.extend({
   name: 'PlayerSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
-    'ft-toggle-switch': FtToggleSwitch
+    'ft-toggle-switch': FtToggleSwitch,
+    'ft-input-tags': FtInputTags,
+    'ft-flex-box': FtFlexBox
   },
   computed: {
     hideVideoViews: function () {
@@ -60,6 +64,9 @@ export default Vue.extend({
     },
     hideChapters: function () {
       return this.$store.getters.getHideChapters
+    },
+    channelsHidden: function () {
+      return JSON.parse(this.$store.getters.getChannelsHidden)
     }
   },
   methods: {
@@ -70,6 +77,9 @@ export default Vue.extend({
 
       this.updateHideRecommendedVideos(value)
     },
+    handleChannelsHidden: function(value) {
+      this.updateChannelsHidden(JSON.stringify(value))
+    },
 
     ...mapActions([
       'updateHideVideoViews',
@@ -89,7 +99,8 @@ export default Vue.extend({
       'updateHideLiveStreams',
       'updateHideUpcomingPremieres',
       'updateHideSharingActions',
-      'updateHideChapters'
+      'updateHideChapters',
+      'updateChannelsHidden'
     ])
   }
 })
diff --git a/src/renderer/components/distraction-settings/distraction-settings.vue b/src/renderer/components/distraction-settings/distraction-settings.vue
index 76f73f53a0f6..b800757296d3 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.vue
+++ b/src/renderer/components/distraction-settings/distraction-settings.vue
@@ -104,6 +104,17 @@
         />
       </div>
     </div>
+    <br>
+    <ft-flex-box>
+      <ft-input-tags
+        :label="$t('Settings.Distraction Free Settings.Hide Channels')"
+        :placeholder="$t('Settings.Distraction Free Settings.Hide Channels Placeholder')"
+        :show-action-button="true"
+        :tag-list="channelsHidden"
+        :tooltip="$t('Tooltips.Distraction Free Settings.Hide Channels')"
+        @change="handleChannelsHidden"
+      />
+    </ft-flex-box>
   </ft-settings-section>
 </template>
 
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.css b/src/renderer/components/ft-input-tags/ft-input-tags.css
new file mode 100644
index 000000000000..4e77b4ba96f5
--- /dev/null
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.css
@@ -0,0 +1,50 @@
+.ft-input-tags-component {
+  position: relative;
+  background-color: var(--bg-color);
+  padding: 20px;
+  border-radius: 5px;
+  display: block;
+  width: 60%;
+}
+
+.ft-tag-box ul {
+  overflow: auto;
+  display: block;
+  padding: 0;
+  margin: 0;
+}
+
+.ft-tag-box li {
+  list-style: none;
+  background-color: var(--card-bg-color);
+  margin: 5px;
+  border-radius: 5px;
+  display:flex;
+  float: left;
+}
+
+.ft-tag-box li>label {
+  padding-top: 10px;
+  padding-bottom: 10px;
+  padding-left: 10px;
+  overflow-wrap: break-word;
+  word-wrap: break-word;
+  word-break: break-all;
+  hyphens: auto;
+}
+
+
+.removeTagButton {
+  color: var(--primary-text-color);
+  opacity: 0.5;
+  padding: 10px;
+}
+
+.removeTagButton:hover {
+  cursor: pointer;
+}
+
+:deep(.ft-input-component .ft-input) {
+  margin-top: 10px;
+}
+
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.js b/src/renderer/components/ft-input-tags/ft-input-tags.js
new file mode 100644
index 000000000000..7e4f2b6f39b6
--- /dev/null
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.js
@@ -0,0 +1,55 @@
+import Vue from 'vue'
+import FtInput from '../ft-input/ft-input.vue'
+import FtTooltip from '../ft-tooltip/ft-tooltip.vue'
+
+export default Vue.extend({
+  name: 'FtInputTags',
+  components: {
+    'ft-input': FtInput,
+    'ft-tooltip': FtTooltip
+  },
+  props: {
+    placeholder: {
+      type: String,
+      required: true
+    },
+    label: {
+      type: String,
+      required: true
+    },
+    showActionButton: {
+      type: Boolean,
+      default: true
+    },
+    tagList: {
+      type: Array,
+      default: () => { return [] }
+    },
+    tooltip: {
+      type: String,
+      default: ''
+    }
+  },
+  methods: {
+    updateTags: function (text, e) {
+      // text entered add tag and update tag list
+      if (!this.tagList.includes(text.trim())) {
+        const newList = this.tagList.slice(0)
+        newList.push(text.trim())
+        this.$emit('change', newList)
+      }
+      // clear input box
+      this.$refs.childinput.handleClearTextClick()
+    },
+    removeTag: function (tag) {
+      // Remove tag from list
+      const tagName = tag.trim()
+      if (this.tagList.includes(tagName)) {
+        const newList = this.tagList.slice(0)
+        const index = newList.indexOf(tagName)
+        newList.splice(index, 1)
+        this.$emit('change', newList)
+      }
+    }
+  }
+})
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.vue b/src/renderer/components/ft-input-tags/ft-input-tags.vue
new file mode 100644
index 000000000000..544fc4ba12dc
--- /dev/null
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.vue
@@ -0,0 +1,39 @@
+<template>
+  <div
+    class="ft-input-tags-component"
+  >
+    <ft-input
+      ref="childinput"
+      :placeholder="placeholder"
+      :label="label"
+      :show-label="true"
+      :tooltip="tooltip"
+      :show-action-button="showActionButton"
+      :select-on-focus="true"
+      :force-action-button-icon-name="['fas', 'arrow-right']"
+      @click="updateTags"
+    />
+
+    <div class="ft-tag-box">
+      <ul>
+        <li
+          v-for="tag in tagList"
+          :key="tag.id"
+        >
+          <label>{{ tag }}</label>
+          <font-awesome-icon
+            :icon="['fas', 'fa-times']"
+            class="removeTagButton"
+            tabindex="0"
+            role="button"
+            @click="removeTag(tag)"
+            @keydown.enter.prevent="removeTag(tag)"
+          />
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script src="./ft-input-tags.js" />
+<style scoped src="./ft-input-tags.css" />
diff --git a/src/renderer/components/ft-input/ft-input.css b/src/renderer/components/ft-input/ft-input.css
index 4cd922c70cf2..b503317de3d8 100644
--- a/src/renderer/components/ft-input/ft-input.css
+++ b/src/renderer/components/ft-input/ft-input.css
@@ -132,6 +132,12 @@
   cursor: pointer;
 }
 
+.inputAction.withLabel {
+  /* If showLabel defined, re-centralize the input button*/
+  top: 34px;
+}
+
+
 .search ::-webkit-calendar-picker-indicator {
   display: none;
 }
diff --git a/src/renderer/components/ft-input/ft-input.js b/src/renderer/components/ft-input/ft-input.js
index 16f67c25e1d2..a03b862367ba 100644
--- a/src/renderer/components/ft-input/ft-input.js
+++ b/src/renderer/components/ft-input/ft-input.js
@@ -17,6 +17,10 @@ export default Vue.extend({
       type: String,
       required: true
     },
+    label: {
+      type: String,
+      default: null
+    },
     value: {
       type: String,
       default: ''
@@ -25,6 +29,10 @@ export default Vue.extend({
       type: Boolean,
       default: true
     },
+    forceActionButtonIconName: {
+      type: Array,
+      default: null
+    },
     showClearTextButton: {
       type: Boolean,
       default: false
@@ -59,6 +67,10 @@ export default Vue.extend({
     }
   },
   data: function () {
+    let actionIcon = ['fas', 'search']
+    if (this.forceActionButtonIconName !== null) {
+      actionIcon = this.forceActionButtonIconName
+    }
     return {
       id: '',
       inputData: '',
@@ -72,7 +84,7 @@ export default Vue.extend({
       // As the text input box should be empty
       clearTextButtonExisting: false,
       clearTextButtonVisible: false,
-      actionButtonIconName: ['fas', 'search']
+      actionButtonIconName: actionIcon
     }
   },
   computed: {
@@ -152,7 +164,7 @@ export default Vue.extend({
       // Only need to update icon if visible
       if (!this.showActionButton) { return }
 
-      if (!this.inputDataPresent) {
+      if (!this.inputDataPresent && this.forceActionButtonIconName === null) {
         // Change back to default icon if text is blank
         this.actionButtonIconName = ['fas', 'search']
         return
@@ -180,18 +192,21 @@ export default Vue.extend({
               // isYoutubeLink is already `false`
             }
           }
-
-          if (isYoutubeLink) {
-            // Go to URL (i.e. Video/Playlist/Channel
-            this.actionButtonIconName = ['fas', 'arrow-right']
-          } else {
-            // Search with text
-            this.actionButtonIconName = ['fas', 'search']
+          if (this.forceActionButtonIconName === null) {
+            if (isYoutubeLink) {
+              // Go to URL (i.e. Video/Playlist/Channel
+              this.actionButtonIconName = ['fas', 'arrow-right']
+            } else {
+              // Search with text
+              this.actionButtonIconName = ['fas', 'search']
+            }
           }
         })
       } catch (ex) {
         // On exception, consider text as invalid URL
-        this.actionButtonIconName = ['fas', 'search']
+        if (this.forceActionButtonIconName === null) {
+          this.actionButtonIconName = ['fas', 'search']
+        }
         // Rethrow exception
         throw ex
       }
diff --git a/src/renderer/components/ft-input/ft-input.vue b/src/renderer/components/ft-input/ft-input.vue
index af244a40f347..d1408416c8f8 100644
--- a/src/renderer/components/ft-input/ft-input.vue
+++ b/src/renderer/components/ft-input/ft-input.vue
@@ -14,8 +14,9 @@
     <label
       v-if="showLabel"
       :for="id"
+      class="selectLabel"
     >
-      {{ placeholder }}
+      {{ label || placeholder }}
       <ft-tooltip
         v-if="tooltip !== ''"
         class="selectTooltip"
@@ -57,7 +58,8 @@
       :icon="actionButtonIconName"
       class="inputAction"
       :class="{
-        enabled: inputDataPresent
+        enabled: inputDataPresent,
+        withLabel: showLabel
       }"
       @click="handleClick"
     />
diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
index a664c3fe258f..5d13c0a56088 100644
--- a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
+++ b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
@@ -37,6 +37,9 @@ export default Vue.extend({
     hideLiveStreams: function() {
       return this.$store.getters.getHideLiveStreams
     },
+    channelsHidden: function() {
+      return JSON.parse(this.$store.getters.getChannelsHidden)
+    },
     hideUpcomingPremieres: function () {
       return this.$store.getters.getHideUpcomingPremieres
     }
@@ -46,6 +49,11 @@ export default Vue.extend({
       this.visible = visible
     },
 
+    /**
+     *  Show or Hide results in the list
+     *
+     * @return {bool} false to hide the video, true to show it
+     */
     showResult: function (data) {
       if (!data.type) {
         return false
@@ -66,8 +74,23 @@ export default Vue.extend({
           // hide upcoming
           return false
         }
+        if (this.channelsHidden.includes(data.authorId) || this.channelsHidden.includes(data.author)) {
+          // hide videos by author
+          return false
+        }
+      } else if (data.type === 'channel') {
+        if (this.channelsHidden.includes(data.channelID) || this.channelsHidden.includes(data.name)) {
+          // hide channels by author
+          return false
+        }
+      } else if (data.type === 'playlist') {
+        if (this.channelsHidden.includes(data.authorId) || this.channelsHidden.includes(data.author)) {
+          // hide playlists by author
+          return false
+        }
       }
       return true
     }
+
   }
 })
diff --git a/src/renderer/components/ft-settings-section/ft-settings-section.sass b/src/renderer/components/ft-settings-section/ft-settings-section.sass
index c41023fa0fdd..78e4963c6160 100644
--- a/src/renderer/components/ft-settings-section/ft-settings-section.sass
+++ b/src/renderer/components/ft-settings-section/ft-settings-section.sass
@@ -61,15 +61,15 @@
     justify-content: flex-start
 
 @media only screen and (max-width: 680px)
-  .settingsSection 
-    > div 
+  .settingsSection
+    > div
       :deep(.text.bottom)
         left: -85px
     :deep(.switch-ctn.containsTooltip)
       left: -10px
       margin-right: 5px
       padding: 0px 10px 0px 10px
-    :not(.select)
+    :not(.select, .selectLabel)
       > :deep(.tooltip)
         display: inline-block
         position: absolute
diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
index 9e4873f33ad5..a5003c3fb9ee 100644
--- a/src/renderer/store/modules/settings.js
+++ b/src/renderer/store/modules/settings.js
@@ -195,6 +195,7 @@ const state = {
   hideChannelSubscriptions: false,
   hideCommentLikes: false,
   hideComments: false,
+  channelsHidden: '[]',
   hideVideoDescription: false,
   hideLiveChat: false,
   hideLiveStreams: false,
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index e66ace19d2bb..23ae156ad5af 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -326,6 +326,8 @@ Settings:
     Hide Upcoming Premieres: Hide Upcoming Premieres
     Hide Sharing Actions: Hide Sharing Actions
     Hide Chapters: Hide Chapters
+    Hide Channels: Hide Videos From Channels
+    Hide Channels Placeholder: Channel Name or ID
   Data Settings:
     Data Settings: Data Settings
     Select Import Type: Select Import Type
@@ -784,6 +786,9 @@ Tooltips:
     Custom External Player Arguments: Any custom command line arguments, separated by semicolons (';'),
       you want to be passed to the external player.
     DefaultCustomArgumentsTemplate: "(Default: '{defaultCustomArguments}')"
+  Distraction Free Settings:
+    Hide Channels: Enter a channel name or channel ID to hide all videos, playlists and the channel itself from appearing in search or trending.
+       The channel name entered must be a complete match and is case sensitive.
   Subscription Settings:
     Fetch Feeds from RSS: When enabled, FreeTube will use RSS instead of its default
       method for grabbing your subscription feed. RSS is faster and prevents IP blocking,

From 1f921d4876f3207127129fe4133b3e5cf40ad68e Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Sat, 17 Dec 2022 14:33:42 +0000
Subject: [PATCH 076/301] Translated using Weblate (German)

Currently translated at 100.0% (648 of 648 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/de/
---
 static/locales/de-DE.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/static/locales/de-DE.yaml b/static/locales/de-DE.yaml
index 0052f142bc6c..41d4d59aa15a 100644
--- a/static/locales/de-DE.yaml
+++ b/static/locales/de-DE.yaml
@@ -455,6 +455,17 @@ Settings:
       wenn sie aktiviert sind. Es wird dringend empfohlen, Sicherungskopien zu erstellen.
       Verwendung auf eigene Gefahr!
     Replace HTTP Cache: HTTP-Cache ersetzen
+  Password Dialog:
+    Password: Passwort
+    Enter Password To Unlock: Gib das Passwort ein, um die Einstellungen zu entsperren
+    Password Incorrect: Passwort falsch
+    Unlock: Entsperren
+  Password Settings:
+    Remove Password: Passwort entfernen
+    Password Settings: Passworteinstellungen
+    Set Password To Prevent Access: Passwort festlegen, um den Zugriff auf die Einstellungen
+      zu verhindern
+    Set Password: Passwort festlegen
 About:
   #On About page
   About: Über
@@ -971,3 +982,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Kapitelliste ausgeblendet,
     aktuelles Kapitel: {chapterName}'
 Preferences: Einstellungen
+Ok: Ok

From ca232744f2bf87d35625dc47e95a42107ebec53f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20W=C3=B3jcicki?= <terkaz@gmx.com>
Date: Sat, 17 Dec 2022 15:46:32 +0000
Subject: [PATCH 077/301] Translated using Weblate (Polish)

Currently translated at 100.0% (648 of 648 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pl/
---
 static/locales/pl.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml
index c5b1bcce5d0e..7300f620f09f 100644
--- a/static/locales/pl.yaml
+++ b/static/locales/pl.yaml
@@ -454,6 +454,16 @@ Settings:
     Experimental Settings: Ustawienia eksperymentalne
     Warning: Te ustawienia są w fazie testów i po włączeniu mogą spowodować wywalenie
       się programu. Zalecane jest stworzenie kopii zapasowej. Używaj na własne ryzyko!
+  Password Dialog:
+    Unlock: Odblokuj
+    Enter Password To Unlock: Wprowadź hasło, by odblokować ustawienia
+    Password Incorrect: Niepoprawne hasło
+    Password: Hasło
+  Password Settings:
+    Password Settings: Ustawienia hasła
+    Set Password To Prevent Access: Ustaw hasło, aby zabezpieczyć dostęp do ustawień
+    Set Password: Ustaw hasło
+    Remove Password: Usuń hasło
 About:
   #On About page
   About: 'O projekcie'
@@ -958,3 +968,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Spis treści schowany, obecny
     rozdział: {chapterName}'
 Preferences: Preferencje
+Ok: Ok

From 8e600747651bfb506105f146ec84c0a21310b458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Sat, 17 Dec 2022 15:00:40 +0000
Subject: [PATCH 078/301] Translated using Weblate (Turkish)

Currently translated at 100.0% (648 of 648 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/tr/
---
 static/locales/tr.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/static/locales/tr.yaml b/static/locales/tr.yaml
index 8323bb32243b..f8fe5f35574d 100644
--- a/static/locales/tr.yaml
+++ b/static/locales/tr.yaml
@@ -448,6 +448,16 @@ Settings:
       Yedekleme yapılması şiddetle tavsiye edilir. Kullanmanız durumunda risk size
       aittir!
     Experimental Settings: Deneysel Ayarlar
+  Password Dialog:
+    Password Incorrect: Parola Yanlış
+    Unlock: Kilidi aç
+    Password: Parola
+    Enter Password To Unlock: Ayarların kilidini açmak için parolayı girin
+  Password Settings:
+    Password Settings: Parola Ayarları
+    Set Password To Prevent Access: Ayarlara erişimi engellemek için bir parola belirleyin
+    Remove Password: Parolayı Kaldır
+    Set Password: Parola Ayarla
 About:
   #On About page
   About: 'Hakkında'
@@ -941,3 +951,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Bölüm listesi gizli, geçerli
     bölüm: {chapterName}'
 Preferences: Tercihler
+Ok: Tamam

From 6b63feaffb6c1de30831abff774d3701db2ae4bf Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Sat, 17 Dec 2022 15:15:44 +0000
Subject: [PATCH 079/301] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (648 of 648 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/uk/
---
 static/locales/uk.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/static/locales/uk.yaml b/static/locales/uk.yaml
index 15216e949424..46d84c092d37 100644
--- a/static/locales/uk.yaml
+++ b/static/locales/uk.yaml
@@ -440,6 +440,16 @@ Settings:
     Experimental Settings: Експериментальні налаштування
     Warning: Ці налаштування експериментальні, їхнє ввімкнення може призводити до
       збоїв. Радимо робити резервні копії. Використовуйте на свій страх і ризик!
+  Password Dialog:
+    Enter Password To Unlock: Введіть пароль, щоб розблокувати налаштування
+    Unlock: Розблокувати
+    Password Incorrect: Пароль неправильний
+    Password: Пароль
+  Password Settings:
+    Password Settings: Налаштування пароля
+    Set Password: Установити пароль
+    Remove Password: Вилучити пароль
+    Set Password To Prevent Access: Встановіть пароль, щоб запобігти доступу до налаштувань
 About:
   #On About page
   About: 'Про'
@@ -919,3 +929,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Список розділів схований,
     поточний розділ: {chapterName}'
 Preferences: Налаштування
+Ok: Гаразд

From 00e4d2f3b05b6e4858a0db64ec5fa65e33fa85e7 Mon Sep 17 00:00:00 2001
From: Axus Wizix <axus.wizix@mail.ru>
Date: Sat, 17 Dec 2022 16:43:07 +0000
Subject: [PATCH 080/301] Translated using Weblate (Russian)

Currently translated at 99.8% (650 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 7b40650d413e..cab66d5b2978 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -388,6 +388,7 @@ Settings:
     Hide Video Description: Скрыть описание видео
     Hide Chapters: Скрыть разделы
     Hide Upcoming Premieres: Скрыть предстоящие премьеры
+    Hide Channels Placeholder: Имя или идентификатор канала
   The app needs to restart for changes to take effect. Restart and apply change?: Чтобы
     изменения вступили в силу, необходимо перезапустить приложение. Перезапустить
     и применить изменения?
@@ -447,6 +448,17 @@ Settings:
     Replace HTTP Cache: Заменить HTTP-кэш
     Warning: Эти настройки являются пробными, они вызывают сбои при включении. Желательно
       сделать резервные копии. Используйте на своё усмотрение!
+  Password Dialog:
+    Password: Пароль
+    Password Incorrect: Неверный пароль
+    Unlock: Разблокировать
+    Enter Password To Unlock: Введите пароль для разблокировки настроек
+  Password Settings:
+    Password Settings: Настройка пароля
+    Set Password To Prevent Access: Установите пароль для предотвращения доступа к
+      настройкам
+    Set Password: Установить пароль
+    Remove Password: Удалить пароль
 About:
   #On About page
   About: 'О приложении'
@@ -891,6 +903,10 @@ Tooltips:
   Experimental Settings:
     Replace HTTP Cache: Отключает дисковый HTTP-кэш Electron и включает пользовательский
       кэш изображений в памяти. Приведет к увеличению использования оперативной памяти.
+  Distraction Free Settings:
+    Hide Channels: Введите название канала или его идентификатор, чтобы скрыть все
+      видео, плейлисты и сам канал от показа в поиске или трендах. Введенное название
+      канала должно полностью совпадать и учитывать регистр.
 More: Больше
 Playing Next Video Interval: Воспроизведение следующего видео без задержки. Нажмите
   для отмены. | Воспроизведение следующего видео через {nextVideoInterval} сек. Нажмите
@@ -942,3 +958,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Список разделов скрыт,
     текущий раздел: {chapterName}'
 Preferences: Предпочтения
+Ok: Хорошо

From e7194cbafcf393874bea3f8294b65fc5ead7ce19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20W=C3=B3jcicki?= <terkaz@gmx.com>
Date: Sat, 17 Dec 2022 16:11:58 +0000
Subject: [PATCH 081/301] Translated using Weblate (Polish)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pl/
---
 static/locales/pl.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml
index 7300f620f09f..e5eeb5033c87 100644
--- a/static/locales/pl.yaml
+++ b/static/locales/pl.yaml
@@ -394,6 +394,8 @@ Settings:
     Hide Live Streams: Schowaj transmisje na żywo
     Hide Chapters: Schowaj rozdziały
     Hide Upcoming Premieres: Schowaj nadchodzące premiery
+    Hide Channels: Schowaj filmy z kanałów
+    Hide Channels Placeholder: Nazwa albo ID kanału
   The app needs to restart for changes to take effect. Restart and apply change?: Aplikacja
     musi zostać ponownie uruchomiona, aby zmiany zostały wprowadzone. Uruchomić ponownie
     i zastosować zmiany?
@@ -913,6 +915,10 @@ Tooltips:
     Replace HTTP Cache: Wyłącza opartą na przestrzeni dyskowej pamięć podręczną HTTP
       Electrona i włącza własny obraz pamięci podręcznej wewnątrz pamięci RAM. Spowoduje
       to większe użycie pamięci RAM.
+  Distraction Free Settings:
+    Hide Channels: Wprowadź nazwę albo ID kanału, aby schować wszystkie filmy i playlisty
+      tego kanału, oraz sam kanał z wyszukiwań, oraz z zakładki „Na czasie”. Nazwa
+      kanału musi być dokładnym dopasowaniem, z uwzględnieniem wielkości liter.
 Playing Next Video Interval: Odtwarzanie kolejnego filmu już za chwilę. Wciśnij aby
   przerwać. | Odtwarzanie kolejnego filmu za {nextVideoInterval} sekundę. Wciśnij
   aby przerwać. | Odtwarzanie kolejnego filmu za {nextVideoInterval} sekund. Wciśnij

From 1ef355fa8d186fe197a235d05d84000cf670925c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Sat, 17 Dec 2022 16:58:15 +0000
Subject: [PATCH 082/301] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 82.0% (534 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/nb_NO/
---
 static/locales/nb_NO.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/static/locales/nb_NO.yaml b/static/locales/nb_NO.yaml
index dbe1aa7818d1..5f0dfaec5b89 100644
--- a/static/locales/nb_NO.yaml
+++ b/static/locales/nb_NO.yaml
@@ -190,6 +190,7 @@ Settings:
     Disable Smooth Scrolling: Slå av myk rulling
     Expand Side Bar by Default: Utvidet sidefelt som forvalg
     Hide Side Bar Labels: Skjul sidefeltsetiketter
+    Hide FreeTube Header Logo: Skjul FreeTube-tittellogo
   Player Settings:
     Player Settings: 'Videoavspillingsinnstillinger'
     Force Local Backend for Legacy Formats: 'Påtving lokal bakende for forelede formater'
@@ -354,6 +355,8 @@ Settings:
     Hide Video Views: Skjul videovisninger
     Hide Live Chat: Skjul sanntidssludring
     Hide Playlists: Skjul spillelister
+    Hide Comments: Skjul kommentarer
+    Hide Live Streams: "\n"
   The app needs to restart for changes to take effect. Restart and apply change?: Start
     programmet på ny for å ta i bruk endringene?
   SponsorBlock Settings:
@@ -817,3 +820,5 @@ Chapters:
   Chapters: Kapitler
 Screenshot Success: Lagre skjermavbildning som «{filePath}»
 Screenshot Error: Skjermavbildning mislyktes. {error}
+Ok: OK
+Preferences: Innstillinger

From 7d7ae6f784fc8b51cbaf0f7163620c4053d54dca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Sat, 17 Dec 2022 16:08:35 +0000
Subject: [PATCH 083/301] Translated using Weblate (Turkish)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/tr/
---
 static/locales/tr.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/static/locales/tr.yaml b/static/locales/tr.yaml
index f8fe5f35574d..3f2475df1e2e 100644
--- a/static/locales/tr.yaml
+++ b/static/locales/tr.yaml
@@ -389,6 +389,8 @@ Settings:
     Hide Comments: Yorumları Gizle
     Hide Chapters: Bölümleri Gizle
     Hide Upcoming Premieres: Yaklaşan İlk Gösterimleri Gizle
+    Hide Channels Placeholder: Kanal Adı veya Kimliği
+    Hide Channels: Kanallardan Videoları Gizle
   The app needs to restart for changes to take effect. Restart and apply change?: Değişikliklerin
     etkili olması için uygulamanın yeniden başlatılması gerekiyor. Yeniden başlatılsın
     ve değişiklikler uygulansın mı?
@@ -897,6 +899,10 @@ Tooltips:
     Replace HTTP Cache: Electron'un disk tabanlı HTTP önbelleğini devre dışı bırakır
       ve özel bir bellek içi resim önbelleğini etkinleştirir. RAM kullanımının artmasına
       neden olacaktır.
+  Distraction Free Settings:
+    Hide Channels: Tüm videoların, oynatma listelerinin ve kanalın kendisinin arama
+      veya öne çıkanlarda görünmesini engellemek için bir kanal adı veya kanal kimliği
+      girin. Girilen kanal adı tam olarak eşleşmelidir ve büyük/küçük harfe duyarlıdır.
 Playing Next Video Interval: Sonraki video hemen oynatılıyor. İptal etmek için tıklayın.
   | Sonraki video {nextVideoInterval} saniye içinde oynatılıyor. İptal etmek için
   tıklayın. | Sonraki video {nextVideoInterval} saniye içinde oynatılıyor. İptal etmek

From 580377b54aca4d08321f1c190ab8ed0468074d26 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sat, 17 Dec 2022 16:13:33 +0000
Subject: [PATCH 084/301] Translated using Weblate (Hebrew)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/he/
---
 static/locales/he.yaml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/static/locales/he.yaml b/static/locales/he.yaml
index 26f40960a6fe..b0dcda992671 100644
--- a/static/locales/he.yaml
+++ b/static/locales/he.yaml
@@ -377,6 +377,8 @@ Settings:
     Hide Video Description: הסתרת תיאור וידאו
     Hide Chapters: הסתרת פרקים
     Hide Upcoming Premieres: הסתרת בכורות קרובות
+    Hide Channels: הסתרת סרטונים מהערוצים
+    Hide Channels Placeholder: שם או מזהה ערוץ
   The app needs to restart for changes to take effect. Restart and apply change?: צריך
     להפעיל את היישומון מחדש כדי שהשינויים ייכנסו לתוקף. להפעיל מחדש ולהחיל את השינוי?
   Proxy Settings:
@@ -434,6 +436,16 @@ Settings:
     Replace HTTP Cache: החלפת מטמון HTTP
     Warning: אלו הגדרות ניסיוניות, הן עלולות לגרום לקריסת המערכת שהן פעילות. מומלץ
       מאוד לגבות. השימוש הוא על אחריותך בלבד!
+  Password Dialog:
+    Password Incorrect: הסיסמה שגויה
+    Unlock: שחרור
+    Password: סיסמה
+    Enter Password To Unlock: נא למלא סיסמה כדי לשחרר את ההגדרות
+  Password Settings:
+    Password Settings: הגדרות סיסמה
+    Set Password: הגדרת סיסמה
+    Remove Password: הסרת סיסמה
+    Set Password To Prevent Access: יש להגדיר סיסמה כדי למנוע גישה להגדרות
 About:
   #On About page
   About: 'על אודות'
@@ -854,6 +866,10 @@ Tooltips:
   Experimental Settings:
     Replace HTTP Cache: משבית את מטמון ה־HTTP מבוסס הכונן ומפעיל מטמון תמונות מותאם
       אישית בזיכרון. יגדיל את צריכת הזיכרון (RAM).
+  Distraction Free Settings:
+    Hide Channels: יש למלא את שם או מזהה הערוץ כדי להסתיר את כל הסרטונים, רשימות הנגינה
+      ואת הערוץ עצמו כך שלא יופיע בחיפוש או במובילים. שם הערוץ שמילאת צריך להיות תואם
+      במלואו ותואם מבחינת רישיות (אותיות גדולות/קטנות).
 More: עוד
 Open New Window: פתיחת חלון חדש
 Search Bar:
@@ -902,3 +918,4 @@ Clipboard:
   Cannot access clipboard without a secure connection: לא ניתן לגשת ללוח הגזירים ללא
     חיבור מאובטח
 Preferences: העדפות
+Ok: אישור

From 6138208fd3cbf56c359fc89bf3901190733055da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9A=D0=BE=D1=82=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B1=D0=B0=D0=B9?= <artemkotlubai@yandex.ru>
Date: Sat, 17 Dec 2022 18:56:48 +0000
Subject: [PATCH 085/301] Translated using Weblate (Russian)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index cab66d5b2978..760c133b4adf 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -388,7 +388,8 @@ Settings:
     Hide Video Description: Скрыть описание видео
     Hide Chapters: Скрыть разделы
     Hide Upcoming Premieres: Скрыть предстоящие премьеры
-    Hide Channels Placeholder: Имя или идентификатор канала
+    Hide Channels Placeholder: Название или идентификатор канала
+    Hide Channels: Скрыть видео с каналов
   The app needs to restart for changes to take effect. Restart and apply change?: Чтобы
     изменения вступили в силу, необходимо перезапустить приложение. Перезапустить
     и применить изменения?
@@ -905,7 +906,7 @@ Tooltips:
       кэш изображений в памяти. Приведет к увеличению использования оперативной памяти.
   Distraction Free Settings:
     Hide Channels: Введите название канала или его идентификатор, чтобы скрыть все
-      видео, плейлисты и сам канал от показа в поиске или трендах. Введенное название
+      видео, подборки и сам канал от показа в поиске или трендах. Введённое название
       канала должно полностью совпадать и учитывать регистр.
 More: Больше
 Playing Next Video Interval: Воспроизведение следующего видео без задержки. Нажмите

From b69d5a07a67b6856eff9536e845b661fc8602988 Mon Sep 17 00:00:00 2001
From: ovari <ovari123@zoho.com>
Date: Sat, 17 Dec 2022 19:03:37 +0000
Subject: [PATCH 086/301] Translated using Weblate (Hungarian)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/hu/
---
 static/locales/hu.yaml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/static/locales/hu.yaml b/static/locales/hu.yaml
index 1aabe9d564ae..d104aee795a0 100644
--- a/static/locales/hu.yaml
+++ b/static/locales/hu.yaml
@@ -395,6 +395,8 @@ Settings:
     Hide Sharing Actions: Megosztási műveletek elrejtése
     Hide Chapters: Fejezetek elrejtése
     Hide Upcoming Premieres: Közelgő első előadások elrejtése
+    Hide Channels: Videók elrejtése a csatornákból
+    Hide Channels Placeholder: Csatorna neve vagy azonosítója
   The app needs to restart for changes to take effect. Restart and apply change?: Az
     alkalmazásnak újra kell indulnia, hogy a változtatások életbe lépjenek. Indítsa
     újra és alkalmazza a módosítást?
@@ -455,6 +457,16 @@ Settings:
     Warning: Ezek a beállítások kísérleti jellegűek, összeomlást okoznak, ha engedélyezve
       vannak. Erősen ajánlott biztonsági mentéseket készíteni. Használat csak saját
       felelősségre!
+  Password Dialog:
+    Password Incorrect: Helytelen jelszó
+    Unlock: Zárolás feloldása
+    Enter Password To Unlock: Jelszó megadása a beállítások feloldásához
+    Password: Jelszó
+  Password Settings:
+    Password Settings: Jelszóbeállítások
+    Set Password To Prevent Access: Beállítások jelszó megadása
+    Set Password: Jelszó megadása
+    Remove Password: Jelszó eltávolítása
 About:
   #On About page
   About: 'Névjegy'
@@ -887,6 +899,11 @@ Tooltips:
   Experimental Settings:
     Replace HTTP Cache: Letiltja az Electron lemez alapú HTTP-gyorsítótárát, és engedélyezi
       az egyéni memórián belüli képgyorsítótárat. Megnövekedett RAM-használathoz vezet.
+  Distraction Free Settings:
+    Hide Channels: Adja meg a csatorna nevét vagy csatornaazonosítóját, hogy elrejtse
+      az összes videót, lejátszási listát és magát a csatornát, hogy ne jelenjen meg
+      a keresésben vagy a népszerűségben. A megadott csatornanévnek teljes egyezésnek
+      kell lennie, és megkülönbözteti a kis- és nagybetűket.
 Playing Next Video Interval: A következő videó lejátszása folyamatban van. Kattintson
   a törléshez. | A következő videó lejátszása {nextVideoInterval} másodperc múlva
   történik. Kattintson a törléshez. | A következő videó lejátszása {nextVideoInterval}
@@ -937,3 +954,4 @@ Clipboard:
   Copy failed: A vágólapra másolás nem sikerült
 Screenshot Error: A képernyőkép nem sikerült. {error}
 Preferences: Beállítások
+Ok: Rendben

From 8ce5c6a3077004ae8e3c748da832cdbb42bf2dce Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Sat, 17 Dec 2022 19:52:04 +0000
Subject: [PATCH 087/301] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/uk/
---
 static/locales/uk.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/static/locales/uk.yaml b/static/locales/uk.yaml
index 46d84c092d37..df751281753c 100644
--- a/static/locales/uk.yaml
+++ b/static/locales/uk.yaml
@@ -316,6 +316,8 @@ Settings:
     Hide Live Streams: Сховати прямі трансляції
     Hide Chapters: Сховати розділи
     Hide Upcoming Premieres: Сховати майбутні прем'єри
+    Hide Channels: Сховати відео з каналів
+    Hide Channels Placeholder: Назва або ID каналу
   Data Settings:
     Data Settings: 'Налаштування даних'
     Select Import Type: 'Оберіть тип імпорту'
@@ -852,6 +854,10 @@ Tooltips:
   Experimental Settings:
     Replace HTTP Cache: Вимикає дисковий HTTP-кеш Electron і вмикає власний кеш зображень
       у пам'яті. Призведе до збільшення використання оперативної пам'яті.
+  Distraction Free Settings:
+    Hide Channels: Введіть назву або ID каналу, щоб сховати всі відео, списки відтворення
+      та сам канал від появи в пошуку або в тренді. Введена назва каналу повинна повністю
+      збігатися і чутлива до регістру.
 Local API Error (Click to copy): 'Помилка локального API (натисніть, щоб скопіювати)'
 Invidious API Error (Click to copy): 'Помилка Invidious API (натисніть, щоб скопіювати)'
 Falling back to Invidious API: 'Повернення до API Invidious'

From 285fea396a9f2bf394758f35dbf0b56daf60e3ca Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Sat, 17 Dec 2022 22:45:59 +0000
Subject: [PATCH 088/301] Translated using Weblate (Arabic)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ar/
---
 static/locales/ar.yaml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/static/locales/ar.yaml b/static/locales/ar.yaml
index ffb7d0a2775c..87c6175f09e4 100644
--- a/static/locales/ar.yaml
+++ b/static/locales/ar.yaml
@@ -381,6 +381,8 @@ Settings:
     Hide Live Streams: إخفاء البث المباشر
     Hide Chapters: إخفاء الفصول
     Hide Upcoming Premieres: إخفاء العروض الأولى القادمة
+    Hide Channels: إخفاء مقاطع الفيديو من القنوات
+    Hide Channels Placeholder: اسم القناة أو معرفها
   The app needs to restart for changes to take effect. Restart and apply change?: البرنامج
     يحتاج لإعادة التشغيل كي يسري مفعول التغييرات. هل تريد إعادة التشغيل و تطبيق التغييرات؟
   Proxy Settings:
@@ -438,6 +440,16 @@ Settings:
     Experimental Settings: الإعدادات التجريبية
     Warning: هذه الإعدادات تجريبية ، فهي تسبب أعطال أثناء التمكين. يوصى بشدة بعمل
       نسخ احتياطية. استخدام على مسؤوليتك الخاصة!
+  Password Settings:
+    Set Password To Prevent Access: تعيين كلمة مرور لمنع الوصول إلى الإعدادات
+    Remove Password: إزالة كلمة المرور
+    Password Settings: إعدادات كلمة المرور
+    Set Password: ضبط كلمة السر
+  Password Dialog:
+    Password Incorrect: كلمة المرور غير صحيحة
+    Password: كلمة السر
+    Enter Password To Unlock: أدخل كلمة المرور لإلغاء قفل الإعدادات
+    Unlock: الغاء القفل
 About:
   #On About page
   About: 'حول'
@@ -864,6 +876,10 @@ Tooltips:
     Replace HTTP Cache: تعطيل ذاكرة التخزين المؤقت HTTP المستندة إلى قرص Electron
       وتمكين ذاكرة تخزين مؤقت للصور في الذاكرة. سيؤدي إلى زيادة استخدام ذاكرة الوصول
       العشوائي.
+  Distraction Free Settings:
+    Hide Channels: أدخل اسم القناة أو رقم تعريف القناة لإخفاء كل الفيديوهات وقوائم
+      التشغيل والقناة نفسها من الظهور في "بحث Google" أو "المحتوى الرائج". يجب أن
+      يكون اسم القناة الذي تم إدخاله مطابقا تماما وحساسا لحالة الأحرف.
 This video is unavailable because of missing formats. This can happen due to country unavailability.: هذا
   الفيديو غير متاح الآن لعدم وجود ملفات فيديو . هذا قد يكون بسبب أن الفيديو غير متاح
   في بلدك.
@@ -916,3 +932,4 @@ Chapters:
   'Chapters list visible, current chapter: {chapterName}': 'قائمة الفصول المرئية ،
     الفصل الحالي: {sectionName}'
 Preferences: التفضيلات
+Ok: موافق

From 26ddb169fd8f65b3375d780f97d05d25c918d11f Mon Sep 17 00:00:00 2001
From: Eric <hamburger1024@duck.com>
Date: Sun, 18 Dec 2022 03:24:31 +0000
Subject: [PATCH 089/301] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/zh_Hans/
---
 static/locales/zh-CN.yaml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/static/locales/zh-CN.yaml b/static/locales/zh-CN.yaml
index a5d7176eb863..abe103e49560 100644
--- a/static/locales/zh-CN.yaml
+++ b/static/locales/zh-CN.yaml
@@ -354,6 +354,8 @@ Settings:
     Hide Video Description: 隐藏视频描述
     Hide Chapters: 隐藏章节
     Hide Upcoming Premieres: 隐藏即将到来的首映
+    Hide Channels: 隐藏频道中的视频
+    Hide Channels Placeholder: 频道名称或 ID
   The app needs to restart for changes to take effect. Restart and apply change?: 应用需要重启让修改生效。重启以应用修改？
   Proxy Settings:
     Proxy Protocol: 代理协议
@@ -407,6 +409,16 @@ Settings:
     Experimental Settings: 实验性设置
     Warning: 这些设置是实验性的，启用可能导致崩溃。强烈建议进行备份。使用风险自负！
     Replace HTTP Cache: 替换 HTTP 缓存
+  Password Dialog:
+    Password: 密码
+    Enter Password To Unlock: 输入密码解锁设置
+    Password Incorrect: 密码不正确
+    Unlock: 解锁
+  Password Settings:
+    Password Settings: 密码设置
+    Set Password To Prevent Access: 设置密码防止访问设置
+    Set Password: 设置密码
+    Remove Password: 删除密码
 About:
   #On About page
   About: '关于'
@@ -784,6 +796,8 @@ Tooltips:
     Remove Video Meta Files: 启用后，当观看页面关闭时，FreeTube 会自动删除在视频播放时创建的元文件。
   Experimental Settings:
     Replace HTTP Cache: 禁用 Electron 基于磁盘的 HTTP 缓存，启用自定义内存中图像缓存。会增加内存的使用。
+  Distraction Free Settings:
+    Hide Channels: 输入频道名称或频道 ID 以隐藏所有视频、播放列表和频道本身，使其不出现在搜索结果或热门中。 输入的频道名称必须完全匹配，并且区分大小写。
 More: 更多
 Open New Window: 打开新窗口
 Search Bar:
@@ -827,3 +841,4 @@ Chapters:
   'Chapters list visible, current chapter: {chapterName}': 章节列表可见，当前章节：{chapterName}
   'Chapters list hidden, current chapter: {chapterName}': 章节列表隐藏，当前章节：{chapterName}
 Preferences: 选项
+Ok: 好

From 558235faf8bfda396679faaa0b7a6742b6fec865 Mon Sep 17 00:00:00 2001
From: Massimo Pissarello <mapi68@gmail.com>
Date: Sun, 18 Dec 2022 06:08:17 +0000
Subject: [PATCH 090/301] Translated using Weblate (Italian)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/it/
---
 static/locales/it.yaml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/static/locales/it.yaml b/static/locales/it.yaml
index 602d7a4f0da3..6e9fcc49536f 100644
--- a/static/locales/it.yaml
+++ b/static/locales/it.yaml
@@ -399,6 +399,8 @@ Settings:
     Hide Video Description: Nascondi la descrizione del video
     Hide Chapters: Nascondi i capitoli
     Hide Upcoming Premieres: Nascondi le prossime Première
+    Hide Channels: Nascondi i video dai canali
+    Hide Channels Placeholder: Nome o ID del canale
   The app needs to restart for changes to take effect. Restart and apply change?: L'applicazione
     deve essere riavviata per applicare i cambiamenti. Riavvio e applico i cambiamenti
     subito?
@@ -460,6 +462,17 @@ Settings:
     Experimental Settings: Impostazioni sperimentali
     Warning: Queste impostazioni sono sperimentali, causano arresti anomali se abilitate.
       Si consiglia prima di fare un backup. Utilizzare a proprio rischio!
+  Password Dialog:
+    Enter Password To Unlock: Inserisci la password per sbloccare le impostazioni
+    Password Incorrect: Password non corretta
+    Password: Password
+    Unlock: Sblocca
+  Password Settings:
+    Set Password: Imposta password
+    Password Settings: Impostazioni password
+    Set Password To Prevent Access: Imposta una password per impedire l'accesso alle
+      impostazioni
+    Remove Password: Rimuovi password
 About:
   #On About page
   About: 'Informazioni'
@@ -905,6 +918,11 @@ Tooltips:
     Replace HTTP Cache: Disabilita la cache HTTP basata su disco Electron e abilita
       una cache di immagini in memoria personalizzata. Comporta un aumento dell'utilizzo
       della RAM.
+  Distraction Free Settings:
+    Hide Channels: Inserisci il nome o l'ID di un canale per nascondere tutti i video,
+      le playlist e il canale stesso dalla visualizzazione nelle ricerche o nelle
+      tendenze. Il nome del canale inserito deve essere una corrispondenza completa
+      e fa distinzione tra maiuscole e minuscole.
 Playing Next Video Interval: Riproduzione del video successivo tra un attimo. Clicca
   per annullare. | Riproduzione del video successivo tra {nextVideoInterval} secondi.
   Clicca per annullare. | Riproduzione del video successivo tra {nextVideoInterval}
@@ -957,3 +975,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Elenco capitoli nascosto,
     capitolo corrente: {chapterName}'
 Preferences: Preferenze
+Ok: Ok

From 176716483df81c8ea138d0d4d568652fa973f55e Mon Sep 17 00:00:00 2001
From: Dragibus Noir <dragibusnoir@pm.me>
Date: Sun, 18 Dec 2022 10:04:31 +0000
Subject: [PATCH 091/301] Translated using Weblate (French)

Currently translated at 98.7% (643 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/fr/
---
 static/locales/fr-FR.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/static/locales/fr-FR.yaml b/static/locales/fr-FR.yaml
index 76a22b9dac80..08e8335d592e 100644
--- a/static/locales/fr-FR.yaml
+++ b/static/locales/fr-FR.yaml
@@ -468,6 +468,12 @@ Settings:
     Warning: Ces paramètres sont expérimentaux ; ils peuvent provoquer des plantages
       lorsqu'ils sont activés. Il est fortement recommandé de faire des sauvegardes.
       Utilisez-les à vos risques et périls !
+  Password Dialog:
+    Password: Mot de passe
+    Enter Password To Unlock: Entrez le mot de passe pour déverrouiller les paramètres
+    Password Incorrect: Mot de passe incorrect
+  Password Settings:
+    Remove Password: Supprimer le mot de passe
 About:
   #On About page
   About: 'À propos'

From dab4af3ae3ed5195d42f69a44b57cad937fff477 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Sun, 18 Dec 2022 13:43:52 +0000
Subject: [PATCH 092/301] Translated using Weblate (Spanish)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/es/
---
 static/locales/es.yaml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/static/locales/es.yaml b/static/locales/es.yaml
index 9fb95c1e0c47..515e3cc3570e 100644
--- a/static/locales/es.yaml
+++ b/static/locales/es.yaml
@@ -386,6 +386,8 @@ Settings:
     Hide Sharing Actions: Ocultar acciones de uso compartido
     Hide Chapters: Ocultar los capítulos
     Hide Upcoming Premieres: Ocultar los próximos estrenos
+    Hide Channels: Ocultar los vídeos de los canales
+    Hide Channels Placeholder: Nombre o ID del canal
   The app needs to restart for changes to take effect. Restart and apply change?: ¿Quieres
     reiniciar FreeTube ahora para aplicar los cambios?
   Proxy Settings:
@@ -445,6 +447,17 @@ Settings:
       están activadas. Se recomienda hacer copias de seguridad. ¡Utilícelas bajo su
       propio riesgo!
     Replace HTTP Cache: Reemplazar la caché HTTP
+  Password Settings:
+    Password Settings: Configuración de la contraseña
+    Set Password To Prevent Access: Establecer una contraseña para impedir el acceso
+      a los ajustes
+    Set Password: Establecer contraseña
+    Remove Password: Eliminar contraseña
+  Password Dialog:
+    Password: Contraseña
+    Enter Password To Unlock: Introduce la contraseña para desbloquear los ajustes
+    Password Incorrect: Contraseña incorrecta
+    Unlock: Desbloquear
 About:
   #On About page
   About: 'Acerca de'
@@ -890,6 +903,11 @@ Tooltips:
     Replace HTTP Cache: Desactiva la caché HTTP basada en Electron disk y habilite
       una caché para la imagen en la memoria personalizada. Esto aumentará el uso
       de la memoria RAM.
+  Distraction Free Settings:
+    Hide Channels: Introduzca un nombre o ID de canal para ocultar todos los vídeos,
+      listas de reproducción y el propio canal y evitar que aparezcan en las búsquedas
+      o en las tendencias. El nombre del canal introducido debe coincidir completamente
+      y distingue entre mayúsculas y minúsculas.
 More: Más
 Unknown YouTube url type, cannot be opened in app: Tipo de URL desconocido. No se
   puede abrir en la aplicación
@@ -942,3 +960,4 @@ Chapters:
     ocultos, capítulo actual: {nombredelcapítulo}'
   Chapters: Capítulos
 Preferences: Preferencias
+Ok: De acuerdo

From 8e2b8c6bca49a3ca1e985b9d62fa50609a458b74 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Sun, 18 Dec 2022 16:55:45 +0000
Subject: [PATCH 093/301] Translated using Weblate (Galician)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/gl/
---
 static/locales/gl.yaml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/static/locales/gl.yaml b/static/locales/gl.yaml
index 8e7417e16152..c9356fdd28bb 100644
--- a/static/locales/gl.yaml
+++ b/static/locales/gl.yaml
@@ -317,6 +317,8 @@ Settings:
     Hide Comments: Ocultar comentarios
     Hide Chapters: Agochalos capítulos
     Hide Upcoming Premieres: Ocultalas próximas estreas
+    Hide Channels: Ocultalos vídeos das canles
+    Hide Channels Placeholder: Nome ou ID da canle
   Data Settings:
     Data Settings: 'Axustes dos datos'
     Select Import Type: 'Escoller tipo de importación'
@@ -451,6 +453,17 @@ Settings:
       están activadas. É moi recomendable facer copias de seguridade. Useas baixo
       o seu propio risco!
     Replace HTTP Cache: Substitúe a caché HTTP
+  Password Settings:
+    Password Settings: Configuración do contrasinal
+    Set Password To Prevent Access: Establece un contrasinal para impedilo acceso
+      á configuración
+    Set Password: Establecelo contrasinal
+    Remove Password: Eliminar contrasinal
+  Password Dialog:
+    Password: Contrasinal
+    Enter Password To Unlock: Introduce o contrasinal para desbloqueala configuración
+    Password Incorrect: Contrasinal incorrecto
+    Unlock: Desbloquear
 About:
   #On About page
   About: 'Sobre'
@@ -859,6 +872,11 @@ Tooltips:
     Replace HTTP Cache: Desactivouse a caché HTTP baseada no disco de Electrons e
       habilita unha caché das imaxes persoalizadas na memoria. Levará a un aumento
       no uso da RAM.
+  Distraction Free Settings:
+    Hide Channels: Introduce o nome dunha canle ou o ID de canle para ocultar todolos
+      vídeos, listas de reprodución e a propia canle para que non aparezan na busca
+      ou nas tendencias. O nome da canle introducido debe coincidir completamente
+      e distingue entre maiúsculas e minúsculas.
 Local API Error (Click to copy): 'Erro de API local (Preme para copiar)'
 Invidious API Error (Click to copy): 'Erro de API Invidious (Preme para copiar)'
 Falling back to Invidious API: 'Recorrendo á API Invidious'
@@ -933,3 +951,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Lista de capítulos oculta,
     capítulo actual: {chapterName}'
 Screenshot Success: Captura da pantalla gardada como "{filePath}"
+Ok: De acordo

From c4571edb031bc34a7a85f4191de06599c77222c5 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Mon, 19 Dec 2022 01:45:52 +0000
Subject: [PATCH 094/301] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/zh_Hant/
---
 static/locales/zh-TW.yaml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/static/locales/zh-TW.yaml b/static/locales/zh-TW.yaml
index bcdd37d4a074..78e5bd3300d4 100644
--- a/static/locales/zh-TW.yaml
+++ b/static/locales/zh-TW.yaml
@@ -356,6 +356,8 @@ Settings:
     Hide Sharing Actions: 隱藏分享動作
     Hide Chapters: 隱藏章節
     Hide Upcoming Premieres: 隱藏即將到來的首映
+    Hide Channels Placeholder: 頻道名稱或 ID
+    Hide Channels: 隱藏頻道中的影片
   The app needs to restart for changes to take effect. Restart and apply change?: 此變更需要重啟讓修改生效。重啟並且套用變更?
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: 取得網路資訊時發生錯誤。您的代理伺服器設定正確嗎？
@@ -409,6 +411,16 @@ Settings:
     Replace HTTP Cache: 取代 HTTP 快取
     Warning: 這些設定是實驗性的，它們啟用時可能會導致當機。強烈建議做好備份。使用時風險自負！
     Experimental Settings: 實驗設定
+  Password Settings:
+    Set Password To Prevent Access: 設定密碼以防止存取設定
+    Remove Password: 移除密碼
+    Password Settings: 密碼設定
+    Set Password: 設定密碼
+  Password Dialog:
+    Password: 密碼
+    Enter Password To Unlock: 輸入密碼以解鎖設定
+    Password Incorrect: 密碼不正確
+    Unlock: 解鎖
 About:
   #On About page
   About: '關於'
@@ -796,6 +808,8 @@ Tooltips:
     DefaultCustomArgumentsTemplate: （預設：'{defaultCustomArguments}'）
   Experimental Settings:
     Replace HTTP Cache: 停用 Electron 以磁碟為基礎的 HTTP 快取並啟用自訂的記憶體圖片快取。會導致記憶體使用量增加。
+  Distraction Free Settings:
+    Hide Channels: 輸入頻道名稱或頻道 ID 以隱藏所有影片、播放清單與頻道本身，使其完全不出現在搜尋或趨勢中。輸入的頻道名稱必須完全符合，且區分大小寫。
 Playing Next Video Interval: 馬上播放下一個影片。點擊取消。| 播放下一個影片的時間為{nextVideoInterval}秒。點擊取消。|
   播放下一個影片的時間為{nextVideoInterval}秒。點擊取消。
 More: 更多
@@ -837,3 +851,4 @@ Chapters:
   'Chapters list visible, current chapter: {chapterName}': 章節清單可見，目前章節：{chapterName}
   'Chapters list hidden, current chapter: {chapterName}': 章節清單已隱藏，目前章節：{chapterName}
 Preferences: 偏好設定
+Ok: 確定

From dd18634fdcb24c995d85ca2c82ff0e30e913a913 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Mon, 19 Dec 2022 11:43:28 +0100
Subject: [PATCH 095/301] Pass playlist data from playlist page to watch page
 (#2970)

* Pass playlist data from playlist page to watch page

* Remove unused properties
---
 .../watch-video-playlist.js                   | 48 ++++++++++++++++---
 src/renderer/store/modules/utils.js           |  9 ++++
 src/renderer/views/Playlist/Playlist.js       | 19 +++++++-
 3 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.js b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
index c4fef2ba8901..32cb461cc16c 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.js
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { mapActions } from 'vuex'
+import { mapActions, mapMutations } from 'vuex'
 import FtLoader from '../ft-loader/ft-loader.vue'
 import FtCard from '../ft-card/ft-card.vue'
 import FtListVideo from '../ft-list-video/ft-list-video.vue'
@@ -31,7 +31,6 @@ export default Vue.extend({
       reversePlaylist: false,
       channelName: '',
       channelId: '',
-      channelThumbnail: '',
       playlistTitle: '',
       playlistItems: [],
       randomizedPlaylistItems: []
@@ -82,7 +81,11 @@ export default Vue.extend({
     }
   },
   mounted: function () {
-    if (!process.env.IS_ELECTRON || this.backendPreference === 'invidious') {
+    const cachedPlaylist = this.$store.getters.getCachedPlaylist
+
+    if (cachedPlaylist?.id === this.playlistId) {
+      this.loadCachedPlaylistInformation(cachedPlaylist)
+    } else if (!process.env.IS_ELECTRON || this.backendPreference === 'invidious') {
       this.getPlaylistInformationInvidious()
     } else {
       this.getPlaylistInformationLocal()
@@ -242,6 +245,37 @@ export default Vue.extend({
       }
     },
 
+    loadCachedPlaylistInformation: async function (cachedPlaylist) {
+      this.isLoading = true
+      this.setCachedPlaylist(null)
+
+      this.playlistTitle = cachedPlaylist.title
+      this.channelName = cachedPlaylist.channelName
+      this.channelId = cachedPlaylist.channelId
+
+      if (!process.env.IS_ELECTRON || this.backendPreference === 'invidious' || cachedPlaylist.continuationData === null) {
+        this.playlistItems = cachedPlaylist.items
+      } else {
+        const items = cachedPlaylist.items
+        let playlist = cachedPlaylist.continuationData
+
+        do {
+          playlist = await playlist.getContinuation()
+
+          const parsedVideos = playlist.items.map(parseLocalPlaylistVideo)
+          items.push(...parsedVideos)
+
+          if (!playlist.has_continuation) {
+            playlist = null
+          }
+        } while (playlist !== null)
+
+        this.playlistItems = items
+      }
+
+      this.isLoading = false
+    },
+
     getPlaylistInformationLocal: async function () {
       this.isLoading = true
 
@@ -249,9 +283,7 @@ export default Vue.extend({
         let playlist = await getLocalPlaylist(this.playlistId)
 
         this.playlistTitle = playlist.info.title
-        this.videoCount = playlist.info.total_items
         this.channelName = playlist.info.author?.name
-        this.channelThumbnail = playlist.info.author?.best_thumbnail?.url
         this.channelId = playlist.info.author?.id
 
         const videos = playlist.items.map(parseLocalPlaylistVideo)
@@ -291,9 +323,7 @@ export default Vue.extend({
 
       this.invidiousGetPlaylistInfo(payload).then((result) => {
         this.playlistTitle = result.title
-        this.videoCount = result.videoCount
         this.channelName = result.author
-        this.channelThumbnail = result.authorThumbnails[2].url
         this.channelId = result.authorId
         this.playlistItems = this.playlistItems.concat(result.videos)
 
@@ -336,6 +366,10 @@ export default Vue.extend({
 
     ...mapActions([
       'invidiousGetPlaylistInfo'
+    ]),
+
+    ...mapMutations([
+      'setCachedPlaylist'
     ])
   }
 })
diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index ff1e741a734b..786bff974314 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -22,6 +22,7 @@ const state = {
     gaming: null,
     movies: null
   },
+  cachedPlaylist: null,
   showProgressBar: false,
   progressBarPercentage: 0,
   regionNames: [],
@@ -60,6 +61,10 @@ const getters = {
     return state.trendingCache
   },
 
+  getCachedPlaylist() {
+    return state.cachedPlaylist
+  },
+
   getSearchSettings () {
     return state.searchSettings
   },
@@ -689,6 +694,10 @@ const mutations = {
     state.trendingCache[page] = value
   },
 
+  setCachedPlaylist(state, value) {
+    state.cachedPlaylist = value
+  },
+
   setSearchSortBy (state, value) {
     state.searchSettings.sortBy = value
   },
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index 1ace5cd3b7db..cdddab46d6b3 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import { mapActions } from 'vuex'
+import { mapActions, mapMutations } from 'vuex'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import PlaylistInfo from '../../components/playlist-info/playlist-info.vue'
@@ -20,6 +20,19 @@ export default Vue.extend({
     'ft-flex-box': FtFlexBox,
     'ft-button': FtButton
   },
+  beforeRouteLeave(to, from, next) {
+    if (!this.isLoading && to.path.startsWith('/watch') && to.query.playlistId === this.playlistId) {
+      this.setCachedPlaylist({
+        id: this.playlistId,
+        title: this.infoData.title,
+        channelName: this.infoData.channelName,
+        channelId: this.infoData.channelId,
+        items: this.playlistItems,
+        continuationData: this.continuationData
+      })
+    }
+    next()
+  },
   data: function () {
     return {
       isLoading: false,
@@ -185,6 +198,10 @@ export default Vue.extend({
     ...mapActions([
       'invidiousGetPlaylistInfo',
       'updateSubscriptionDetails'
+    ]),
+
+    ...mapMutations([
+      'setCachedPlaylist'
     ])
   }
 })

From 5230fc4fd7f1e06d3808cb9c2fd65c6f14b6b429 Mon Sep 17 00:00:00 2001
From: petaded <74797538+petaded@users.noreply.github.com>
Date: Mon, 19 Dec 2022 11:22:06 +0000
Subject: [PATCH 096/301] fix linting error in ft-input-tags.vue (#2971)

* fix linting error in ft-input-tags.vue

* swap to span over label

* update css to match

Co-authored-by: petaded <code@zikl.co.uk>
---
 src/renderer/components/ft-input-tags/ft-input-tags.css | 2 +-
 src/renderer/components/ft-input-tags/ft-input-tags.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.css b/src/renderer/components/ft-input-tags/ft-input-tags.css
index 4e77b4ba96f5..bcce0109030f 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.css
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.css
@@ -23,7 +23,7 @@
   float: left;
 }
 
-.ft-tag-box li>label {
+.ft-tag-box li>span {
   padding-top: 10px;
   padding-bottom: 10px;
   padding-left: 10px;
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.vue b/src/renderer/components/ft-input-tags/ft-input-tags.vue
index 544fc4ba12dc..5e4e33e89a70 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.vue
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.vue
@@ -20,7 +20,7 @@
           v-for="tag in tagList"
           :key="tag.id"
         >
-          <label>{{ tag }}</label>
+          <span>{{ tag }}</span>
           <font-awesome-icon
             :icon="['fas', 'fa-times']"
             class="removeTagButton"

From a55b77ccae922d03910e0d90ca7166f37a25f222 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Dec 2022 12:56:25 +0100
Subject: [PATCH 097/301] Bump videojs-overlay from 2.1.5 to 3.0.0 (#2979)

Bumps [videojs-overlay](https://github.com/brightcove/videojs-overlay) from 2.1.5 to 3.0.0.
- [Release notes](https://github.com/brightcove/videojs-overlay/releases)
- [Changelog](https://github.com/videojs/videojs-overlay/blob/main/CHANGELOG.md)
- [Commits](https://github.com/brightcove/videojs-overlay/compare/v2.1.5...v3.0.0)

---
updated-dependencies:
- dependency-name: videojs-overlay
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 35fc28ab286d..97acc8fb9ee5 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "videojs-contrib-quality-levels": "^2.2.1",
     "videojs-http-source-selector": "^1.1.6",
     "videojs-mobile-ui": "^0.8.0",
-    "videojs-overlay": "^2.1.4",
+    "videojs-overlay": "^3.0.0",
     "videojs-vtt-thumbnails-freetube": "0.0.15",
     "vue": "^2.7.14",
     "vue-i18n": "^8.28.2",
diff --git a/yarn.lock b/yarn.lock
index ff1fdbb14088..ccac63bb34d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8265,13 +8265,13 @@ videojs-mobile-ui@^0.8.0:
   dependencies:
     global "^4.4.0"
 
-videojs-overlay@^2.1.4:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/videojs-overlay/-/videojs-overlay-2.1.5.tgz#763b9d89dff87c32d94e9a873451a5fb25f02c8e"
-  integrity sha512-BPpW8ayC/3fX+JOegxvzU9MDS1MBuF3l6DWy5DXTmhjvDen8j5p/q46UGyCkUb2H9ljnwetTIkIPMza0iP41Bw==
+videojs-overlay@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/videojs-overlay/-/videojs-overlay-3.0.0.tgz#546ce34d72cdbb07c33eb189e94a37847dfbebe8"
+  integrity sha512-V9n8J7qVIzBeIcFbn9wmRt1aEHLfPcD/JSPUsCI6RDUOThhU+4RX/GmleHkCSW0D1YmkeNOd8E7eMuqnYnsOrA==
   dependencies:
     global "^4.3.2"
-    video.js "^6 || ^7"
+    video.js "^6 || ^7 || ^8"
 
 videojs-vtt-thumbnails-freetube@0.0.15:
   version "0.0.15"

From 3c5caab9f60b987046849905f80ecae3ebe33811 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Dec 2022 12:56:36 +0100
Subject: [PATCH 098/301] Bump youtubei.js from 2.5.3 to 2.6.0 (#2977)

Bumps [youtubei.js](https://github.com/LuanRT/YouTube.js) from 2.5.3 to 2.6.0.
- [Release notes](https://github.com/LuanRT/YouTube.js/releases)
- [Commits](https://github.com/LuanRT/YouTube.js/commits/v2.6.0)

---
updated-dependencies:
- dependency-name: youtubei.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 97acc8fb9ee5..fb866fb0b9ae 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
-    "youtubei.js": "^2.5.3",
+    "youtubei.js": "^2.6.0",
     "yt-channel-info": "^3.2.1",
     "yt-dash-manifest-generator": "1.1.0",
     "ytdl-core": "https://github.com/absidue/node-ytdl-core#fix-likes-extraction",
diff --git a/yarn.lock b/yarn.lock
index ccac63bb34d2..dc586b4689f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8667,10 +8667,10 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-youtubei.js@^2.5.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-2.5.3.tgz#61e34e5cc541e4a0d213d812d06a2c0ee71a6fa7"
-  integrity sha512-j6njcwg0OhmAm8rhiwa+uMnAb1FKzzbwizYsjX9Vr+VC1RXJ5s4q6BxXYlkjV26yVlXWDl8/S9wCQNA/9r0M8A==
+youtubei.js@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-2.6.0.tgz#7ba11f0d81b2e8d76a0993524b98ca7554d1090a"
+  integrity sha512-QnpOdcCqikI5qVTmMY7Orx/CglNVfsP+OGUgavodX20MtSRYUqjR/s/HYo1vWAol1hZT+PThEnIUrX/6U9IueA==
   dependencies:
     "@protobuf-ts/runtime" "^2.7.0"
     jintr "^0.3.1"

From 57d2777467e94123e60d10a0b173f10ff3bcd767 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Dec 2022 12:56:52 +0100
Subject: [PATCH 099/301] Bump css-loader from 6.7.2 to 6.7.3 (#2976)

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 6.7.2 to 6.7.3.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v6.7.2...v6.7.3)

---
updated-dependencies:
- dependency-name: css-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index fb866fb0b9ae..8f408e35839a 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "babel-eslint": "^10.1.0",
     "babel-loader": "^9.1.0",
     "copy-webpack-plugin": "^11.0.0",
-    "css-loader": "^6.7.2",
+    "css-loader": "^6.7.3",
     "css-minimizer-webpack-plugin": "^4.2.2",
     "electron": "^22.0.0",
     "electron-builder": "^23.6.0",
diff --git a/yarn.lock b/yarn.lock
index dc586b4689f6..aa8c75b2498f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2967,13 +2967,13 @@ css-declaration-sorter@^6.3.0:
   resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz#be5e1d71b7a992433fb1c542c7a1b835e45682ec"
   integrity sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==
 
-css-loader@^6.7.2:
-  version "6.7.2"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.2.tgz#26bc22401b5921686a10fbeba75d124228302304"
-  integrity sha512-oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q==
+css-loader@^6.7.3:
+  version "6.7.3"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.3.tgz#1e8799f3ccc5874fdd55461af51137fcc5befbcd"
+  integrity sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==
   dependencies:
     icss-utils "^5.1.0"
-    postcss "^8.4.18"
+    postcss "^8.4.19"
     postcss-modules-extract-imports "^3.0.0"
     postcss-modules-local-by-default "^4.0.0"
     postcss-modules-scope "^3.0.0"
@@ -6685,10 +6685,10 @@ postcss@^7.0.36:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.4.14, postcss@^8.4.17, postcss@^8.4.18:
-  version "8.4.19"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc"
-  integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==
+postcss@^8.4.14, postcss@^8.4.17, postcss@^8.4.19:
+  version "8.4.20"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.20.tgz#64c52f509644cecad8567e949f4081d98349dc56"
+  integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==
   dependencies:
     nanoid "^3.3.4"
     picocolors "^1.0.0"

From bcddcd1fe60b64751d57636a45e111192061e71a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Dec 2022 12:57:29 +0100
Subject: [PATCH 100/301] Bump sass from 1.56.2 to 1.57.0 (#2980)

Bumps [sass](https://github.com/sass/dart-sass) from 1.56.2 to 1.57.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.56.2...1.57.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 8f408e35839a..89d948eaf1b5 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.1",
     "rimraf": "^3.0.2",
-    "sass": "^1.56.2",
+    "sass": "^1.57.0",
     "sass-loader": "^13.2.0",
     "tree-kill": "1.2.2",
     "vue-devtools": "^5.1.4",
diff --git a/yarn.lock b/yarn.lock
index aa8c75b2498f..21214e5eebe2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7218,10 +7218,10 @@ sass-loader@^13.2.0:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
-sass@^1.56.2:
-  version "1.56.2"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.56.2.tgz#9433b345ab3872996c82a53a58c014fd244fd095"
-  integrity sha512-ciEJhnyCRwzlBCB+h5cCPM6ie/6f8HrhZMQOf5vlU60Y1bI1rx5Zb0vlDZvaycHsg/MqFfF1Eq2eokAa32iw8w==
+sass@^1.57.0:
+  version "1.57.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.57.0.tgz#64c4144ed4e1c0ccb96dc18aef2c424cdbc0c12b"
+  integrity sha512-IZNEJDTK1cF5B1cGA593TPAV/1S0ysUDxq9XHjX/+SMy0QfUny+nfUsq5ZP7wWSl4eEf7wDJcEZ8ABYFmh3m/w==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From 7c4dfefb45cc2c36052af5ddf7ab239c597d7b6e Mon Sep 17 00:00:00 2001
From: Simon Epstein <simon@simondo.com>
Date: Mon, 19 Dec 2022 13:01:09 +0000
Subject: [PATCH 101/301] Remove select-on-focus from ft-input (#2974)

* 2622 Remove select-on-focus behaviour from ft-input.

Replace this with show-clear-text-button.

* 2622 Make channel search a little wider so placeholder not truncated.

Co-authored-by: Simon Epstein <simon.epstein@67bricks.com>
---
 src/renderer/components/ft-input/ft-input.js | 7 -------
 src/renderer/components/top-nav/top-nav.vue  | 1 -
 src/renderer/views/Channel/Channel.css       | 2 +-
 src/renderer/views/Channel/Channel.vue       | 2 +-
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/renderer/components/ft-input/ft-input.js b/src/renderer/components/ft-input/ft-input.js
index a03b862367ba..25b7e8c8ca44 100644
--- a/src/renderer/components/ft-input/ft-input.js
+++ b/src/renderer/components/ft-input/ft-input.js
@@ -45,10 +45,6 @@ export default Vue.extend({
       type: Boolean,
       default: false
     },
-    selectOnFocus: {
-      type: Boolean,
-      default: false
-    },
     disabled: {
       type: Boolean,
       default: false
@@ -262,9 +258,6 @@ export default Vue.extend({
 
     handleFocus: function(e) {
       this.searchState.showOptions = true
-      if (this.selectOnFocus) {
-        e.target.select()
-      }
     },
 
     updateVisibleDataList: function () {
diff --git a/src/renderer/components/top-nav/top-nav.vue b/src/renderer/components/top-nav/top-nav.vue
index 5464d90ac7f8..8aaa2161a6ac 100644
--- a/src/renderer/components/top-nav/top-nav.vue
+++ b/src/renderer/components/top-nav/top-nav.vue
@@ -80,7 +80,6 @@
           :placeholder="$t('Search / Go to URL')"
           class="searchInput"
           :is-search="true"
-          :select-on-focus="true"
           :data-list="searchSuggestionsDataList"
           :spellcheck="false"
           :show-clear-text-button="true"
diff --git a/src/renderer/views/Channel/Channel.css b/src/renderer/views/Channel/Channel.css
index 998f701ef923..568edf62402e 100644
--- a/src/renderer/views/Channel/Channel.css
+++ b/src/renderer/views/Channel/Channel.css
@@ -74,7 +74,7 @@
 }
 
 .channelSearch {
-  width: 200px;
+  width: 220px;
   align-self: flex-end;
 }
 
diff --git a/src/renderer/views/Channel/Channel.vue b/src/renderer/views/Channel/Channel.vue
index 63c266fe9da4..5c48a037b200 100644
--- a/src/renderer/views/Channel/Channel.vue
+++ b/src/renderer/views/Channel/Channel.vue
@@ -96,7 +96,7 @@
           </div>
           <ft-input
             :placeholder="$t('Channel.Search Channel')"
-            :select-on-focus="true"
+            :show-clear-text-button="true"
             class="channelSearch"
             @click="newSearch"
           />

From eab2214fe06b2d02016791e70fc0f9f4449091df Mon Sep 17 00:00:00 2001
From: Fjuro <ifjuro@proton.me>
Date: Mon, 19 Dec 2022 15:49:19 +0000
Subject: [PATCH 102/301] Translated using Weblate (Czech)

Currently translated at 98.7% (643 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/cs/
---
 static/locales/cs.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml
index 2a60e2b0f526..5c53b6741efa 100644
--- a/static/locales/cs.yaml
+++ b/static/locales/cs.yaml
@@ -313,6 +313,8 @@ Settings:
     Hide Sharing Actions: Skrýt akce sdílení
     Hide Chapters: Skrýt kapitoly
     Hide Upcoming Premieres: Skrýt nadcházející premiéry
+    Hide Channels: Skrýt videa z kanálů
+    Hide Channels Placeholder: Název nebo ID kanálu
   Data Settings:
     Data Settings: 'Nastavení dat'
     Select Import Type: 'Vybrat typ importu'
@@ -441,6 +443,9 @@ Settings:
     Warning: Tato nastavení jsou experimentální, při jejich aktivaci dochází k pádům.
       Důrazně doporučujeme vytvářet zálohy. Používejte na vlastní nebezpečí!
     Replace HTTP Cache: Nahradit mezipaměť HTTP
+  Password Dialog:
+    Enter Password To Unlock: Pro odemknutí nastavení zadejte heslo
+    Password: Heslo
 About:
   #On About page
   About: 'O aplikaci'

From 2f2ce0f67a1010e5275b33eab859e1dee91f5ef2 Mon Sep 17 00:00:00 2001
From: Fjuro <ifjuro@proton.me>
Date: Mon, 19 Dec 2022 15:51:32 +0000
Subject: [PATCH 103/301] Translated using Weblate (Czech)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/cs/
---
 static/locales/cs.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml
index 5c53b6741efa..5590a606b9ae 100644
--- a/static/locales/cs.yaml
+++ b/static/locales/cs.yaml
@@ -446,6 +446,13 @@ Settings:
   Password Dialog:
     Enter Password To Unlock: Pro odemknutí nastavení zadejte heslo
     Password: Heslo
+    Password Incorrect: Nesprávné heslo
+    Unlock: Odemknout
+  Password Settings:
+    Password Settings: Nastavení hesla
+    Set Password To Prevent Access: Nastavte heslo, abyste zabránili přístupu k nastavení
+    Remove Password: Odebrat heslo
+    Set Password: Nastavit heslo
 About:
   #On About page
   About: 'O aplikaci'
@@ -850,6 +857,10 @@ Tooltips:
   Experimental Settings:
     Replace HTTP Cache: Zakáže mezipaměť HTTP Electronu a povolí vlastní paměťovou
       mezipaměť pro obrázky v paměti. Povede to ke zvýšenému využití RAM.
+  Distraction Free Settings:
+    Hide Channels: Zadejte název nebo ID kanálu pro skrytí všech videí, playlistů
+      a samotného kanálu před zobrazením ve vyhledávání nebo trendech. Zadaný název
+      kanálu se musí zcela shodovat a rozlišují se v něm velká a malá písmena.
 Local API Error (Click to copy): 'Chyba lokálního API (kliknutím zkopírujete)'
 Invidious API Error (Click to copy): 'Chyba Invidious API (kliknutím zkopírujete)'
 Falling back to Invidious API: 'Přepínám na Invidious API'
@@ -921,3 +932,4 @@ Chapters:
     současná kapitola: {chapterName}'
   Chapters: Kapitoly
 Preferences: Předvolby
+Ok: Ok

From a09a94ac039926ff83ae7c62bf2c3096471910ea Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Tue, 20 Dec 2022 04:57:26 +0800
Subject: [PATCH 104/301] ! Fix incorrect selector (meant to be multiple
 targets not nested) (#2962)

---
 src/renderer/themes.css | 56 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/renderer/themes.css b/src/renderer/themes.css
index 19ad645a6454..56743fadc731 100644
--- a/src/renderer/themes.css
+++ b/src/renderer/themes.css
@@ -137,26 +137,26 @@
   --logo-text: url("../../_icons/textCatppuccinMochaLightSmall.png");
 }
 
-.mainRed
-.mainPink
-.mainPurple
-.mainDeepPurple
-.mainIndigo
-.mainBlue
-.mainLightBlue
-.mainCyan
-.mainTeal
+.mainRed,
+.mainPink,
+.mainPurple,
+.mainDeepPurple,
+.mainIndigo,
+.mainBlue,
+.mainLightBlue,
+.mainCyan,
+.mainTeal,
 .mainGreen {
   --text-with-main-color: #FFFFFF;
   --logo-icon-bar-color: url("../../_icons/iconWhite.png");
   --logo-text-bar-color: url("../../_icons/textWhite.png");
 }
 
-.mainLightGreen
-.mainLime
-.mainYellow
-.mainAmber
-.mainOrange
+.mainLightGreen,
+.mainLime,
+.mainYellow,
+.mainAmber,
+.mainOrange,
 .mainDeepOrange {
   --text-with-main-color: #000000;
   --logo-icon-bar-color: url("../../_icons/iconBlackSmall.png");
@@ -421,24 +421,24 @@
   --primary-color-active: #8d98e4;
 }
 
-.secRed
-.secPink
-.secPurple
-.secDeepPurple
-.secIndigo
-.secBlue
-.secLightBlue
-.secCyan
-.secTeal
+.secRed,
+.secPink,
+.secPurple,
+.secDeepPurple,
+.secIndigo,
+.secBlue,
+.secLightBlue,
+.secCyan,
+.secTeal,
 .secGreen {
   --text-with-accent-color: #FFFFFF;
 }
 
-.secLightGreen
-.secLime
-.secYellow
-.secAmber
-.secOrange
+.secLightGreen,
+.secLime,
+.secYellow,
+.secAmber,
+.secOrange,
 .secDeepOrange {
   --text-with-accent-color: #000000;
 }

From b2cd70daa3e2f4e47cee12a7ace8161e2277a697 Mon Sep 17 00:00:00 2001
From: "J. Lavoie" <j.lavoie@net-c.ca>
Date: Mon, 19 Dec 2022 20:11:20 +0000
Subject: [PATCH 105/301] Translated using Weblate (German)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/de/
---
 static/locales/de-DE.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/static/locales/de-DE.yaml b/static/locales/de-DE.yaml
index 41d4d59aa15a..c328d7cf8c05 100644
--- a/static/locales/de-DE.yaml
+++ b/static/locales/de-DE.yaml
@@ -395,6 +395,8 @@ Settings:
     Hide Sharing Actions: Freigabe-Aktionen ausblenden
     Hide Chapters: Kapitel ausblenden
     Hide Upcoming Premieres: Anstehende Premieren ausblenden
+    Hide Channels: Videos aus Kanälen ausblenden
+    Hide Channels Placeholder: Kanalname oder Kanal-ID
   The app needs to restart for changes to take effect. Restart and apply change?: Um
     die Änderungen anzuwenden muss die Anwendung neustarten. Jetzt neustarten und
     Änderungen aktivieren?
@@ -931,6 +933,11 @@ Tooltips:
     Replace HTTP Cache: Deaktiviert den festplattenbasierten HTTP-Cache von Electron
       und aktiviert einen benutzerdefinierten In-Memory-Image-Cache. Dies führt zu
       einer erhöhten Nutzung des Direktzugriffsspeichers.
+  Distraction Free Settings:
+    Hide Channels: Geben Sie einen Kanalnamen oder eine Kanal-ID ein, um alle Videos,
+      Wiedergabelisten und den Kanal selbst vor der Anzeige in der Suche oder den
+      Trends zu verbergen. Der eingegebene Kanalname muss vollständig übereinstimmen
+      und es wird zwischen Groß- und Kleinschreibung unterschieden.
 Playing Next Video Interval: Nächstes Video wird sofort abgespielt. Zum Abbrechen
   klicken. | Nächstes Video wird in {nextVideoInterval} Sekunden abgespielt. Zum Abbrechen
   klicken. | Nächstes Video wird in {nextVideoInterval} Sekunden abgespielt. Zum Abbrechen
@@ -982,4 +989,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Kapitelliste ausgeblendet,
     aktuelles Kapitel: {chapterName}'
 Preferences: Einstellungen
-Ok: Ok
+Ok: OK

From 614f3ed4b87486618073f1d5f62b516420c93ebc Mon Sep 17 00:00:00 2001
From: "J. Lavoie" <j.lavoie@net-c.ca>
Date: Mon, 19 Dec 2022 20:19:32 +0000
Subject: [PATCH 106/301] Translated using Weblate (Finnish)

Currently translated at 99.5% (648 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/fi/
---
 static/locales/fi.yaml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/static/locales/fi.yaml b/static/locales/fi.yaml
index 17cda0b1600f..60596b9dbfe1 100644
--- a/static/locales/fi.yaml
+++ b/static/locales/fi.yaml
@@ -206,6 +206,7 @@ Settings:
     Disable Smooth Scrolling: Poista tasainen vieritys käytöstä
     Expand Side Bar by Default: Laajenna sivupalkki oletusarvoisesti
     Hide Side Bar Labels: Piilota sivupalkin nimikkeet
+    Hide FreeTube Header Logo: Piilota FreeTube-otsikkologo
   Player Settings:
     Player Settings: 'Soittimen asetukset'
     Force Local Backend for Legacy Formats: 'Pakota paikallinen taustaohjelma vanhoille
@@ -260,6 +261,7 @@ Settings:
         numeroa. %S Sekunnit 2 numeroa. %T Millisekunnit 3 numeroa. %s Videosekunnit.
         %t Videon Millisekunnit 3 numeroa. %i Videotunniste eli ID. Voit myös käyttää
         "\" tai "/" luodaksesi alikansioita.
+    Enter Fullscreen on Display Rotate: Siirry koko näytön kokoiseen näytön kiertoon
   Subscription Settings:
     Subscription Settings: 'Tilausasetukset'
     Hide Videos on Watch: 'Piilota katsotut videot'
@@ -380,6 +382,9 @@ Settings:
     Hide Live Streams: Piilota suorat lähetykset
     Hide Sharing Actions: Piilota jakamistoiminnot
     Hide Chapters: Piilota kappaleet
+    Hide Channels: Piilota videot kanavilta
+    Hide Upcoming Premieres: Piilota tulevat ensiesitykset
+    Hide Channels Placeholder: Kanavan nimi tai tunnus
   The app needs to restart for changes to take effect. Restart and apply change?: Sovellus
     on käynnistettävä uudelleen, jotta muutokset tulevat voimaan. Käynnistetäänkö
     uudelleen?
@@ -440,6 +445,16 @@ Settings:
       ovat käytössä. Varmuuskopioiden tekeminen on erittäin suositeltavaa. Käytä omalla
       vastuullasi!
     Replace HTTP Cache: Korvaa HTTP-välimuisti
+  Password Dialog:
+    Password: Salasana
+    Enter Password To Unlock: Syötä salasana avataksesi asetukset
+    Password Incorrect: Salasana on virheellinen
+    Unlock: Avaa lukitus
+  Password Settings:
+    Set Password To Prevent Access: Aseta salasana estääksesi pääsyn asetuksiin
+    Password Settings: Salasana-asetukset
+    Set Password: Aseta salasana
+    Remove Password: Poista salasana
 About:
   #On About page
   About: 'Tietoja'
@@ -710,6 +725,7 @@ Share:
   Include Timestamp: Sisällytä aikaleima
   YouTube Channel URL copied to clipboard: Kanavan Youtube URL kopioitu leikepöydälle
   Invidious Channel URL copied to clipboard: Kanavan Invidious URL kopioutu leikepöydälle
+  Share Channel: Jaa kanava
 Mini Player: 'Pieni soitin'
 Comments:
   Comments: 'Kommentit'
@@ -862,6 +878,10 @@ Tooltips:
     Replace HTTP Cache: Poistaa Electronin levypohjaisen HTTP-välimuistin käytöstä
       ja ottaa käyttöön mukautetun muistissa olevan kuvavälimuistin. Lisää välimuistin
       käyttöä.
+  Distraction Free Settings:
+    Hide Channels: Anna kanavan nimi tai kanavatunnus piilottaaksesi kaikki videot,
+      soittolistat ja itse kanavan näkymästä haussa tai trendaamisessa. Annetun kanavan
+      nimen on vastattava täydellisesti ja kirjainkoolla on merkitystä.
 More: Lisää
 Playing Next Video Interval: Seuraava video alkaa. Klikkaa peruuttaaksesi. |Seuraava
   video alkaa {nextVideoInterval} sekunnin kuluttua. Klikkaa peruuttaaksesi. | Seuraava
@@ -911,3 +931,4 @@ Chapters:
   'Chapters list visible, current chapter: {chapterName}': 'Lukujen luettelo näkyvissä,
     nykyinen luku: {chapterName}'
 Preferences: Asetukset
+Ok: OK

From f38f2b7ae8a50ace161b93ae2561b950d83de080 Mon Sep 17 00:00:00 2001
From: "J. Lavoie" <j.lavoie@net-c.ca>
Date: Mon, 19 Dec 2022 20:07:16 +0000
Subject: [PATCH 107/301] Translated using Weblate (French)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/fr/
---
 static/locales/fr-FR.yaml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/static/locales/fr-FR.yaml b/static/locales/fr-FR.yaml
index 08e8335d592e..346cefe790d8 100644
--- a/static/locales/fr-FR.yaml
+++ b/static/locales/fr-FR.yaml
@@ -406,6 +406,8 @@ Settings:
     Hide Sharing Actions: Masquer les actions de partage
     Hide Chapters: Masquer les chapitres
     Hide Upcoming Premieres: Cacher les avant-premières à venir
+    Hide Channels: Masquer les vidéos des chaînes
+    Hide Channels Placeholder: Nom ou identifiant de la chaîne
   The app needs to restart for changes to take effect. Restart and apply change?: L'application
     doit être redémarrée pour que les changements prennent effet. Redémarrer et appliquer
     les changements ?
@@ -472,8 +474,13 @@ Settings:
     Password: Mot de passe
     Enter Password To Unlock: Entrez le mot de passe pour déverrouiller les paramètres
     Password Incorrect: Mot de passe incorrect
+    Unlock: Déverrouiller
   Password Settings:
     Remove Password: Supprimer le mot de passe
+    Set Password To Prevent Access: Définir un mot de passe pour empêcher l'accès
+      aux paramètres
+    Set Password: Définir un mot de passe
+    Password Settings: Paramètres de mot de passe
 About:
   #On About page
   About: 'À propos'
@@ -940,6 +947,11 @@ Tooltips:
     Replace HTTP Cache: Désactive le cache HTTP d'Electron basé sur le disque et active
       un cache d'image personnalisé en mémoire. Ceci entraînera une augmentation de
       l'utilisation de la mémoire vive.
+  Distraction Free Settings:
+    Hide Channels: Entrez un nom de chaîne ou un identifiant de chaîne pour empêcher
+      toutes les vidéos, les listes de lecture et la chaîne elle-même d'apparaître
+      dans les recherches ou les tendances. Le nom du canal entré doit être une correspondance
+      complète et est sensible à la casse.
 More: Plus
 Playing Next Video Interval: Lecture de la prochaine vidéo en un rien de temps. Cliquez
   pour annuler. | Lecture de la prochaine vidéo dans {nextVideoInterval} seconde.
@@ -994,3 +1006,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Liste des chapitres cachée,
     chapitre actuel : {chapterName}'
 Preferences: Préférences
+Ok: OK

From 6c8bc0a4f5b55b867c5483f053268f89098339e2 Mon Sep 17 00:00:00 2001
From: "J. Lavoie" <j.lavoie@net-c.ca>
Date: Mon, 19 Dec 2022 20:11:30 +0000
Subject: [PATCH 108/301] Translated using Weblate (Italian)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/it/
---
 static/locales/it.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/it.yaml b/static/locales/it.yaml
index 6e9fcc49536f..3f45312600f4 100644
--- a/static/locales/it.yaml
+++ b/static/locales/it.yaml
@@ -975,4 +975,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Elenco capitoli nascosto,
     capitolo corrente: {chapterName}'
 Preferences: Preferenze
-Ok: Ok
+Ok: OK

From b53cee61e183c9f4abac946b5d915900c8ff3db1 Mon Sep 17 00:00:00 2001
From: "J. Lavoie" <j.lavoie@net-c.ca>
Date: Mon, 19 Dec 2022 20:14:28 +0000
Subject: [PATCH 109/301] Translated using Weblate (English (United Kingdom))

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/en_GB/
---
 static/locales/en_GB.yaml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/static/locales/en_GB.yaml b/static/locales/en_GB.yaml
index 9eb8dcb60a94..f745eb264a75 100644
--- a/static/locales/en_GB.yaml
+++ b/static/locales/en_GB.yaml
@@ -395,6 +395,8 @@ Settings:
     Hide Upcoming Premieres: Hide Upcoming Premieres
     Hide Sharing Actions: Hide sharing actions
     Hide Chapters: Hide chapters
+    Hide Channels: Hide videos from channels
+    Hide Channels Placeholder: Channel name or ID
   The app needs to restart for changes to take effect. Restart and apply change?: The
     app needs to restart for changes to take effect. Do you want to restart and apply
     the changes?
@@ -444,6 +446,16 @@ Settings:
     Experimental Settings: Experimental settings
     Warning: These settings are experimental; they may cause crashes while enabled.
       Making back-ups is highly recommended. Use at your own risk!
+  Password Dialog:
+    Password: Password
+    Enter Password To Unlock: Enter password to unlock settings
+    Unlock: Unlock
+    Password Incorrect: Password incorrect
+  Password Settings:
+    Set Password To Prevent Access: Set a password to prevent access to settings
+    Remove Password: Remove password
+    Password Settings: Password settings
+    Set Password: Set password
 About:
   #On About page
   About: About
@@ -858,6 +870,10 @@ Tooltips:
   Experimental Settings:
     Replace HTTP Cache: Disables Electron's disk-based HTTP cache and enables a custom
       in-memory image cache. Will lead to increased RAM usage.
+  Distraction Free Settings:
+    Hide Channels: Enter a channel name or channel ID to hide all videos, playlists
+      and the channel itself from appearing in search or trending. The channel name
+      entered must be a complete match and is case sensitive.
 Playing Next Video Interval: Playing next video in no time. Click to cancel. | Playing
   next video in {nextVideoInterval} second. Click to cancel. | Playing next video
   in {nextVideoInterval} seconds. Click to cancel.
@@ -906,3 +922,4 @@ Clipboard:
   Cannot access clipboard without a secure connection: Cannot access clipboard without
     a secure connection
 Preferences: Preferences
+Ok: OK

From 6f7adaaf720c6faf0be1060c1bbdf4f035a63121 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 20 Dec 2022 02:21:55 +0100
Subject: [PATCH 110/301] Fix docs link in the data settings section (#2981)

---
 .../components/data-settings/data-settings.vue        | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/renderer/components/data-settings/data-settings.vue b/src/renderer/components/data-settings/data-settings.vue
index 2b8b9a5e77a5..2d842a802727 100644
--- a/src/renderer/components/data-settings/data-settings.vue
+++ b/src/renderer/components/data-settings/data-settings.vue
@@ -21,14 +21,11 @@
       />
     </ft-flex-box>
     <ft-flex-box>
-      <a
-        class="center"
-        href="https://docs.freetubeapp.io/usage/importing-subscriptions/"
-      >
-        <p>
+      <p>
+        <a href="https://docs.freetubeapp.io/usage/importing-subscriptions/">
           {{ $t("Settings.Data Settings.How do I import my subscriptions?") }}
-        </p>
-      </a>
+        </a>
+      </p>
     </ft-flex-box>
     <ft-flex-box>
       <ft-button

From 37da66be260ebfb8817bbb828dd6bd0bd32050d1 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 20 Dec 2022 06:58:44 +0100
Subject: [PATCH 111/301] Cleanup and simplify the settings password code
 (#2982)

---
 .../password-dialog/password-dialog.css       | 11 ++--
 .../password-dialog/password-dialog.js        | 47 +++-------------
 .../password-dialog/password-dialog.vue       | 38 +++++--------
 .../password-settings/password-settings.css   |  3 +
 .../password-settings/password-settings.js    | 22 +-------
 .../password-settings/password-settings.vue   | 56 +++++++++----------
 src/renderer/views/Settings/Settings.js       | 14 +++--
 src/renderer/views/Settings/Settings.vue      | 17 +++---
 8 files changed, 76 insertions(+), 132 deletions(-)
 create mode 100644 src/renderer/components/password-settings/password-settings.css

diff --git a/src/renderer/components/password-dialog/password-dialog.css b/src/renderer/components/password-dialog/password-dialog.css
index 8769c42f1af6..2d37968aabca 100644
--- a/src/renderer/components/password-dialog/password-dialog.css
+++ b/src/renderer/components/password-dialog/password-dialog.css
@@ -1,10 +1,9 @@
 .card {
-    position: relative;
-    width: 85%;
-    height: 25%;
-    margin: auto;
-    box-sizing: border-box;
+  width: 85%;
+  margin: auto;
+  box-sizing: border-box;
 }
+
 .passwordInput {
-    width: 100%;
+  width: 100%;
 }
diff --git a/src/renderer/components/password-dialog/password-dialog.js b/src/renderer/components/password-dialog/password-dialog.js
index 1e2212157147..b201e57c3fee 100644
--- a/src/renderer/components/password-dialog/password-dialog.js
+++ b/src/renderer/components/password-dialog/password-dialog.js
@@ -1,58 +1,27 @@
 import Vue from 'vue'
-import { mapActions } from 'vuex'
 import FtCard from '../ft-card/ft-card.vue'
 import FtInput from '../ft-input/ft-input.vue'
-import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import FtPrompt from '../ft-prompt/ft-prompt.vue'
 
 export default Vue.extend({
   name: 'PasswordDialog',
   components: {
     'ft-input': FtInput,
-    'ft-card': FtCard,
-    'ft-flex-box': FtFlexBox,
-    'ft-prompt': FtPrompt,
-  },
-  emits: ['settingsUnlocked'],
-  data: function() {
-    return {
-      password: '',
-      showIncorrectPassword: false
-    }
+    'ft-card': FtCard
   },
+  emits: ['unlocked'],
   computed: {
-    getStoredPassword: function() {
+    settingsPassword: function () {
       return this.$store.getters.getSettingsPassword
-    },
-    incorrectPassword: function() {
-      return this.password !== '' && !this.unlocked
-    },
-    unlocked: function() {
-      return this.getStoredPassword === '' || this.password === this.getStoredPassword
     }
   },
-  watch: {
-    unlocked(val, oldVal) {
-      if (val !== oldVal) {
-        this.propagateUnlockStatus()
-      }
-    },
-  },
   mounted: function () {
-    this.propagateUnlockStatus()
     this.$refs.password.focus()
   },
   methods: {
-    handleLock: function () {
-      this.password = ''
-      this.showIncorrectPassword = false
-    },
-    propagateUnlockStatus: function() {
-      this.$emit('settingsUnlocked', this.unlocked)
-    },
-    ...mapActions([
-      'updateSettingsPassword'
-    ]),
-
+    handlePasswordInput: function (input) {
+      if (input === this.settingsPassword) {
+        this.$emit('unlocked')
+      }
+    }
   }
 })
diff --git a/src/renderer/components/password-dialog/password-dialog.vue b/src/renderer/components/password-dialog/password-dialog.vue
index f7b6300d1584..89858f2106e8 100644
--- a/src/renderer/components/password-dialog/password-dialog.vue
+++ b/src/renderer/components/password-dialog/password-dialog.vue
@@ -1,30 +1,18 @@
 <template>
-  <div>
-    <ft-card
-      class="card"
-    >
-      <h3>{{ $t("Settings.Password Dialog.Enter Password To Unlock") }}</h3>
+  <ft-card
+    class="card"
+  >
+    <h3>{{ $t("Settings.Password Dialog.Enter Password To Unlock") }}</h3>
 
-      <ft-flex-box>
-        <ft-input
-          ref="password"
-          :placeholder="$t('Settings.Password Dialog.Password')"
-          :show-action-button="false"
-          input-type="password"
-          class="passwordInput"
-          :value="password"
-          @input="e => password = e"
-        />
-      </ft-flex-box>
-      <ft-prompt
-        v-if="showIncorrectPassword"
-        :label="$t('Settings.Password Dialog.Password Incorrect')"
-        :option-names="[$t('Ok')]"
-        :option-values="['ok']"
-        @click="handleLock"
-      />
-    </ft-card>
-  </div>
+    <ft-input
+      ref="password"
+      :placeholder="$t('Settings.Password Dialog.Password')"
+      :show-action-button="false"
+      input-type="password"
+      class="passwordInput"
+      @input="handlePasswordInput"
+    />
+  </ft-card>
 </template>
 
 <script src="./password-dialog.js" />
diff --git a/src/renderer/components/password-settings/password-settings.css b/src/renderer/components/password-settings/password-settings.css
new file mode 100644
index 000000000000..07cbe309f9c9
--- /dev/null
+++ b/src/renderer/components/password-settings/password-settings.css
@@ -0,0 +1,3 @@
+.centerButton {
+  align-self: center;
+}
diff --git a/src/renderer/components/password-settings/password-settings.js b/src/renderer/components/password-settings/password-settings.js
index 40e9f482f260..ca6f038945a4 100644
--- a/src/renderer/components/password-settings/password-settings.js
+++ b/src/renderer/components/password-settings/password-settings.js
@@ -13,30 +13,19 @@ export default Vue.extend({
     'ft-flex-box': FtFlexBox,
     'ft-button': FtButton,
   },
-  emits: ['settingsUnlocked'],
   data: function() {
     return {
       password: '',
     }
   },
   computed: {
-    getStoredPassword: function() {
+    settingsPassword: function() {
       return this.$store.getters.getSettingsPassword
     },
     hasStoredPassword: function() {
-      return this.getStoredPassword !== ''
-    },
-    unlocked: function() {
-      return this.getStoredPassword === '' || this.password === this.getStoredPassword
+      return this.settingsPassword !== ''
     }
   },
-  watch: {
-    unlocked(val, oldVal) {
-      if (val !== oldVal) {
-        this.propagateUnlockStatus()
-      }
-    },
-  },
   methods: {
     handleSetPassword: function () {
       this.updateSettingsPassword(this.password)
@@ -46,13 +35,8 @@ export default Vue.extend({
       this.updateSettingsPassword('')
       this.password = ''
     },
-    propagateUnlockStatus: function() {
-      this.$emit('settingsUnlocked', this.unlocked)
-    },
-
     ...mapActions([
       'updateSettingsPassword'
-    ]),
-
+    ])
   }
 })
diff --git a/src/renderer/components/password-settings/password-settings.vue b/src/renderer/components/password-settings/password-settings.vue
index 5ba0279b7e94..a8772dd87dcb 100644
--- a/src/renderer/components/password-settings/password-settings.vue
+++ b/src/renderer/components/password-settings/password-settings.vue
@@ -2,35 +2,35 @@
   <ft-settings-section
     :title="$t('Settings.Password Settings.Password Settings')"
   >
-    <div>
-      <ft-flex-box
-        v-if="hasStoredPassword"
-        class="settingsFlexStart460px"
-      >
-        <ft-button
-          :label="$t('Settings.Password Settings.Remove Password')"
-          @click="handleRemovePassword"
-        />
-      </ft-flex-box>
-      <ft-flex-box
-        v-else
-        class="settingsFlexStart460px"
-      >
-        <ft-input
-          :placeholder="$t('Settings.Password Settings.Set Password To Prevent Access')"
-          :show-action-button="false"
-          :show-label="true"
-          input-type="password"
-          :value="password"
-          @input="e => password = e"
-        />
-        <ft-button
-          :label="$t('Settings.Password Settings.Set Password')"
-          @click="handleSetPassword"
-        />
-      </ft-flex-box>
-    </div>
+    <ft-flex-box
+      v-if="hasStoredPassword"
+      class="settingsFlexStart460px"
+    >
+      <ft-button
+        :label="$t('Settings.Password Settings.Remove Password')"
+        @click="handleRemovePassword"
+      />
+    </ft-flex-box>
+    <ft-flex-box
+      v-else
+      class="settingsFlexStart460px"
+    >
+      <ft-input
+        :placeholder="$t('Settings.Password Settings.Set Password To Prevent Access')"
+        :show-action-button="false"
+        :show-label="true"
+        input-type="password"
+        :value="password"
+        @input="e => password = e"
+      />
+      <ft-button
+        class="centerButton"
+        :label="$t('Settings.Password Settings.Set Password')"
+        @click="handleSetPassword"
+      />
+    </ft-flex-box>
   </ft-settings-section>
 </template>
 
 <script src="./password-settings.js" />
+<style scoped src="./password-settings.css" />
diff --git a/src/renderer/views/Settings/Settings.js b/src/renderer/views/Settings/Settings.js
index b88fc425e755..3e516881131b 100644
--- a/src/renderer/views/Settings/Settings.js
+++ b/src/renderer/views/Settings/Settings.js
@@ -36,17 +36,21 @@ export default Vue.extend({
   },
   data: function () {
     return {
-      settingsUnlocked: false
+      unlocked: false
     }
   },
   computed: {
     usingElectron: function () {
       return process.env.IS_ELECTRON
     },
+
+    settingsPassword: function () {
+      return this.$store.getters.getSettingsPassword
+    }
   },
-  methods: {
-    handleSettingsUnlocked: function (n) {
-      this.settingsUnlocked = n
-    },
+  mounted: function () {
+    if (this.settingsPassword === '') {
+      this.unlocked = true
+    }
   }
 })
diff --git a/src/renderer/views/Settings/Settings.vue b/src/renderer/views/Settings/Settings.vue
index e7618dfbb29c..d8c27347bb1a 100644
--- a/src/renderer/views/Settings/Settings.vue
+++ b/src/renderer/views/Settings/Settings.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="settingsUnlocked">
+    <template v-if="unlocked">
       <general-settings />
       <hr>
       <theme-settings />
@@ -27,15 +27,12 @@
       <hr v-if="usingElectron">
       <experimental-settings v-if="usingElectron" />
       <hr>
-      <password-settings
-        @settingsUnlocked="handleSettingsUnlocked"
-      />
-    </div>
-    <div v-else>
-      <password-dialog
-        @settingsUnlocked="handleSettingsUnlocked"
-      />
-    </div>
+      <password-settings />
+    </template>
+    <password-dialog
+      v-else
+      @unlocked="unlocked = true"
+    />
   </div>
 </template>
 

From d8c60e56d5d047f3062e93151c1167173b59206d Mon Sep 17 00:00:00 2001
From: SC <lalocas@protonmail.com>
Date: Tue, 20 Dec 2022 16:22:08 +0000
Subject: [PATCH 112/301] Translated using Weblate (Portuguese)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt/
---
 static/locales/pt.yaml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/static/locales/pt.yaml b/static/locales/pt.yaml
index 0c229fe611ea..7506824fe81b 100644
--- a/static/locales/pt.yaml
+++ b/static/locales/pt.yaml
@@ -417,6 +417,8 @@ Settings:
     Hide Comments: Ocultar comentários
     Hide Chapters: Ocultar capítulos
     Hide Upcoming Premieres: Ocultar próximas estreias
+    Hide Channels: Ocultar vídeos dos canais
+    Hide Channels Placeholder: Nome ou ID do canal
   External Player Settings:
     Custom External Player Arguments: Argumentos do reprodutor externo personalizado
     Custom External Player Executable: Executável de reprodutor externo personalizado
@@ -445,6 +447,17 @@ Settings:
     Experimental Settings: Definições experimentais
     Warning: Estas definições são experimentais e podem provocar falhas se ativadas.
       É altamente recomendado fazer cópias de segurança. Use por sua conta e risco!
+  Password Dialog:
+    Enter Password To Unlock: Digite a palavra-passe para desbloquear as configurações
+    Password Incorrect: Palavra-passe incorreta
+    Password: Palavra-passe
+    Unlock: Desbloquear
+  Password Settings:
+    Password Settings: Configurações da palavra-passe
+    Set Password To Prevent Access: Defina uma palavra-passe para prevenir o acesso
+      às configurações
+    Set Password: Definir palavra-passe
+    Remove Password: Remover palavra-passe
 About:
   #On About page
   About: 'Acerca'
@@ -896,6 +909,11 @@ Tooltips:
   Experimental Settings:
     Replace HTTP Cache: Desativa a cache HTTP Electron e ativa uma cache de imagem
       na memória personalizada. Levará ao aumento da utilização de RAM.
+  Distraction Free Settings:
+    Hide Channels: Digite um nome ou ID do canal para ocultar todos os vídeos, listas
+      de reprodução e o próprio canal, de forma a não aparecer em pesquisas ou tendências.
+      O nome do canal inserido deve ser exatamente igual ao nome do canal e é sensível
+      a maiúsculas e minúsculas.
 Search Bar:
   Clear Input: Limpar entrada
 Are you sure you want to open this link?: Tem a certeza de que deseja abrir a ligação?
@@ -934,3 +952,4 @@ Clipboard:
   Cannot access clipboard without a secure connection: Não é possível aceder à área
     de transferência sem uma ligação segura
 Preferences: Preferências
+Ok: Ok

From 7e8e65a0b9d4569ba2f7fbeb23f5c4041032432f Mon Sep 17 00:00:00 2001
From: ShareASmile <aapshergill@gmail.com>
Date: Tue, 20 Dec 2022 22:42:16 +0000
Subject: [PATCH 113/301] Translated using Weblate (Hindi)

Currently translated at 23.3% (152 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/hi/
---
 static/locales/hi.yaml | 257 ++++++++++++++++++++++++++---------------
 1 file changed, 162 insertions(+), 95 deletions(-)

diff --git a/static/locales/hi.yaml b/static/locales/hi.yaml
index 60c949c50074..b3a90c5ccdab 100644
--- a/static/locales/hi.yaml
+++ b/static/locales/hi.yaml
@@ -1,54 +1,54 @@
 # Put the name of your locale in the same language
-Locale Name: 'हिन्दी'
-FreeTube: 'FreeTube'
+Locale Name: 'English (US)'
+FreeTube: 'फ्रीट्यूब'
 # Currently on Subscriptions, Playlists, and History
 'This part of the app is not ready yet. Come back later when progress has been made.': >-
   ऐप का यह हिस्सा अभी तैयार नहीं है। बाद में वापस आएँ जब प्रगति हुई हो
 
 # Webkit Menu Bar
 File: 'फ़ाइल'
-Quit: 'छोड़ना'
+Quit: 'बाहर आएं'
 Edit: 'संपादित करें'
-Undo: 'पूर्ववत करें'
+Undo: 'अनडू करें'
 Redo: 'फिर से करें'
-Cut: 'कट'
-Copy: 'प्रतिलिपि'
+Cut: 'काटें'
+Copy: 'कापी करें'
 Paste: 'पेस्ट करें'
-Delete: 'निकाले'
+Delete: 'मिटाएं'
 Select all: 'सबको चुनें'
 Reload: 'फिरसे लोड करे'
-Force Reload: 'फ़ोर्स से फिरसे लोड करे'
-Toggle Developer Tools: 'Developer tools टॉगल करे'
+Force Reload: 'फोर्स रीलोड'
+Toggle Developer Tools: 'डेवलपर टूल टॉगल करें'
 Actual size: 'वास्तविक आकार'
-Zoom in: 'Zoom in'
-Zoom out: 'Zoom out'
-Toggle fullscreen: 'फ़ुलस्क्रीन टॉगल करे'
+Zoom in: 'ज़ूम इन'
+Zoom out: 'ज़ूम आउट'
+Toggle fullscreen: 'फ़ुलस्क्रीन टॉगल करें'
 Window: 'विंडो'
-Minimize: 'मिनिमाइज़ (Minimize) करे'
-Close: 'बंद करे'
-Back: 'पीछे'
-Forward: 'आगे'
+Minimize: 'मिनिमाइज़ करें'
+Close: 'बंद करें'
+Back: 'पीछे जाएँ'
+Forward: 'आगे जाएँ'
 
-Version {versionNumber} is now available!  Click for more details: 'Version {versionNumber} आ गया है! और details
-  के लिए इधर click करे।'
-Download From Site: 'साइट से डाउनलोड (download) करे'
-A new blog is now available, {blogTitle}. Click to view more: 'एक नया ब्लॉग है, {blogTitle}। और जानने
-  के लिए इधर click करिए'
+Version {versionNumber} is now available!  Click for more details: 'संस्करण {versionNumber}
+  अब उपलब्ध है! अधिक विवरण के लिए क्लिक करें'
+Download From Site: 'साइट से डाउनलोड करें'
+A new blog is now available, {blogTitle}. Click to view more: 'एक नया ब्लॉग अब उपलब्ध
+  है, {blogTitle}। अधिक देखने के लिए क्लिक करें'
 
 # Search Bar
-Search / Go to URL: 'Search / URL पर जाए'
+Search / Go to URL: 'खोज / यूआरएल पर जाएं'
   # In Filter Button
 Search Filters:
-  Search Filters: 'Search फ़िल्टर'
+  Search Filters: 'खोज फ़िल्टर'
   Sort By:
-    Sort By: 'सॉर्ट करे'
+    Sort By: 'इसके अनुसार क्रमबद्ध करें'
     Most Relevant: 'सबसे प्रासंगिक'
     Rating: 'रेटिंग'
-    Upload Date: 'अपलोड दिवस'
+    Upload Date: 'अपलोड की तारीख़'
     View Count: 'दृश्य गणना'
   Time:
-    Time: 'वक्त'
-    Any Time: 'किसी भी वक्त'
+    Time: 'समय'
+    Any Time: 'किसी भी समय'
     Last Hour: 'पिछले घंटे'
     Today: 'आज'
     This Week: 'इस हफ़्ते'
@@ -56,87 +56,118 @@ Search Filters:
     This Year: 'इस साल'
   Type:
     Type: 'प्रकार'
-    All Types: 'सब प्रकार'
-    Videos: 'विडीयोज'
-    Channels: 'चैनले'
+    All Types: 'सब प्रकार के'
+    Videos: 'वीडियो'
+    Channels: 'चैनल'
     #& Playlists
   Duration:
     Duration: 'अवधि'
-    All Durations: 'सब अवधि'
-    Short (< 4 minutes): 'छोटे (<४ मिनट)'
-    Long (> 20 minutes): 'बड़े (>२० मिनट)'
+    All Durations: 'सभी अवधियाँ'
+    Short (< 4 minutes): 'छोटे (<4 मिनट)'
+    Long (> 20 minutes): 'बड़े (>20 मिनट)'
   # On Search Page
-  Search Results: 'खोजे परिणाम'
+  Search Results: 'खोज के परिणाम'
   Fetching results. Please wait: 'परिणाम ला रहे है। कृपया प्रतीक्षा करे'
   Fetch more results: 'ज़्यादा परिणाम लाए'
 # Sidebar
-  There are no more results for this search: इस सर्च के लिए और परिणाम नहो है।
+  There are no more results for this search: इस खोज के लिए और कोई परिणाम नहीं है
 Subscriptions:
     # On Subscriptions Page
   Subscriptions: 'सब्सक्रिप्शन'
   Latest Subscriptions: 'सबसे नए सब्सक्रिप्शन'
   This profile has a large number of subscriptions.  Forcing RSS to avoid rate limiting: 'यह
-    प्रोफ़ाइल (profile)के पास बहुत सारे सब्सक्रिप्शने है।  RSS को बल से रटे लिमिटिंग
-    (rate limiting) से बचाए'
-  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'आपकेय
-    सब्सक्रिप्शन लिस्ट अब के लिए ख़ाली है। सब्सक्रिप्शन add करने से इधर देख सक्ते
-    है।'
-  'Getting Subscriptions. Please wait.': 'सब्सक्रिप्शने (subscriptions) ढूंड रहे है।
-    कृपया रुके।'
-  Refresh Subscriptions: 'सब्सक्रिप्शने Refresh करे'
-  Load More Videos: 'ज़्यादा विडीओए लोड करे'
+    प्रोफ़ाइल के पास बहुत सारे सब्सक्रिप्शनस है।  RSS को बलपूर्वक प्रयोग करके रेट
+    लिमिटिंग से बचाएं'
+  'Your Subscription list is currently empty. Start adding subscriptions to see them here.': 'आपके
+    सब्सक्रिप्शन सूची वर्तमान में ख़ाली है। उन्हें यहां देखने के लिए सब्सक्रिप्शन
+    जोड़ना प्रारंभ करें।'
+  'Getting Subscriptions. Please wait.': 'सब्सक्रिप्शन प्राप्त कर रहे हैं, कृपया प्रतीक्षा
+    करें।'
+  Refresh Subscriptions: 'सब्सक्रिप्शन ताज़ा करें'
+  Load More Videos: 'और वीडियो लोड करें'
+  Error Channels: त्रुटि वाले चैनल
+  Disabled Automatic Fetching: आपने स्वचालित सदस्यता लाना अक्षम कर दिया है। सदस्यताओं
+    को यहां देखने के लिए उन्हें रीफ़्रेश करें।
+  Empty Channels: आपके सब्सक्राइब किए गए चैनल में वर्तमान में कोई वीडियो नहीं है।
 Trending:
-  Trending: 'ट्रेनडिंग'
-Most Popular: 'सबसे ज़्यादा देखा हुआ'
-Playlists: 'प्लेलिस्टे (playlists)'
+  Trending: 'रुझान में'
+  Music: संगीत
+  Default: डिफ़ॉल्ट
+  Movies: मूवीज
+  Trending Tabs: ट्रेंडिंग टैब्स
+  Gaming: गेमिंग
+Most Popular: 'सबसे लोकप्रिय'
+Playlists: 'प्लेलिस्ट'
 User Playlists:
-  Your Playlists: 'आपके प्लेलिस्टे'
+  Your Playlists: 'आपकी प्लेलिस्ट'
   Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: आपके
-    पास बचाए गए वीडियोए नहीं हैं। एक वीडियो के कोने पर सेव बटन पर क्लिक (click) करें,
-    यहां लिस्ट पर वही आएगा
+    सहेजे गए वीडियो खाली हैं। किसी वीडियो को यहां सूचीबद्ध करने के लिए उसके कोने पर
+    सहेजें बटन पर क्लिक करें
   Playlist Message: यह पृष्ठ पूरी तरह से काम करने वाली प्लेलिस्ट को प्रतिबिंबित नहीं
     करता है। यह केवल उन वीडियो को सूचीबद्ध करता है जिन्हें आपने सहेजा है या पसंदीदा
     है। जब काम समाप्त हो जाता है, तो वर्तमान में यहां सभी वीडियो 'पसंदीदा' प्लेलिस्ट
     में स्थानांतरित हो जाएंगे।
+  Empty Search Message: इस प्लेलिस्ट में आपकी खोज से मेल खाने वाला कोई वीडियो नहीं
+    है
+  Search bar placeholder: प्लेलिस्ट में खोजें
 History:
   # On History Page
   History: 'इतिहास'
   Watch History: 'देखने का इतिहास'
-  Your history list is currently empty.: 'आपके देखे गए वीडियो की सूची खली है।'
+  Your history list is currently empty.: 'आपकी इतिहास सूची वर्तमान में खाली है।'
+  Empty Search Message: आपके इतिहास में ऐसा कोई वीडियो नहीं है जो आपकी खोज से मेल
+    खाता हो
+  Search bar placeholder: इतिहास में खोजें
 Settings:
   # On Settings Page
-  Settings: 'स्थापना'
-  The app needs to restart for changes to take effect. Restart and apply change?: 'ऐप
-    को प्रभावी होने वाले परिवर्तनों के लिए पुनः आरंभ करने की आवश्यकता है। Restart
-    और परिवर्तन लागू करें?'
+  Settings: 'सेटिंग्स'
+  The app needs to restart for changes to take effect. Restart and apply change?: 'परिवर्तनों
+    को प्रभावी करने के लिए ऐप को पुनः आरंभ करने की आवश्यकता है। पुनः आरंभ करें और
+    परिवर्तन लागू करें?'
   General Settings:
-    General Settings: 'सामान्य सेटिंग्स'
-    Check for Updates: ''
-    Check for Latest Blog Posts: ''
-    Fallback to Non-Preferred Backend on Failure: ''
-    Enable Search Suggestions: ''
-    Default Landing Page: ''
-    Locale Preference: ''
+    General Settings: 'जनरल सेटिंग्स'
+    Check for Updates: 'अपडेट के लिए जाँच शुरु करें'
+    Check for Latest Blog Posts: 'नवीनतम ब्लॉग पोस्ट के लिए जाँच करें'
+    Fallback to Non-Preferred Backend on Failure: 'विफलता पर गैर-पसंदीदा बैकएंड पर
+      फ़ॉलबैक'
+    Enable Search Suggestions: 'खोज सुझाव सक्षम करें'
+    Default Landing Page: 'डिफ़ॉल्ट लैंडिंग पृष्ठ'
+    Locale Preference: 'स्थानीय प्रेफरन्स'
     Preferred API Backend:
-      Preferred API Backend: ''
-      Local API: ''
-      Invidious API: ''
+      Preferred API Backend: 'पसंदीदा एपीआई बैकएंड'
+      Local API: 'स्थानीय एपीआई'
+      Invidious API: 'इनविडियस एपीआई'
     Video View Type:
-      Video View Type: ''
-      Grid: ''
-      List: ''
+      Video View Type: 'वीडियो दृश्य प्रकार'
+      Grid: 'ग्रिड'
+      List: 'सूची'
     Thumbnail Preference:
-      Thumbnail Preference: ''
-      Default: ''
-      Beginning: ''
-      Middle: ''
-      End: ''
+      Thumbnail Preference: 'थंमनेल प्रेफरन्स'
+      Default: 'डिफ़ॉल्ट'
+      Beginning: 'शुरुआत'
+      Middle: 'मध्य'
+      End: 'अंत'
     'Invidious Instance (Default is https://invidious.snopyta.org)': ''
-    Region for Trending: ''
+    Region for Trending: 'ट्रेंडिंग के लिए क्षेत्र'
         #! List countries
+    No default instance has been set: कोई डिफ़ॉल्ट इंस्टेंस सेट नहीं किया गया है
+    External Link Handling:
+      Open Link: लिंक खोलें
+      Ask Before Opening Link: लिंक खोलने से पहले पूछें
+      External Link Handling: बाहरी लिंक हैंडलिंग
+      No Action: कोई कार्रवाई नहीं
+    System Default: सिस्टम डिफ़ॉल्ट
+    Current instance will be randomized on startup: स्टार्टअप पर वर्तमान इंस्टेंस
+      यादृच्छिक किया जाएगा
+    The currently set default instance is {instance}: वर्तमान में निर्धारित डिफ़ॉल्ट
+      इंस्टेंस {instance} है
+    Clear Default Instance: डिफ़ॉल्ट इंस्टेंस साफ़ करें
+    View all Invidious instance information: इनविडियस इंस्टेंस की सभी जानकारी देखें
+    Set Current Instance as Default: वर्तमान इंस्टेंस को डिफ़ॉल्ट के रूप में सेट करें
+    Current Invidious Instance: वर्तमान इनविडियस इंस्टेंस
   Theme Settings:
-    Theme Settings: ''
-    Match Top Bar with Main Color: ''
+    Theme Settings: 'थीम सेटिंग्स'
+    Match Top Bar with Main Color: 'टॉप बार को मेन कलर से मैच करें'
     Expand Side Bar by Default: ''
     Disable Smooth Scrolling: ''
     UI Scale: ''
@@ -171,7 +202,7 @@ Settings:
     Play Next Video: ''
     Turn on Subtitles by Default: ''
     Autoplay Videos: ''
-    Proxy Videos Through Invidious: ''
+    Proxy Videos Through Invidious: 'इनविडियस के माध्यम से प्रॉक्सी वीडियो'
     Autoplay Playlists: ''
     Enable Theatre Mode by Default: ''
     Default Volume: ''
@@ -294,7 +325,7 @@ About:
 
   Latest FreeTube News: ''
 
-  Email: ईमेल
+  Email: ईमेल करें
 Profile:
   Profile Select: ''
   All Channels: ''
@@ -369,12 +400,12 @@ Video:
   Copy YouTube Link: ''
   Open YouTube Embedded Player: ''
   Copy YouTube Embedded Player Link: ''
-  Open in Invidious: ''
-  Copy Invidious Link: ''
+  Open in Invidious: 'इनविडियस में खोलें'
+  Copy Invidious Link: 'इनविडियस लिंक को कॉपी करें'
   Open Channel in YouTube: ''
   Copy YouTube Channel Link: ''
-  Open Channel in Invidious: ''
-  Copy Invidious Channel Link: ''
+  Open Channel in Invidious: 'इनविडियस में चैनल खोलें'
+  Copy Invidious Channel Link: 'इनवीडियस चैनल लिंक कॉपी करें'
   View: ''
   Views: ''
   Loop Playlist: ''
@@ -395,7 +426,9 @@ Video:
   Live Chat is currently not supported in this build.: ''
   'Chat is disabled or the Live Stream has ended.': ''
   Live chat is enabled.  Chat messages will appear here once sent.: ''
-  'Live Chat is currently not supported with the Invidious API.  A direct connection to YouTube is required.': ''
+  'Live Chat is currently not supported with the Invidious API.  A direct connection to YouTube is required.': 'लाइव
+    चैट वर्तमान में Invidious API के साथ समर्थित नहीं है। YouTube से सीधा कनेक्शन
+    आवश्यक है।'
   Download Video: ''
   video only: ''
   audio only: ''
@@ -456,8 +489,8 @@ Playlist:
     Share Playlist: ''
     Copy YouTube Link: ''
     Open in YouTube: ''
-    Copy Invidious Link: ''
-    Open in Invidious: ''
+    Copy Invidious Link: 'इनविडियस लिंक को कॉपी करें'
+    Open in Invidious: 'इनवीडियस में खोलें'
 
 # On Video Watch Page
 #* Published
@@ -478,9 +511,11 @@ Share:
   Copy Embed: ''
   Open Embed: ''
   # On Click
-  Invidious URL copied to clipboard: ''
-  Invidious Embed URL copied to clipboard: ''
-  Invidious Channel URL copied to clipboard: ''
+  Invidious URL copied to clipboard: 'इनवीडियस URL क्लिपबोर्ड पर कापी किया गया'
+  Invidious Embed URL copied to clipboard: 'इनवीडियस एम्बेड URL क्लिपबोर्ड पर कापी
+    किया गया'
+  Invidious Channel URL copied to clipboard: 'इनविडियस चैनल URL क्लिपबोर्ड पर कॉपी
+    किया गया'
   YouTube URL copied to clipboard: ''
   YouTube Embed URL copied to clipboard: ''
   YouTube Channel URL copied to clipboard: ''
@@ -509,22 +544,35 @@ Up Next: ''
 #Tooltips
 Tooltips:
   General Settings:
-    Preferred API Backend: ''
+    Preferred API Backend: 'वह बैकएंड चुनें जिसका उपयोग FreeTube डेटा प्राप्त करने
+      के लिए करता है। स्थानीय एपीआई एक अंतर्निहित चिमटा है। Invidious API को कनेक्ट
+      करने के लिए Invidious सर्वर की आवश्यकता होती है।'
     Fallback to Non-Preferred Backend on Failure: ''
     Thumbnail Preference: ''
-    Invidious Instance: ''
+    Invidious Instance: 'वह इनविडियस इंस्टेंस जिससे FreeTube API कॉल के लिए कनेक्ट
+      होगा।'
     Region for Trending: ''
   Player Settings:
-    Force Local Backend for Legacy Formats: ''
-    Proxy Videos Through Invidious: ''
+    Force Local Backend for Legacy Formats: 'केवल तभी काम करता है जब Invidious API
+      आपका डिफ़ॉल्ट हो। जब सक्षम किया जाता है, तो स्थानीय एपीआई चलेगा और इसके द्वारा
+      लौटाए गए लीगेसी प्रारूपों का उपयोग करेगा, बजाय इसके कि इनविदियस द्वारा लौटाए
+      गए। मदद करता है जब Invidious द्वारा लौटाए गए वीडियो देश प्रतिबंधों के कारण नहीं
+      चलते हैं।'
+    Proxy Videos Through Invidious: 'YouTube से सीधा संबंध बनाने के बजाय वीडियो परोसने
+      के लिए Invidious से जुड़ेंगे। एपीआई वरीयता को ओवरराइड करता है।'
     Default Video Format: ''
   Subscription Settings:
     Fetch Feeds from RSS: ''
 
 # Toast Messages
+  External Player Settings:
+    External Player: बाहरी प्लेयर चुनने पर, थंबनेल पर बाहरी प्लेयर में वीडियो खोलने
+      के लिए (प्लेलिस्ट अगर समर्थित है) एक आइकन प्रदर्शित होगा। चेतावनी, द्वेषपूर्ण
+      सेटिंग्स बाहरी खिलाड़ियों को प्रभावित नहीं करती हैं।
 Local API Error (Click to copy): ''
-Invidious API Error (Click to copy): ''
-Falling back to Invidious API: ''
+Invidious API Error (Click to copy): 'कपटपूर्ण एपीआई त्रुटि (कॉपी करने के लिए क्लिक
+  करें)'
+Falling back to Invidious API: 'Invidious API पर वापस आना'
 Falling back to the local API: ''
 This video is unavailable because of missing formats. This can happen due to country unavailability.: ''
 Subscriptions have not yet been implemented: ''
@@ -541,4 +589,23 @@ Canceled next video autoplay: ''
 
 Yes: ''
 No: ''
-More: ज़्यादा
+More: अधिक
+New Window: नई विंडो
+Open New Window: नई विंडो खोलें
+Channels:
+  Channels: चैनल
+  Search bar placeholder: चैनल खोजें
+  Count: '{number} चैनल मिला(मिले)।'
+  Title: चैनल सूची
+  Empty: आपकी चैनल सूची वर्तमान में खाली है।
+  Unsubscribe: अनसब्सक्राईब करें
+  Unsubscribed: '{channelName} को आपकी सब्सक्रिप्शन से हटा दिया गया है'
+  Unsubscribe Prompt: क्या आप वाकई "{channelName}" की सदस्यता छोड़ना चाहते हैं?
+Are you sure you want to open this link?: क्या आप वाकई इस लिंक को खोलना चाहते हैं?
+Search Bar:
+  Clear Input: इनपुट खाली करें
+Default Invidious instance has been set to {instance}: डिफ़ॉल्ट इनविडियस इंस्टेंस
+  को {instance} पर सेट कर दिया गया है
+Default Invidious instance has been cleared: डिफ़ॉल्ट इनविडियस इंस्टेंस साफ़ कर दिया
+  गया है
+Preferences: प्रेफरन्स

From f6942903ed6b4da45b2e8f4acd9dc0ded930dca5 Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Wed, 21 Dec 2022 02:25:07 +0000
Subject: [PATCH 114/301] Update stale.yml (#2985)

---
 .github/workflows/stale.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 02a937fe39df..0c0adba2b5a1 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -19,3 +19,5 @@ jobs:
           days-before-pr-close: 14
           stale-issue-label: 'U: stale'
           stale-pr-label: 'PR: stale'
+          exempt-pr-labels: 'PR: WIP'
+          exempt-issue-labels: 'U: skip-stale'

From 4711c75909e8b894db5ec3176a60468cb4a1954f Mon Sep 17 00:00:00 2001
From: Milo Ivir <mail@milotype.de>
Date: Wed, 21 Dec 2022 14:27:45 +0000
Subject: [PATCH 115/301] Translated using Weblate (Croatian)

Currently translated at 100.0% (651 of 651 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/hr/
---
 static/locales/hr.yaml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/static/locales/hr.yaml b/static/locales/hr.yaml
index e48018e91dcb..5dde4c1ce756 100644
--- a/static/locales/hr.yaml
+++ b/static/locales/hr.yaml
@@ -387,6 +387,8 @@ Settings:
     Hide Live Streams: Sakrij prijenose uživo
     Hide Chapters: Sakrij poglavlja
     Hide Upcoming Premieres: Sakrij nadolazeće premijere
+    Hide Channels: Sakrij videa iz kanala
+    Hide Channels Placeholder: Ime kanala ili ID
   The app needs to restart for changes to take effect. Restart and apply change?: Promjene
     će se primijeniti nakon ponovnog pokeretanja programa. Ponovo pokrenuti program?
   Proxy Settings:
@@ -444,6 +446,16 @@ Settings:
       programa. Preporučujemo spremanje sigurnosnih kopija. Koristi na vlastitu odgovornost!
     Experimental Settings: Eksperimentalne postavke
     Replace HTTP Cache: Zamijeni HTTP predmemoriju
+  Password Dialog:
+    Password Incorrect: Lozinka neispravna
+    Unlock: Otključaj
+    Enter Password To Unlock: Za otključavanje postavki upiši lozinku
+    Password: Lozinka
+  Password Settings:
+    Password Settings: Lozinka za postavke
+    Set Password: Postavi lozinku
+    Remove Password: Ukloni lozinku
+    Set Password To Prevent Access: Postavi lozinku za sprečavanja pristupa postavkama
 About:
   #On About page
   About: 'Informacije'
@@ -887,6 +899,10 @@ Tooltips:
   Experimental Settings:
     Replace HTTP Cache: Deaktivira Electronovu HTTP predmemoriju temeljenu na disku
       i aktivira prilagođenu predmemoriju slika u memoriji. Povećava korištenje RAM-a.
+  Distraction Free Settings:
+    Hide Channels: Upiši ime kanala ili ID kanala za skrivanje svih videa, zbirki
+      kao i sam kanal u pretrazi ili u trendovima. Upisano ime kanala se mora potpuno
+      poklapati i razlikuje velika i mala slova.
 Playing Next Video Interval: Trenutna reprodukcija sljedećeg videa. Pritisni za prekid.
   | Reprodukcija sljedećeg videa za {nextVideoInterval} sekunde. Pritisni za prekid.
   | Reprodukcija sljedećeg videa za {nextVideoInterval} sekundi. Pritisni za prekid.
@@ -935,3 +951,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Popis poglavlja skriven,
     aktualno poglavlje: {chapterName}'
 Preferences: Korisničke postavke
+Ok: U redu

From 7ea690bf9d7cf651df9f5f0027318ed3e0cf5772 Mon Sep 17 00:00:00 2001
From: Simon Epstein <simon@simondo.com>
Date: Thu, 22 Dec 2022 14:10:30 +0000
Subject: [PATCH 116/301] Set width so that overflow css rules are applied.
 (#2988)

Added overflow-wrap break word so that more of the clipped title is
displayed.

Co-authored-by: Simon Epstein <simon.epstein@67bricks.com>
---
 src/renderer/views/SubscribedChannels/SubscribedChannels.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.css b/src/renderer/views/SubscribedChannels/SubscribedChannels.css
index b8e03f017ae2..ae8eea032df8 100644
--- a/src/renderer/views/SubscribedChannels/SubscribedChannels.css
+++ b/src/renderer/views/SubscribedChannels/SubscribedChannels.css
@@ -47,6 +47,8 @@
   text-align: center;
   overflow: hidden;
   text-overflow: ellipsis;
+  overflow-wrap: break-word;
+  width: 100%;
   display: -webkit-box;
   -webkit-line-clamp: 3;
   -webkit-box-orient: vertical;

From c79674d95604de2cc7dce2ca68c926a7ccaffecb Mon Sep 17 00:00:00 2001
From: petaded <74797538+petaded@users.noreply.github.com>
Date: Thu, 22 Dec 2022 14:22:12 +0000
Subject: [PATCH 117/301] Support extra youtube embed playlist links (#2972)

* Fix strange embed playlist links missing /

* support embed/videoseries links

* remove duplicated replace line

Co-authored-by: petaded <code@zikl.co.uk>
---
 src/renderer/store/modules/utils.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index 786bff974314..77a8385cfce4 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -292,7 +292,12 @@ const actions = {
       // youtube.com/embed
       function() {
         if (urlObject.pathname.match(/^\/embed\/[A-Za-z0-9_-]+$/)) {
-          extractParams(urlObject.pathname.replace('/embed/', ''))
+          const urlTail = urlObject.pathname.replace('/embed/', '')
+          if (urlTail === 'videoseries') {
+            paramsObject.playlistId = urlObject.searchParams.get('list')
+          } else {
+            extractParams(urlTail)
+          }
           return paramsObject
         }
       },
@@ -366,7 +371,7 @@ const actions = {
       /^\/(?:(?<type>channel|user|c)\/)?(?<channelId>[^/]+)(?:\/(join|featured|videos|playlists|about|community|channels))?\/?$/
 
     const typePatterns = new Map([
-      ['playlist', /^\/playlist\/?$/],
+      ['playlist', /^(\/playlist\/?|\/embed(\/?videoseries)?)$/],
       ['search', /^\/results\/?$/],
       ['hashtag', /^\/hashtag\/([^/?&#]+)$/],
       ['channel', channelPattern]

From 869e45ccd569d34b2922e8f5810df48655988329 Mon Sep 17 00:00:00 2001
From: vr10t <96934297+vr10t@users.noreply.github.com>
Date: Thu, 22 Dec 2022 15:21:32 +0000
Subject: [PATCH 118/301] Option to skip through the video by scrolling (#2418)

* initial commit

* remove extra play button toggle

* add missing comment

Co-authored-by: Alin <ai6@tutanota.com>
Co-authored-by: ChunkyPtogrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
---
 .../ft-video-player/ft-video-player.js        | 21 +++++++++++++++++++
 .../player-settings/player-settings.js        |  5 +++++
 .../player-settings/player-settings.vue       |  9 ++++++++
 src/renderer/store/modules/settings.js        |  1 +
 static/locales/en-US.yaml                     |  2 ++
 5 files changed, 38 insertions(+)

diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
index ec91441c6ef3..aa8c84eb2ea4 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -182,6 +182,10 @@ export default Vue.extend({
       return this.$store.getters.getVideoPlaybackRateMouseScroll
     },
 
+    videoSkipMouseScroll: function () {
+      return this.$store.getters.getVideoSkipMouseScroll
+    },
+
     useSponsorBlock: function () {
       return this.$store.getters.getUseSponsorBlock
     },
@@ -478,6 +482,9 @@ export default Vue.extend({
           this.player.el_.firstChild.style.pointerEvents = 'none'
           this.player.on('click', this.handlePlayerClick)
         }
+        if (this.videoSkipMouseScroll) {
+          this.player.on('wheel', this.mouseScrollSkip)
+        }
 
         this.player.on('fullscreenchange', this.fullscreenOverlay)
         this.player.on('fullscreenchange', this.toggleFullscreenClass)
@@ -721,6 +728,20 @@ export default Vue.extend({
       }
     },
 
+    mouseScrollSkip: function (event) {
+      // ensure that the mouse is over the player
+      if (event.target && (event.target.matches('.vjs-tech') || event.target.matches('.ftVideoPlayer'))) {
+        event.preventDefault()
+
+        if (event.wheelDelta > 0) {
+          this.changeDurationBySeconds(this.defaultSkipInterval * this.player.playbackRate())
+        }
+        if (event.wheelDelta < 0) {
+          this.changeDurationBySeconds(-this.defaultSkipInterval * this.player.playbackRate())
+        }
+      }
+    },
+
     handlePlayerClick: function (event) {
       if (event.target.matches('.ftVideoPlayer')) {
         if (event.ctrlKey || event.metaKey) {
diff --git a/src/renderer/components/player-settings/player-settings.js b/src/renderer/components/player-settings/player-settings.js
index 8084b5a530ce..c2c7551bd952 100644
--- a/src/renderer/components/player-settings/player-settings.js
+++ b/src/renderer/components/player-settings/player-settings.js
@@ -129,6 +129,10 @@ export default Vue.extend({
       return this.$store.getters.getVideoPlaybackRateMouseScroll
     },
 
+    videoSkipMouseScroll: function () {
+      return this.$store.getters.getVideoSkipMouseScroll
+    },
+
     displayVideoPlayButton: function () {
       return this.$store.getters.getDisplayVideoPlayButton
     },
@@ -274,6 +278,7 @@ export default Vue.extend({
       'updateDefaultQuality',
       'updateVideoVolumeMouseScroll',
       'updateVideoPlaybackRateMouseScroll',
+      'updateVideoSkipMouseScroll',
       'updateDisplayVideoPlayButton',
       'updateEnterFullscreenOnDisplayRotate',
       'updateMaxVideoPlaybackRate',
diff --git a/src/renderer/components/player-settings/player-settings.vue b/src/renderer/components/player-settings/player-settings.vue
index 3112abcbaa8c..43fd0cbb3489 100644
--- a/src/renderer/components/player-settings/player-settings.vue
+++ b/src/renderer/components/player-settings/player-settings.vue
@@ -35,6 +35,7 @@
         <ft-toggle-switch
           :label="$t('Settings.Player Settings.Scroll Volume Over Video Player')"
           :compact="true"
+          :disabled="videoSkipMouseScroll"
           :default-value="videoVolumeMouseScroll"
           @change="updateVideoVolumeMouseScroll"
         />
@@ -45,6 +46,14 @@
           :tooltip="$t('Tooltips.Player Settings.Scroll Playback Rate Over Video Player')"
           @change="updateVideoPlaybackRateMouseScroll"
         />
+        <ft-toggle-switch
+          :label="$t('Settings.Player Settings.Skip by Scrolling Over Video Player')"
+          :compact="true"
+          :disabled="videoVolumeMouseScroll"
+          :default-value="videoSkipMouseScroll"
+          :tooltip="$t('Tooltips.Player Settings.Skip by Scrolling Over Video Player')"
+          @change="updateVideoSkipMouseScroll"
+        />
       </div>
       <div class="switchColumn">
         <ft-toggle-switch
diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
index a5003c3fb9ee..fbcdbb97d343 100644
--- a/src/renderer/store/modules/settings.js
+++ b/src/renderer/store/modules/settings.js
@@ -266,6 +266,7 @@ const state = {
   useSponsorBlock: false,
   videoVolumeMouseScroll: false,
   videoPlaybackRateMouseScroll: false,
+  videoSkipMouseScroll: false,
   videoPlaybackRateInterval: 0.25,
   downloadFolderPath: '',
   downloadBehavior: 'download',
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 23ae156ad5af..7eec5b085ddd 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -237,6 +237,7 @@ Settings:
     Enable Theatre Mode by Default: Enable Theatre Mode by Default
     Scroll Volume Over Video Player: Scroll Volume Over Video Player
     Scroll Playback Rate Over Video Player: Scroll Playback Rate Over Video Player
+    Skip by Scrolling Over Video Player: Skip by Scrolling Over Video Player
     Display Play Button In Video Player: Display Play Button In Video Player
     Enter Fullscreen on Display Rotate: Enter Fullscreen on Display Rotate
     Next Video Interval: Next Video Interval
@@ -775,6 +776,7 @@ Tooltips:
       hold the Control key (Command Key on Mac) and scroll the mouse wheel forwards or backwards to control
       the playback rate. Press and hold the Control key (Command Key on Mac) and left click the mouse
       to quickly return to the default playback rate (1x unless it has been changed in the settings).
+    Skip by Scrolling Over Video Player: Use the scroll wheel to skip through the video, MPV style.
   External Player Settings:
     External Player: Choosing an external player will display an icon, for opening the
       video (playlist if supported) in the external player, on the thumbnail. Warning, Invidious settings do not affect external players.

From b0ab6f676eabaeb139998f36256fe2390f35c4c3 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Thu, 22 Dec 2022 15:45:20 +0000
Subject: [PATCH 119/301] Translated using Weblate (Spanish)

Currently translated at 100.0% (653 of 653 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/es/
---
 static/locales/es.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/static/locales/es.yaml b/static/locales/es.yaml
index 515e3cc3570e..f1eb345db2ca 100644
--- a/static/locales/es.yaml
+++ b/static/locales/es.yaml
@@ -268,6 +268,8 @@ Settings:
         Milisegundo 3 dígitos. %i Video ID. También puede utilizar "\" o "/" para
         crear subcarpetas.
     Enter Fullscreen on Display Rotate: Cambiar a pantalla completa al girar la pantalla
+    Skip by Scrolling Over Video Player: Omitir el desplazarse sobre el reproductor
+      de video
   Privacy Settings:
     Privacy Settings: 'Privacidad'
     Remember History: 'Recordar historial'
@@ -867,6 +869,8 @@ Tooltips:
       y mantén la tecla Control (Comando en Mac) y haz clic izquierdo para volver
       a la velocidad de reproducción por defecto (1x o la que hayas configurado en
       ajustes).
+    Skip by Scrolling Over Video Player: Use la rueda de desplazamiento para saltar
+      el video, estilo MPV.
   General Settings:
     Region for Trending: La región de las tendencias permite ver los vídeos más populares
       en un país determinado. YouTube no admite todos los países mostrados.

From 6dcd431ab217b1d5457e383c2bc5d1f04cc406c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20W=C3=B3jcicki?= <terkaz@gmx.com>
Date: Thu, 22 Dec 2022 18:02:12 +0000
Subject: [PATCH 120/301] Translated using Weblate (Polish)

Currently translated at 100.0% (653 of 653 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pl/
---
 static/locales/pl.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml
index e5eeb5033c87..f6766f58c32d 100644
--- a/static/locales/pl.yaml
+++ b/static/locales/pl.yaml
@@ -249,7 +249,7 @@ Settings:
     Display Play Button In Video Player: Pokaż przycisk odtwarzania na odtwarzaczu
     Fast-Forward / Rewind Interval: Interwał przewijania
     Scroll Playback Rate Over Video Player: Kontroluj szybkość odtwarzania kółkiem
-      myszy na obszarze odtwarzania
+      myszy na obszarze odtwarzacza
     Max Video Playback Rate: Maksymalna szybkość odtwarzania
     Video Playback Rate Interval: Przeskoki w wyborze prędkości odtwarzania
     Screenshot:
@@ -270,6 +270,8 @@ Settings:
       Enable: Włącz zrzuty ekranu
     Enter Fullscreen on Display Rotate: Przyłącz na tryb pełnoekranowy przy zmianie
       orientacji wyświetlacza
+    Skip by Scrolling Over Video Player: Przewijaj film, kręcąc kółkiem myszy na obszarze
+      odtwarzacza
   Subscription Settings:
     Subscription Settings: 'Ustawienia subskrypcji'
     Hide Videos on Watch: 'Ukrywaj filmy po obejrzeniu'
@@ -896,6 +898,8 @@ Tooltips:
       aby kontrolować szybkość odtwarzania. Przytrzymaj klawisz „Ctrl” („Command”
       na Mac-u) i kliknij lewym przyciskiem myszy, by szybko powrócić do domyślnej
       wartości (1x, chyba że została zmieniona w ustawieniach).
+    Skip by Scrolling Over Video Player: Użyj kółka myszy, by przewijać film tak jak
+      w MPV.
   Privacy Settings:
     Remove Video Meta Files: Po włączeniu FreeTube automatycznie usunie pliki metadanych
       utworzone podczas odtwarzania filmu, gdy strona odtwarzania zostanie zamknięta.

From 640e618603a9eff05bb136b7605ea5c9a92d46a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Thu, 22 Dec 2022 17:54:59 +0000
Subject: [PATCH 121/301] Translated using Weblate (Turkish)

Currently translated at 100.0% (653 of 653 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/tr/
---
 static/locales/tr.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/static/locales/tr.yaml b/static/locales/tr.yaml
index 3f2475df1e2e..46cc7a92a0f7 100644
--- a/static/locales/tr.yaml
+++ b/static/locales/tr.yaml
@@ -270,6 +270,7 @@ Settings:
         Milisaniyesi 3 basamak. %i Video Kimliği. Alt klasörler oluşturmak için "\"
         veya "/" kullanabilirsiniz.
     Enter Fullscreen on Display Rotate: Ekran Döndürüldüğünde Tam Ekrana Geç
+    Skip by Scrolling Over Video Player: Video Oynatıcı Üzerinde Kaydırarak Atla
   Privacy Settings:
     Privacy Settings: 'Gizlilik Ayarları'
     Remember History: 'Geçmişi Hatırla'
@@ -864,6 +865,8 @@ Tooltips:
       hızını denetlemek için fare tekerleğini ileri veya geri kaydırın. Öntanımlı
       oynatma hızına (ayarlarda değiştirilmediği sürece 1x) hızlı bir şekilde dönmek
       için Ctrl tuşunu (Mac'te Komut tuşu) basılı tutun ve fareye sol tıklayın.
+    Skip by Scrolling Over Video Player: MPV'deki gibi videoda atlamak için kaydırma
+      tekerleğini kullanın.
   General Settings:
     Invidious Instance: FreeTube'un API çağrıları için bağlanacağı Invidious örneği.
     Thumbnail Preference: FreeTube'daki tüm küçük resimler, öntanımlı küçük resim

From 241b2a3620eb16e529892750804b1bbeaac910ca Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Thu, 22 Dec 2022 17:41:10 +0000
Subject: [PATCH 122/301] Translated using Weblate (Galician)

Currently translated at 100.0% (653 of 653 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/gl/
---
 static/locales/gl.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/static/locales/gl.yaml b/static/locales/gl.yaml
index c9356fdd28bb..587cb4a43c38 100644
--- a/static/locales/gl.yaml
+++ b/static/locales/gl.yaml
@@ -276,6 +276,7 @@ Settings:
       a reproducción do vídeo
     Max Video Playback Rate: Velocidade máxima da reprodución do vídeo
     Enter Fullscreen on Display Rotate: Poñase a pantalla enteira o xirala pantalla
+    Skip by Scrolling Over Video Player: Saltar desprazándose polo reprodutor de vídeo
   Privacy Settings:
     Privacy Settings: 'Axustes de privacidade'
     Remember History: 'Lembrar histórico'
@@ -843,6 +844,8 @@ Tooltips:
       premida a tecla Control (tecla Comando no Mac) e prema co botón esquerdo do
       rato para voltar rapidamente á taxa de reprodución predeterminada (1x a menos
       que o modificase na configuración).
+    Skip by Scrolling Over Video Player: Usala roda de desprazamento para saltalo
+      vídeo, estilo MPV.
   Subscription Settings:
     Fetch Feeds from RSS: 'Cando está activado, FreeTube usará RSS no canto do método
       predeterminao para obter as subscricións. RSS é máis rápido e impide o bloqueo

From 532d9ae02456b609333db0bd202796c5f94445f8 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Thu, 22 Dec 2022 20:21:57 +0000
Subject: [PATCH 123/301] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (653 of 653 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/uk/
---
 static/locales/uk.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/static/locales/uk.yaml b/static/locales/uk.yaml
index df751281753c..7307f536164a 100644
--- a/static/locales/uk.yaml
+++ b/static/locales/uk.yaml
@@ -276,6 +276,7 @@ Settings:
         створення вкладених тек.
     Enter Fullscreen on Display Rotate: Переходити в повноекранний режим за обертання
       екрана
+    Skip by Scrolling Over Video Player: Пропустити гортанням відеопрогравача
   Privacy Settings:
     Privacy Settings: 'Налаштування приватності'
     Remember History: 'Збрігати історію'
@@ -826,6 +827,8 @@ Tooltips:
       клавішу Control (клавіша Command на Mac) і клацніть лівою кнопкою миші, щоб
       швидко повернутися до типової швидкості відтворення (1x, якщо вона не була змінена
       в налаштуваннях).
+    Skip by Scrolling Over Video Player: Використовувати колесо прокрутки для прокручування
+      відео в стилі MPV.
   Subscription Settings:
     Fetch Feeds from RSS: 'Якщо ввімкнено, FreeTube використовуватиме RSS замість
       стандартного способу захоплення каналу підписки. RSS швидше і запобігає блокуванню

From b19f78816aa41c7e5f3e2325fcd678cff3074245 Mon Sep 17 00:00:00 2001
From: Eric <hamburger1024@duck.com>
Date: Thu, 22 Dec 2022 23:56:52 +0000
Subject: [PATCH 124/301] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (653 of 653 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/zh_Hans/
---
 static/locales/zh-CN.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/zh-CN.yaml b/static/locales/zh-CN.yaml
index abe103e49560..8df148282352 100644
--- a/static/locales/zh-CN.yaml
+++ b/static/locales/zh-CN.yaml
@@ -248,6 +248,7 @@ Settings:
       Enable: 允许截屏
       Folder Label: 截屏文件夹
     Enter Fullscreen on Display Rotate: 屏幕旋转时进入全屏
+    Skip by Scrolling Over Video Player: 滚动视频播放器跳过
   Subscription Settings:
     Subscription Settings: '订阅设置'
     Hide Videos on Watch: '观看时隐藏视频'
@@ -778,6 +779,7 @@ Tooltips:
       将执行并使用由其回传的的传统格式，而非 Invidious 回传的格式。对因为国家地区限制而不能播放 Invidious回传的影片时有帮助。
     Scroll Playback Rate Over Video Player: 当光标位于视频上方时，按住 Control 键(Mac 上的 Command
       键)，前后滚动鼠标滚轮，控制播放速度。按住 Control 键(Mac 上的 Command 键)，左键点击鼠标快速返回到默认播放速率(1x，除非在设置中改变了数值)。
+    Skip by Scrolling Over Video Player: 使用滚轮跳过视频，MPV 风格。
   General Settings:
     Invidious Instance: FreeTube 要连接到哪个 Invidious 实例进行 API 调用。
     Thumbnail Preference: FreeTube中所有缩略图都会被替换为影片画面而非默认缩略图。

From 46f50dfe4338bfaa900b73b049ebd63e83e0798c Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 23 Dec 2022 02:12:59 +0000
Subject: [PATCH 125/301] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (653 of 653 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/zh_Hant/
---
 static/locales/zh-TW.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/zh-TW.yaml b/static/locales/zh-TW.yaml
index 78e5bd3300d4..1dc5b408fe1e 100644
--- a/static/locales/zh-TW.yaml
+++ b/static/locales/zh-TW.yaml
@@ -250,6 +250,7 @@ Settings:
         為兩位數的分鐘。%S 為兩位數的秒數。%T 為三位數的毫秒。%s 為影片的秒數。%t 為三位數的影片毫秒數。%i 為影片 ID。您也可以使用 "\"
         或 "/" 來建立子資料夾。
     Enter Fullscreen on Display Rotate: 在顯示旋轉時進入全螢幕
+    Skip by Scrolling Over Video Player: 捲動影片播放器跳過
   Subscription Settings:
     Subscription Settings: '訂閱設定'
     Hide Videos on Watch: '觀看時隱藏影片'
@@ -788,6 +789,7 @@ Tooltips:
       API 將會執行並使用由其回傳的的傳統格式，而非 Invidious 回傳的格式。對因為國家地區限制而無法播放 Invidious 回傳的影片時有幫助。
     Scroll Playback Rate Over Video Player: 當游標停在影片上時，按住 Ctrl 鍵（Mac 的話則是 Command 鍵），然後向前或向後滾動滑鼠滾輪來控制播放速度。按住
       Ctrl 鍵（Mac 的話則是 Command 鍵）並點擊滑鼠左鍵以快速回到預設的播放速度（1x，除非在設定中更改）。
+    Skip by Scrolling Over Video Player: 使用滾輪跳過影片，MPV 風格。
   General Settings:
     Invidious Instance: FreeTube 將連線到 Invidious 站台進行 API 呼叫。
     Thumbnail Preference: FreeTube 中所有縮圖都會被替換為影片畫面而非預設縮圖。

From c8444bca30f4e910451648b3dadd824cad3a0656 Mon Sep 17 00:00:00 2001
From: Massimo Pissarello <mapi68@gmail.com>
Date: Fri, 23 Dec 2022 08:32:09 +0000
Subject: [PATCH 126/301] Translated using Weblate (Italian)

Currently translated at 100.0% (653 of 653 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/it/
---
 static/locales/it.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/static/locales/it.yaml b/static/locales/it.yaml
index 3f45312600f4..80e3035f6146 100644
--- a/static/locales/it.yaml
+++ b/static/locales/it.yaml
@@ -271,6 +271,7 @@ Settings:
         2 cifre. %T Millisecondo 3 cifre. %s Durata in secondi del video. %t Millisecondi
         del video 3 cifre. %i ID video. Puoi anche usare \ o / per creare sottocartelle.
     Enter Fullscreen on Display Rotate: Entra a schermo intero su Ruota schermo
+    Skip by Scrolling Over Video Player: Salta scorrendo il lettore video
   Privacy Settings:
     Privacy Settings: 'Impostazioni della privacy'
     Remember History: 'Salva la cronologia'
@@ -875,6 +876,8 @@ Tooltips:
       CTRL (Command su Mac) e clicca con il tasto sinistro del mouse per tornare rapidamente
       alla velocità di riproduzione predefinita (1x a meno che non sia stata cambiata
       nelle impostazioni).
+    Skip by Scrolling Over Video Player: Usa la rotella di scorrimento per saltare
+      il video, in stile MPV.
   Subscription Settings:
     Fetch Feeds from RSS: Se abilitato, FreeTube userà gli RSS invece del metodo standard
       per leggere la tua lista iscrizioni. Gli RSS sono più veloci e impediscono il

From 677dc86f763893f130e380b065235ac139e6b607 Mon Sep 17 00:00:00 2001
From: Fjuro <ifjuro@proton.me>
Date: Fri, 23 Dec 2022 09:17:46 +0000
Subject: [PATCH 127/301] Translated using Weblate (Czech)

Currently translated at 100.0% (653 of 653 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/cs/
---
 static/locales/cs.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml
index 5590a606b9ae..ce163435a5c1 100644
--- a/static/locales/cs.yaml
+++ b/static/locales/cs.yaml
@@ -273,6 +273,7 @@ Settings:
       Quality Label: Kvalita snímku obrazovky
       Folder Button: Vybrat složku
     Enter Fullscreen on Display Rotate: Při otočení displeje přejít na celou obrazovku
+    Skip by Scrolling Over Video Player: Přeskočení posouváním na přehrávači videa
   Privacy Settings:
     Privacy Settings: 'Nastavení soukromí'
     Remember History: 'Zapamatovat historii'
@@ -831,6 +832,8 @@ Tooltips:
       rychlost přehrávání. Stisknutím a podržením Ctrl (Command na Mac) a stisknutím
       levého tlačítka myši se rychle vrátíte na výchozí rychlost přehrávání (1x, pokud
       není změněná v nastavení).
+    Skip by Scrolling Over Video Player: Pomocí rolovacího kolečka můžete video přeskakovat
+      ve stylu MPV.
   Subscription Settings:
     Fetch Feeds from RSS: 'Je-li povoleno, FreeTube použije RSS místo své výchozí
       metody pro získání vašeho odebírání kanálů. RSS je rychlejší a brání blokování

From 42ef2a3e265a08b11f4108a758e6c42184910caa Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Fri, 23 Dec 2022 11:44:54 -0500
Subject: [PATCH 128/301] Improve accessibility of Watch View (#2986)

* Improve Watch page accessibility

Co-Authored-By: Jason <84899178+jasonhenriquez@users.noreply.github.com>

* fix title issue, remove unused gotochannel function

Co-authored-by: Jason <84899178+jasonhenriquez@users.noreply.github.com>
---
 .../components/playlist-info/playlist-info.js | 13 ----
 .../playlist-info/playlist-info.vue           | 15 +++-
 .../watch-video-comments.js                   |  4 --
 .../watch-video-comments.vue                  | 72 +++++++++++++++----
 .../watch-video-info/watch-video-info.sass    |  5 ++
 .../watch-video-info/watch-video-info.vue     |  4 +-
 .../watch-video-live-chat.js                  |  5 --
 .../watch-video-live-chat.vue                 | 23 +++++-
 .../watch-video-playlist.vue                  | 20 ++++++
 src/renderer/views/Search/Search.css          |  4 ++
 src/renderer/views/Search/Search.vue          |  4 ++
 src/renderer/views/Watch/Watch.vue            |  1 +
 static/locales/en-US.yaml                     |  4 ++
 13 files changed, 132 insertions(+), 42 deletions(-)

diff --git a/src/renderer/components/playlist-info/playlist-info.js b/src/renderer/components/playlist-info/playlist-info.js
index a8b448ac0ec0..a29d96b8ec11 100644
--- a/src/renderer/components/playlist-info/playlist-info.js
+++ b/src/renderer/components/playlist-info/playlist-info.js
@@ -122,19 +122,6 @@ export default Vue.extend({
           openExternalLink(invidiousUrl)
           break
       }
-    },
-
-    playFirstVideo() {
-      const playlistInfo = {
-        playlistId: this.id
-      }
-
-      this.$router.push(
-        {
-          path: `/watch/${this.firstVideoId}`,
-          query: playlistInfo
-        }
-      )
     }
   }
 })
diff --git a/src/renderer/components/playlist-info/playlist-info.vue b/src/renderer/components/playlist-info/playlist-info.vue
index fbe4d0fda9b4..dfb3e9846965 100644
--- a/src/renderer/components/playlist-info/playlist-info.vue
+++ b/src/renderer/components/playlist-info/playlist-info.vue
@@ -3,10 +3,18 @@
     <div
       class="playlistThumbnail"
     >
-      <img
-        :src="thumbnail"
-        @click="playFirstVideo"
+      <router-link
+        :to="{
+          path: `/watch/${firstVideoId}`,
+          query: { playlistId: id }
+        }"
+        tabindex="-1"
       >
+        <img
+          :src="thumbnail"
+          alt=""
+        >
+      </router-link>
     </div>
 
     <div class="playlistStats">
@@ -36,6 +44,7 @@
       <img
         class="channelThumbnail"
         :src="channelThumbnail"
+        alt=""
       >
       <h3
         class="channelName"
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.js b/src/renderer/components/watch-video-comments/watch-video-comments.js
index da51a0dc8a33..61259d30673f 100644
--- a/src/renderer/components/watch-video-comments/watch-video-comments.js
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.js
@@ -334,10 +334,6 @@ export default Vue.extend({
       })
     },
 
-    goToChannel: function (channelId) {
-      this.$router.push({ path: `/channel/${channelId}` })
-    },
-
     ...mapActions([
       'invidiousAPICall'
     ])
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.vue b/src/renderer/components/watch-video-comments/watch-video-comments.vue
index 060ced466bd4..1878a191fb89 100644
--- a/src/renderer/components/watch-video-comments/watch-video-comments.vue
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.vue
@@ -3,14 +3,22 @@
     <h4
       v-if="commentData.length === 0 && !isLoading"
       class="getCommentsTitle"
+      role="button"
+      tabindex="0"
       @click="getCommentData"
+      @keydown.space.prevent="getCommentData"
+      @keydown.enter.prevent="getCommentData"
     >
       {{ $t("Comments.Click to View Comments") }}
     </h4>
     <h4
       v-if="commentData.length > 0 && !isLoading && !showComments"
       class="getCommentsTitle"
+      role="button"
+      tabindex="0"
       @click="showComments = true"
+      @keydown.space.prevent="showComments = true"
+      @keydown.enter.prevent="showComments = true"
     >
       {{ $t("Comments.Click to View Comments") }}
     </h4>
@@ -29,7 +37,11 @@
       {{ $t("Comments.Comments") }}
       <span
         class="hideComments"
+        role="button"
+        tabindex="0"
         @click="showComments = false"
+        @keydown.space.prevent="showComments = false"
+        @keydown.enter.prevent="showComments = false"
       >
         {{ $t("Comments.Hide Comments") }}
       </span>
@@ -39,14 +51,20 @@
     >
       <div
         v-for="(comment, index) in commentData"
+        :id="'comment' + index"
         :key="index"
         class="comment"
       >
-        <img
-          :src="comment.authorThumb"
-          class="commentThumbnail"
-          @click="goToChannel(comment.authorLink)"
+        <router-link
+          :to="`/channel/${comment.authorLink}`"
+          tabindex="-1"
         >
+          <img
+            :src="comment.authorThumb"
+            alt=""
+            class="commentThumbnail"
+          >
+        </router-link>
         <p
           v-if="comment.isPinned"
           class="commentPinned"
@@ -64,9 +82,12 @@
             :class="{
               commentOwner: comment.isOwner
             }"
-            @click="goToChannel(comment.authorLink)"
           >
-            {{ comment.author }}
+            <router-link
+              :to="`/channel/${comment.authorLink}`"
+            >
+              {{ comment.author }}
+            </router-link>
           </span>
           <img
             v-if="comment.isMember"
@@ -97,7 +118,10 @@
           >
             <img
               :src="channelThumbnail"
+              :title="$t('Comments.Hearted')"
+              :aria-label="$t('Comments.Hearted')"
               class="commentHeartBadgeImg"
+              alt=""
             >
             <font-awesome-icon
               :icon="['fas', 'heart']"
@@ -111,7 +135,11 @@
           <span
             v-if="comment.numReplies > 0"
             class="commentMoreReplies"
+            role="button"
+            tabindex="0"
             @click="toggleCommentReplies(index)"
+            @keydown.space.prevent="toggleCommentReplies(index)"
+            @keydown.enter.prevent="toggleCommentReplies(index)"
           >
             <span v-if="!comment.showReplies">{{ $t("Comments.View") }}</span>
             <span v-else>{{ $t("Comments.Hide") }}</span>
@@ -128,22 +156,32 @@
         >
           <div
             v-for="(reply, replyIndex) in comment.replies"
+            :id="'comment' + index + '-' + replyIndex"
             :key="replyIndex"
             class="comment"
           >
-            <img
-              :src="reply.authorThumb"
-              class="commentThumbnail"
+            <router-link
+              :to="`/channel/${reply.authorLink}`"
+              tabindex="-1"
             >
+              <img
+                :src="reply.authorThumb"
+                class="commentThumbnail"
+                alt=""
+              >
+            </router-link>
             <p class="commentAuthorWrapper">
               <span
                 class="commentAuthor"
                 :class="{
                   commentOwner: reply.isOwner
                 }"
-                @click="goToChannel(reply.authorLink)"
               >
-                {{ reply.author }}
+                <router-link
+                  :to="`/channel/${reply.authorLink}`"
+                >
+                  {{ reply.author }}
+                </router-link>
               </span>
               <img
                 v-if="reply.isMember"
@@ -171,13 +209,17 @@
               v-if="reply.numReplies > 0"
               class="commentMoreReplies"
             >
-              View {{ reply.numReplies }} replies
+              {{ $t('Comments.View {replyCount} replies', { replyCount: reply.numReplies }) }}
             </p>
           </div>
           <div
             v-if="comment.replyToken !== null"
             class="showMoreReplies"
-            @click="getCommentReplies(index)"
+            role="button"
+            tabindex="0"
+            @click="getCommentReplies(index, comment.replies.length)"
+            @keydown.space.prevent="getCommentReplies(index, comment.replies.length)"
+            @keydown.enter.prevent="getCommentReplies(index, comment.replies.length)"
           >
             <span>{{ $t("Comments.Show More Replies") }}</span>
           </div>
@@ -194,7 +236,11 @@
     <h4
       v-if="commentData.length > 0 && !isLoading && showComments && nextPageToken"
       class="getMoreComments"
+      role="button"
+      tabindex="0"
       @click="getMoreComments"
+      @keydown.space.prevent="getMoreComments"
+      @keydown.enter.prevent="getMoreComments"
     >
       {{ $t("Comments.Load More Comments") }}
     </h4>
diff --git a/src/renderer/components/watch-video-info/watch-video-info.sass b/src/renderer/components/watch-video-info/watch-video-info.sass
index 3000104b495b..9e8c109698a5 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.sass
+++ b/src/renderer/components/watch-video-info/watch-video-info.sass
@@ -11,6 +11,11 @@
   font-size: 22px
   margin: 0 0 24px
   word-break: break-word
+  display: block
+  margin-block-end: 1em
+  margin-inline-start: 0px
+  margin-inline-end: 0px
+  font-weight: normal
 
 .channelInformation
   .profileRow
diff --git a/src/renderer/components/watch-video-info/watch-video-info.vue b/src/renderer/components/watch-video-info/watch-video-info.vue
index 9c9337d2d7e6..b0872c6a3cf7 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.vue
+++ b/src/renderer/components/watch-video-info/watch-video-info.vue
@@ -1,11 +1,11 @@
 <template>
   <ft-card class="watchVideoInfo">
     <div>
-      <p
+      <h1
         class="videoTitle"
       >
         {{ title }}
-      </p>
+      </h1>
       <div
         class="channelInformation"
       >
diff --git a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js
index 7172b4508d05..aef8590a68d1 100644
--- a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js
+++ b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js
@@ -250,11 +250,6 @@ export default Vue.extend({
       })
       this.stayAtBottom = true
       this.showScrollToBottom = false
-    },
-
-    preventDefault: function (event) {
-      event.stopPropagation()
-      event.preventDefault()
     }
   }
 })
diff --git a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue
index 8c97f537caac..67c915b90f02 100644
--- a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue
+++ b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue
@@ -49,13 +49,20 @@
         <div
           v-for="(comment, index) in superChatComments"
           :key="index"
+          :aria-label="$t('Video.Show Super Chat Comment')"
+          :style="{ backgroundColor: 'var(--primary-color)' }"
           class="superChat"
           :class="comment.superchat.colorClass"
+          role="button"
+          tabindex="0"
           @click="showSuperChatComment(comment)"
+          @keydown.space.prevent="showSuperChatComment(comment)"
+          @keydown.enter.prevent="showSuperChatComment(comment)"
         >
           <img
             :src="comment.author.thumbnail.url"
             class="channelThumbnail"
+            alt=""
           >
           <p
             class="superChatContent"
@@ -72,11 +79,15 @@
         v-if="showSuperChat"
         class="openedSuperChat"
         :class="superChat.superchat.colorClass"
+        role="button"
+        tabindex="0"
         @click="showSuperChat = false"
+        @keydown.space.prevent="showSuperChat = false"
+        @keydown.enter.prevent="showSuperChat = false"
       >
         <div
           class="superChatMessage"
-          @click="e => preventDefault(e)"
+          @click.stop.prevent
         >
           <div
             class="upperSuperChatMessage"
@@ -84,6 +95,7 @@
             <img
               :src="superChat.author.thumbnail.url"
               class="channelThumbnail"
+              alt=""
             >
             <p
               class="channelName"
@@ -125,6 +137,7 @@
               <img
                 :src="comment.author.thumbnail.url"
                 class="channelThumbnail"
+                alt=""
               >
               <p
                 class="channelName"
@@ -149,6 +162,7 @@
             <img
               :src="comment.author.thumbnail.url"
               class="channelThumbnail"
+              alt=""
             >
             <p
               class="chatContent"
@@ -169,7 +183,7 @@
               >
                 <img
                   :src="comment.author.badge.thumbnail.url"
-                  :alt="comment.author.badge.thumbnail.alt"
+                  alt=""
                   :title="comment.author.badge.thumbnail.alt"
                   class="badgeImage"
                 >
@@ -186,7 +200,12 @@
       <div
         v-if="showScrollToBottom"
         class="scrollToBottom"
+        :aria-label="$t('Video.Scroll to Bottom')"
+        role="button"
+        tabindex="0"
         @click="scrollToBottom"
+        @keydown.space.prevent="scrollToBottom"
+        @keydown.enter.prevent="scrollToBottom"
       >
         <font-awesome-icon
           class="icon"
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
index 6f8e8113f723..099501da8015 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
@@ -37,33 +37,53 @@
           :class="{ playlistIconActive: loopEnabled }"
           :icon="['fas', 'retweet']"
           :title="$t('Video.Loop Playlist')"
+          role="button"
+          tabindex="0"
           @click="toggleLoop"
+          @keydown.enter.prevent="toggleLoop"
+          @keydown.space.prevent="toggleLoop"
         />
         <font-awesome-icon
           class="playlistIcon"
           :class="{ playlistIconActive: shuffleEnabled }"
           :icon="['fas', 'random']"
           :title="$t('Video.Shuffle Playlist')"
+          role="button"
+          tabindex="0"
           @click="toggleShuffle"
+          @keydown.enter.prevent="toggleShuffle"
+          @keydown.space.prevent="toggleShuffle"
         />
         <font-awesome-icon
           class="playlistIcon"
           :class="{ playlistIconActive: reversePlaylist }"
           :icon="['fas', 'exchange-alt']"
           :title="$t('Video.Reverse Playlist')"
+          role="button"
+          tabindex="0"
           @click="toggleReversePlaylist"
+          @keydown.enter.prevent="toggleReversePlaylist"
+          @keydown.space.prevent="toggleReversePlaylist"
         />
         <font-awesome-icon
           class="playlistIcon"
           :icon="['fas', 'step-backward']"
           :title="$t('Video.Play Previous Video')"
+          role="button"
+          tabindex="0"
           @click="playPreviousVideo"
+          @keydown.enter.prevent="playPreviousVideo"
+          @keydown.space.prevent="playPreviousVideo"
         />
         <font-awesome-icon
           class="playlistIcon"
           :icon="['fas', 'step-forward']"
           :title="$t('Video.Play Next Video')"
+          role="button"
+          tabindex="0"
           @click="playNextVideo"
+          @keydown.enter.prevent="playNextVideo"
+          @keydown.space.prevent="playNextVideo"
         />
       </p>
       <div
diff --git a/src/renderer/views/Search/Search.css b/src/renderer/views/Search/Search.css
index 515423f77c36..bce8f337f628 100644
--- a/src/renderer/views/Search/Search.css
+++ b/src/renderer/views/Search/Search.css
@@ -8,6 +8,10 @@
   margin-top: 16px;
 }
 
+.getNextPage:hover, .getNextPage:focus {
+  background-color: var(--side-nav-hover-color);
+}
+
 .card {
   width: 85%;
   margin: 0 auto;
diff --git a/src/renderer/views/Search/Search.vue b/src/renderer/views/Search/Search.vue
index b6f7ab3f52aa..02d3572fc71e 100644
--- a/src/renderer/views/Search/Search.vue
+++ b/src/renderer/views/Search/Search.vue
@@ -16,7 +16,11 @@
       />
       <div
         class="getNextPage"
+        role="button"
+        tabindex="0"
         @click="nextPage"
+        @keydown.enter.prevent="nextPage"
+        @keydown.space.prevent="nextPage"
       >
         <font-awesome-icon :icon="['fas', 'search']" /> {{ $t("Search Filters.Fetch more results") }}
       </div>
diff --git a/src/renderer/views/Watch/Watch.vue b/src/renderer/views/Watch/Watch.vue
index 3b166caf3324..8b4d5c384aeb 100644
--- a/src/renderer/views/Watch/Watch.vue
+++ b/src/renderer/views/Watch/Watch.vue
@@ -44,6 +44,7 @@
           <img
             :src="thumbnail"
             class="upcomingThumbnail"
+            alt=""
           >
           <div
             class="premiereDate"
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 7eec5b085ddd..da7f537efdf4 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -578,6 +578,8 @@ Video:
   'Live Chat is currently not supported with the Invidious API.  A direct connection to YouTube is required.': Live
     Chat is currently not supported with the Invidious API.  A direct connection to
     YouTube is required.
+  Show Super Chat Comment: Show Super Chat Comment
+  Scroll to Bottom: Scroll to Bottom
   Download Video: Download Video
   video only: video only
   audio only: audio only
@@ -727,6 +729,7 @@ Comments:
   Sort by: Sort by
   Top comments: Top comments
   Newest first: Newest First
+  View {replyCount} replies: View {replyCount} replies
   # Context: View 10 Replies, View 1 Reply, View 1 Reply from Owner, View 2 Replies from Owner and others
   View: View
   Hide: Hide
@@ -741,6 +744,7 @@ Comments:
   No more comments available: No more comments available
   Pinned by: Pinned by
   Member: Member
+  Hearted: Hearted
 Up Next: Up Next
 
 #Tooltips

From 0fe2f419117e77280550300d753e01eea3d8cf53 Mon Sep 17 00:00:00 2001
From: jc <jcwkgxc@nightorb.com>
Date: Fri, 23 Dec 2022 16:36:59 +0000
Subject: [PATCH 129/301] Translated using Weblate (Portuguese (Portugal))

Currently translated at 100.0% (653 of 653 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt_PT/
---
 static/locales/pt-PT.yaml | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/static/locales/pt-PT.yaml b/static/locales/pt-PT.yaml
index d278ce9902cb..c4d085a3cfcd 100644
--- a/static/locales/pt-PT.yaml
+++ b/static/locales/pt-PT.yaml
@@ -31,10 +31,10 @@ Back: Recuar
 Forward: Avançar
 
 Version {versionNumber} is now available!  Click for more details: A versão {versionNumber}
-  está disponível! Clique aqui para mais informações.
+  já está disponível!  Clique para mais detalhes
 Download From Site: Descarregar do site
 A new blog is now available, {blogTitle}. Click to view more: 'Está disponível um
-  novo blogue, {blogTitle}. Clique aqui para ver mais.'
+  novo blogue, {blogTitle}. Clique aqui para ver mais'
 
 # Search Bar
 Search / Go to URL: Pesquisar/Ir para o URL
@@ -68,7 +68,7 @@ Search Filters:
     Long (> 20 minutes): Longos (> 20 minutos)
   # On Search Page
   Search Results: Resultados
-  Fetching results. Please wait: A procurar. Por favor aguarde.
+  Fetching results. Please wait: A procurar. Por favor aguarde
   Fetch more results: Obter mais resultados
   There are no more results for this search: Não existem mais resultados
 # Sidebar
@@ -78,7 +78,7 @@ Subscriptions:
   Latest Subscriptions: Subscrições recentes
   This profile has a large number of subscriptions.  Forcing RSS to avoid rate limiting: Este
     perfil contém um elevado número de subscrições. A forçar a utilização do RSS para
-    evitar que a sua rede seja bloqueada.
+    evitar que a sua rede seja bloqueada
   'Your Subscription list is currently empty. Start adding subscriptions to see them here.': A
     sua lista de subscrições está vazia. Adicione algumas para as ver aqui.
   'Getting Subscriptions. Please wait.': A carregar subscrições. Por favor aguarde.
@@ -104,7 +104,7 @@ User Playlists:
     todos os vídeos que estiverem aqui serão postos numa lista chamada 'Favoritos'.
   Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: A
     lista está vazia. Carregue no botão Guardar no canto de um vídeo para o mostrar
-    aqui.
+    aqui
   Search bar placeholder: Procurar na lista de reprodução
   Empty Search Message: Não há vídeos nesta lista de reprodução que correspondam à
     sua pesquisa
@@ -218,6 +218,7 @@ Settings:
     Secondary Color Theme: Cor secundária
         #* Main Color Theme
     Hide Side Bar Labels: Ocultar texto na barra lateral
+    Hide FreeTube Header Logo: Ocultar Logotipo Do Cabeçalho Do FreeTube
   Player Settings:
     Player Settings: Definições do reprodutor
     Force Local Backend for Legacy Formats: Forçar sistema de ligação local para formatos
@@ -272,6 +273,7 @@ Settings:
     Video Playback Rate Interval: Intervalo da velocidade de reprodução de vídeos
     Scroll Playback Rate Over Video Player: Alterar a taxa de reprodução sobre o vídeo
     Enter Fullscreen on Display Rotate: Ativar modo de ecrã completo ao rodar o ecrã
+    Skip by Scrolling Over Video Player: Saltar por percorrer o leitor de vídeo
   Privacy Settings:
     Privacy Settings: Definições de privacidade
     Remember History: Memorizar histórico
@@ -318,6 +320,9 @@ Settings:
     Hide Live Streams: Ocultar transmissões em direto
     Hide Sharing Actions: Ocultar ações de partilha
     Hide Chapters: Ocultar capítulos
+    Hide Upcoming Premieres: Ocultar Próximas estreias
+    Hide Channels: Ocultar vídeos de canais
+    Hide Channels Placeholder: Nome ou identificação do canal
   Data Settings:
     Data Settings: Definições de dados
     Select Import Type: Escolher tipo de importação
@@ -423,6 +428,17 @@ Settings:
     Warning: Estas definições são experimentais e podem provocar falhas se ativadas.
       É altamente recomendado fazer cópias de segurança. Use por sua conta e risco!
     Replace HTTP Cache: Substituir cache HTTP
+  Password Dialog:
+    Password: Palavra passe
+    Enter Password To Unlock: Introduzir palavra-passe para desbloquear definições
+    Password Incorrect: Senha Incorrecta
+    Unlock: Desbloquear
+  Password Settings:
+    Password Settings: Definições de senha
+    Set Password To Prevent Access: Definir uma palavra-passe para impedir o acesso
+      às definições
+    Set Password: Definir Palavra-passe
+    Remove Password: Remover Palavra-passe
 About:
   #On About page
   About: Acerca
@@ -776,6 +792,8 @@ Tooltips:
       controlar a taxa de reprodução. Pressione e mantenha premida a tecla Ctrl (Comando
       no Mac) e clique com o botão esquerdo do rato para voltar rapidamente à taxa
       de reprodução padrão (1 a não ser que tenha sido alterada nas definições).
+    Skip by Scrolling Over Video Player: Use a roda de rolagem para saltar através
+      do vídeo, estilo MPV.
   Subscription Settings:
     Fetch Feeds from RSS: Quando ativado, FreeTube irá obter as suas subscrições através
       de RSS em vez do método normal. O RSS é mais rápido e impede que seja bloqueado
@@ -803,6 +821,11 @@ Tooltips:
   Experimental Settings:
     Replace HTTP Cache: Desativa a cache HTTP Electron e ativa uma cache de imagem
       na memória personalizada. Levará ao aumento da utilização de RAM.
+  Distraction Free Settings:
+    Hide Channels: Introduza o nome de um canal ou ID do canal para esconder todos
+      os vídeos, listas de reprodução e o próprio canal de aparecer em busca ou em
+      tendências. O nome do canal introduzido tem de ser uma correspondência completa
+      e é sensível a maiúsculas e minúsculas.
 Local API Error (Click to copy): API local encontrou um erro (clique para copiar)
 Invidious API Error (Click to copy): API Invidious encontrou um erro (clique para
   copiar)
@@ -878,3 +901,4 @@ Clipboard:
   Copy failed: A cópia para a área de transferência falhou
   Cannot access clipboard without a secure connection: Não é possível aceder à área
     de transferência sem uma ligação segura
+Ok: Ok

From a89c27ee070185c5a90a9cc4cf506930c5938520 Mon Sep 17 00:00:00 2001
From: Kyotaro Iijima <kyotaro.eyes@gmail.com>
Date: Fri, 23 Dec 2022 15:39:14 +0000
Subject: [PATCH 130/301] Translated using Weblate (Japanese)

Currently translated at 100.0% (653 of 653 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ja/
---
 static/locales/ja.yaml | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/static/locales/ja.yaml b/static/locales/ja.yaml
index 9c8071348af0..25f52f837efd 100644
--- a/static/locales/ja.yaml
+++ b/static/locales/ja.yaml
@@ -230,9 +230,9 @@ Settings:
     Playlist Next Video Interval: 次の再生リストを再生する間隔
     Next Video Interval: 次の動画までの間隔
     Fast-Forward / Rewind Interval: 早送り/巻き戻し間隔
-    Display Play Button In Video Player: 動画プレーヤーで再生ボタンを表示する
-    Scroll Volume Over Video Player: 動画プレーヤーの上でボリュームをスクロール
-    Scroll Playback Rate Over Video Player: 動画の再生速度の調整
+    Display Play Button In Video Player: 動画プレーヤーに再生ボタンを表示する
+    Scroll Volume Over Video Player: 動画プレーヤーに音量調整を表示する
+    Scroll Playback Rate Over Video Player: 動画プレーヤーに再生速度調整を表示する
     Max Video Playback Rate: 最大動画再生速度
     Video Playback Rate Interval: 動画再生速度間隔
     Screenshot:
@@ -249,6 +249,7 @@ Settings:
       Ask Path: 保存フォルダを尋ねる
       Folder Button: フォルダーの選択
     Enter Fullscreen on Display Rotate: 横画面時にフルスクリーンにする
+    Skip by Scrolling Over Video Player: 動画プレーヤーでスクロールしてスキップ可能にする
   Subscription Settings:
     Subscription Settings: '登録チャンネルの設定'
     Hide Videos on Watch: '視聴済み動画の非表示'
@@ -262,7 +263,7 @@ Settings:
     Export Subscriptions: '登録のエクスポート'
     How do I import my subscriptions?: 'どうやってインポートするのですか？'
     Fetch Feeds from RSS: RSS から情報取得
-    Fetch Automatically: フィードを自動的に取得する
+    Fetch Automatically: フィードの自動取得
   Advanced Settings:
     Advanced Settings: '詳細設定'
     Enable Debug Mode (Prints data to the console): 'デバッグ モードの有効化（コンソールにデータ出力）'
@@ -356,6 +357,8 @@ Settings:
     Hide Sharing Actions: 共有の非表示
     Hide Chapters: チャプターの非表示
     Hide Upcoming Premieres: 今後のプレミア公開を非表示
+    Hide Channels: チャンネルから動画を非表示
+    Hide Channels Placeholder: チャネル名または ID
   The app needs to restart for changes to take effect. Restart and apply change?: 変更の反映には、アプリの再起動が必要です。再起動して変更を適用しますか？
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: ネットワーク情報の取得中にエラーが発生しました。プロキシーを正しく設定してますか?
@@ -409,6 +412,16 @@ Settings:
     Replace HTTP Cache: HTTP キャッシュの置換
     Experimental Settings: 実験中の設定
     Warning: この設定項目は実験中であるため、有効にするとクラッシュするかもしれません。バックアップを必ず作成してください。使用は自己責任でお願いします！
+  Password Settings:
+    Password Settings: パスワード設定
+    Set Password To Prevent Access: 設定の変更にはパスワードを設定とする
+    Set Password: パスワードの設定
+    Remove Password: パスワードの削除
+  Password Dialog:
+    Enter Password To Unlock: パスワードを入力して設定を解除
+    Password Incorrect: パスワードが正しくありません
+    Password: パスワード
+    Unlock: ロック解除
 About:
   #On About page
   About: '概要'
@@ -771,6 +784,7 @@ Tooltips:
     Proxy Videos Through Invidious: 動画を取得するため、YouTube ではなく Invidious に接続します。API 設定を書き換えます。
     Scroll Playback Rate Over Video Player: カーソルが動画上にあるとき、Ctrl キー（Mac では Command キー）を押したまま、マウスホイールを前後にスクロールして再生速度を調整します。Control
       キー（Mac では Command キー）を押したままマウスを左クリックすると、すぐにデフォルトの再生速度（設定を変更していない場合は 1 x）に戻ります。
+    Skip by Scrolling Over Video Player: スクロール ホイールを使用して、ビデオ、MPV スタイルをスキップします。
   General Settings:
     Invidious Instance: FreeTube が使用する Invidious API の接続先サーバーです。
     Preferred API Backend: FreeTube が youtube からデータを取得する方法を選択します。「内部 API」とはアプリから取得する方法です。「Invidious
@@ -794,6 +808,8 @@ Tooltips:
   Experimental Settings:
     Replace HTTP Cache: Electron のディスクに基づく HTTP キャッシュを無効化し、メモリ内で独自の画像キャッシュを使用します。このことにより
       RAM の使用率は増加します。
+  Distraction Free Settings:
+    Hide Channels: チャンネル名またはチャンネル ID を入力すると、すべてのビデオ、再生リスト、およびチャンネル自体が検索や人気に表示されなくなります。入力するチャンネル名は完全に一致することが必要で、大文字と小文字を区別します。
 Playing Next Video Interval: すぐに次の動画を再生します。クリックするとキャンセル。|次の動画を {nextVideoInterval}
   秒で再生します。クリックするとキャンセル。|次の動画を {nextVideoInterval} 秒で再生します。クリックするとキャンセル。
 More: もっと見る
@@ -837,3 +853,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'チャプター リストを非表示、現在のチャプター:
     {chapterName}'
 Preferences: 環境設定
+Ok: OK

From 6085334c70092cd8a5bb413261c934edbb6791cd Mon Sep 17 00:00:00 2001
From: jc <jcwkgxc@nightorb.com>
Date: Fri, 23 Dec 2022 16:25:57 +0000
Subject: [PATCH 131/301] Translated using Weblate (Portuguese)

Currently translated at 100.0% (653 of 653 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt/
---
 static/locales/pt.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/static/locales/pt.yaml b/static/locales/pt.yaml
index 7506824fe81b..833477adb3d2 100644
--- a/static/locales/pt.yaml
+++ b/static/locales/pt.yaml
@@ -269,6 +269,7 @@ Settings:
       Folder Label: Pasta das capturas de ecrã
       Ask Path: Perguntar onde guardar
     Enter Fullscreen on Display Rotate: Ativar modo de ecrã completo ao rodar o ecrã
+    Skip by Scrolling Over Video Player: Saltar por percorrer o leitor de vídeo
   Privacy Settings:
     Privacy Settings: 'Definições de privacidade'
     Remember History: 'Memorizar histórico'
@@ -889,6 +890,8 @@ Tooltips:
       controlar a taxa de reprodução. Pressione e mantenha premida a tecla Ctrl (Comando
       no Mac) e clique com o botão esquerdo do rato para voltar rapidamente à taxa
       de reprodução padrão (1 a não ser que tenha sido alterada nas definições).
+    Skip by Scrolling Over Video Player: Use a roda de rolagem para pular o vídeo,
+      estilo MPV.
   General Settings:
     Region for Trending: A região de tendências permite-lhe escolher de que país virão
       os vídeos na secção das tendências. Nem todos os países mostrados funcionam

From 1f6fcf0649467871a34ad0862ae11ad02eab6578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20W=C3=B3jcicki?= <terkaz@gmx.com>
Date: Fri, 23 Dec 2022 17:12:13 +0000
Subject: [PATCH 132/301] Translated using Weblate (Polish)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pl/
---
 static/locales/pl.yaml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml
index f6766f58c32d..310ad7b376a0 100644
--- a/static/locales/pl.yaml
+++ b/static/locales/pl.yaml
@@ -269,7 +269,7 @@ Settings:
         Empty File Name: Pusta nazwa pliku
       Enable: Włącz zrzuty ekranu
     Enter Fullscreen on Display Rotate: Przyłącz na tryb pełnoekranowy przy zmianie
-      orientacji wyświetlacza
+      orientacji ekranu
     Skip by Scrolling Over Video Player: Przewijaj film, kręcąc kółkiem myszy na obszarze
       odtwarzacza
   Subscription Settings:
@@ -427,7 +427,7 @@ Settings:
     Skip Options:
       Skip Option: Opcja pominięcia
       Auto Skip: Pomijaj automatycznie
-      Show In Seek Bar: Pokaż na pasku postępu
+      Show In Seek Bar: Pokazuj na pasku postępu
       Prompt To Skip: Zapytaj, czy pominąć
       Do Nothing: Nic nie rób
     Category Color: Kolor segmentu
@@ -705,6 +705,8 @@ Video:
     Dropped / Total Frames: Opuszczone klatki / klatki ogółem
   Premieres in: Premiera za
   Premieres: Premiery
+  Show Super Chat Comment: Pokazuj komentarze z „Superczatu”
+  Scroll to Bottom: Przewiń do końca
 Videos:
   #& Sort By
   Sort By:
@@ -760,13 +762,13 @@ Share:
 Mini Player: 'Mini odtwarzacz'
 Comments:
   Comments: 'Komentarze'
-  Click to View Comments: 'Kliknij, aby wyświetlić komentarze'
+  Click to View Comments: 'Kliknij, aby zobaczyć komentarze'
   Getting comment replies, please wait: 'Pobieranie odpowiedzi do komentarza, proszę
     poczekać'
   Show Comments: 'Pokaż komentarze'
   Hide Comments: 'Schowaj komentarze'
   # Context: View 10 Replies, View 1 Reply
-  View: 'Wyświetl'
+  View: 'Zobacz'
   Hide: 'Schowaj'
   Replies: 'odpowiedzi'
   Reply: 'odpowiedź'
@@ -783,6 +785,8 @@ Comments:
   Pinned by: Przypięty przez
   From {channelName}: od {channelName}
   Member: Wspierający
+  Hearted: z serduszkiem
+  View {replyCount} replies: Zobacz {replyCount} odpowiedzi
 Up Next: 'Następne'
 
 # Toast Messages
@@ -874,8 +878,8 @@ Tooltips:
       danych. Lokalne API jest wbudowanym ekstraktorem. API Invidious wymaga połączenia
       z serwerem Invidious.
     Region for Trending: Obszar filmów „Na czasie” pozwala wybrać kraj, z którego
-      chciałbyś zobaczyć filmy zdobywające popularność. Nie wszystkie wyświetlone
-      kraje są obsługiwane przez YouTube.
+      chciałbyś zobaczyć filmy zdobywające popularność. Nie wszystkie wymienione kraje
+      są obsługiwane przez YouTube.
     Invidious Instance: Serwer Invidious, którym FreeTube będzie się łączył do wywołań
       API.
     Thumbnail Preference: Wszystkie miniaturki na FreeTube zostaną zastąpione klatką
@@ -904,7 +908,7 @@ Tooltips:
     Remove Video Meta Files: Po włączeniu FreeTube automatycznie usunie pliki metadanych
       utworzone podczas odtwarzania filmu, gdy strona odtwarzania zostanie zamknięta.
   External Player Settings:
-    Ignore Warnings: Nie wyświetlaj ostrzeżeń o nieobsługiwanych akcjach przez zewnętrzny
+    Ignore Warnings: Nie pokazuj ostrzeżeń o nieobsługiwanych akcjach przez zewnętrzny
       odtwarzacz (n.p. odwracanie playlist, itp.).
     External Player: Wybranie zewnętrznego odtwarzacza spowoduje wyświetlenie na miniaturkach
       ikony, która otworzy film (playlistę, jeśli są obsługiwane) w zewnętrznym odtwarzaczu.

From 49cf16b6824ff04bc37f4477b421652e82682497 Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Fri, 23 Dec 2022 16:59:31 +0000
Subject: [PATCH 133/301] Translated using Weblate (Arabic)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ar/
---
 static/locales/ar.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/static/locales/ar.yaml b/static/locales/ar.yaml
index 87c6175f09e4..c009c220f845 100644
--- a/static/locales/ar.yaml
+++ b/static/locales/ar.yaml
@@ -260,6 +260,7 @@ Settings:
         2 أرقام. % T ميلي ثانية 3 أرقام. %s الفيديو الثاني. % t فيديو ميلي ثانية 3
         أرقام. %i معرف الفيديو. يمكنك أيضا استخدام "\" أو "/" لإنشاء مجلدات فرعية.
     Enter Fullscreen on Display Rotate: وضع ملء الشاشة عند تدوير الشاشة
+    Skip by Scrolling Over Video Player: تخطي بالتمرير فوق مشغل الفيديو
   Privacy Settings:
     Privacy Settings: 'إعدادات الخصوصية'
     Remember History: 'تذّكر سجلّ المشاهدة'
@@ -718,6 +719,8 @@ Video:
     Mimetype: نمط ميمي
   Premieres in: العرض الأول في
   Premieres: العرض الأولي
+  Scroll to Bottom: انتقل إلى الأسفل
+  Show Super Chat Comment: إظهار تعليق Super Chat
 Videos:
   #& Sort By
   Sort By:
@@ -790,6 +793,8 @@ Comments:
   And others: و اخرين
   From {channelName}: من {channelName}
   Member: عضو
+  View {replyCount} replies: عرض {replyCount} ردود
+  Hearted: القلب
 Up Next: 'التالي'
 
 # Toast Messages
@@ -851,6 +856,7 @@ Tooltips:
       للخلف للتحكم في معدل التشغيل. اضغط مع الاستمرار على مفتاح التحكم (مفتاح الأوامر
       على Mac) ثم انقر فوق الماوس للعودة بسرعة إلى معدل التشغيل الافتراضي (1x ما لم
       يتم تغييره في الإعدادات).
+    Skip by Scrolling Over Video Player: استخدم عجلة التمرير لتخطي الفيديو بنمط MPV.
   Privacy Settings:
     Remove Video Meta Files: عندما يمكن، يحذف Freetube تلقائيًا ملفات التعريف التي
       تم إنشاؤها أثناء تشغيل الفيديو ، عندما تكون صفحة المشاهدة مغلقة.

From 863abbac999a92ea937e6b16d1518c9598941c01 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Fri, 23 Dec 2022 20:25:56 +0000
Subject: [PATCH 134/301] Translated using Weblate (Spanish)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/es/
---
 static/locales/es.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/static/locales/es.yaml b/static/locales/es.yaml
index f1eb345db2ca..e6c3988b673d 100644
--- a/static/locales/es.yaml
+++ b/static/locales/es.yaml
@@ -733,6 +733,8 @@ Video:
     Dropped / Total Frames: Fotogramas Perdidos / Fotogramas Totales
   Premieres in: Estrenos en
   Premieres: Estrenos
+  Show Super Chat Comment: Mostrar los comentarios del Super Chat
+  Scroll to Bottom: Desplazarse hacia abajo
 Videos:
   #& Sort By
   Sort By:
@@ -811,6 +813,8 @@ Comments:
   And others: y otros
   Pinned by: Fijado por
   Member: Miembro
+  Hearted: Corazón
+  View {replyCount} replies: Ver {replyCount} respuestas
 Up Next: 'A continuación'
 
 # Toast Messages

From 7f7dbaaef49e78b04c18d558047e21d8d512bf41 Mon Sep 17 00:00:00 2001
From: jc <jcwkgxc@nightorb.com>
Date: Fri, 23 Dec 2022 16:51:38 +0000
Subject: [PATCH 135/301] Translated using Weblate (Portuguese)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt/
---
 static/locales/pt.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/static/locales/pt.yaml b/static/locales/pt.yaml
index 833477adb3d2..ac6e6ac5a8e1 100644
--- a/static/locales/pt.yaml
+++ b/static/locales/pt.yaml
@@ -731,6 +731,8 @@ Video:
     Dropped / Total Frames: Fotogramas perdidos/total de fotogramas
   Premieres in: Estreia em
   Premieres: Estreias
+  Scroll to Bottom: Rolar para baixo
+  Show Super Chat Comment: Mostrar Comentário do Super Chat
 Videos:
   #& Sort By
   Sort By:
@@ -810,6 +812,8 @@ Comments:
   And others: e outros
   From {channelName}: de {channelName}
   Member: Membro
+  Hearted: Marcado
+  View {replyCount} replies: Ver respostas {replyCount}
 Up Next: 'Próximo'
 
 # Toast Messages

From 84bf1b4b33640a9ab850228bdd125b269d70ebce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Fri, 23 Dec 2022 18:07:41 +0000
Subject: [PATCH 136/301] Translated using Weblate (Turkish)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/tr/
---
 static/locales/tr.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/static/locales/tr.yaml b/static/locales/tr.yaml
index 46cc7a92a0f7..f3980b068853 100644
--- a/static/locales/tr.yaml
+++ b/static/locales/tr.yaml
@@ -738,6 +738,8 @@ Video:
       videolar için kullanılabilir değil
   Premieres in: İlk gösterim
   Premieres: İlk gösterim
+  Scroll to Bottom: Aşağıya Kaydır
+  Show Super Chat Comment: Süper Sohbet Yorumunu Göster
 Videos:
   #& Sort By
   Sort By:
@@ -814,6 +816,8 @@ Comments:
   And others: ve diğerleri
   Pinned by: Sabitleyen
   Member: Üye
+  View {replyCount} replies: '{replyCount} yanıtı görüntüle'
+  Hearted: Kalplendi
 Up Next: 'Sonraki'
 
 # Toast Messages

From fa778a0afd480a69d731d07d765798d7bd4eb03f Mon Sep 17 00:00:00 2001
From: Fjuro <ifjuro@proton.me>
Date: Fri, 23 Dec 2022 17:40:13 +0000
Subject: [PATCH 137/301] Translated using Weblate (Czech)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/cs/
---
 static/locales/cs.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml
index ce163435a5c1..d435e6a84c72 100644
--- a/static/locales/cs.yaml
+++ b/static/locales/cs.yaml
@@ -714,6 +714,8 @@ Video:
     Dropped / Total Frames: Vyřazené / Celkový počet snímků
   Premieres in: Premiéra za
   Premieres: Premiéra
+  Show Super Chat Comment: Zobrazit komentář Super Chat
+  Scroll to Bottom: Posunout dolů
 Videos:
   #& Sort By
   Sort By:
@@ -795,6 +797,8 @@ Comments:
   From {channelName}: z {channelName}
   And others: a ostatní
   Member: Člen
+  View {replyCount} replies: Zobrazit {replyCount} odpovědí
+  Hearted: Se srdíčkem
 Up Next: 'Další'
 
 #Tooltips

From ba96048776cf5abf29bec5b1354701d6e0f1c4bd Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Fri, 23 Dec 2022 19:11:36 +0000
Subject: [PATCH 138/301] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/uk/
---
 static/locales/uk.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/static/locales/uk.yaml b/static/locales/uk.yaml
index 7307f536164a..3de6686df485 100644
--- a/static/locales/uk.yaml
+++ b/static/locales/uk.yaml
@@ -710,6 +710,8 @@ Video:
       для застарілих відео
   Premieres in: Прем'єри в
   Premieres: Прем'єри
+  Scroll to Bottom: Прокрутити до кінця
+  Show Super Chat Comment: Показати коментар із суперчату
 Videos:
   #& Sort By
   Sort By:
@@ -789,6 +791,8 @@ Comments:
   And others: та інших
   Pinned by: Закріплено
   Member: Учасник
+  Hearted: З сердечком
+  View {replyCount} replies: Переглянути {replyCount} відповідей
 Up Next: 'Далі вгору'
 
 #Tooltips

From d38827dc0a6ef85915afd3fce4e0dfdafb9e2cd0 Mon Sep 17 00:00:00 2001
From: Eric <hamburger1024@duck.com>
Date: Sat, 24 Dec 2022 00:00:17 +0000
Subject: [PATCH 139/301] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/zh_Hans/
---
 static/locales/zh-CN.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/static/locales/zh-CN.yaml b/static/locales/zh-CN.yaml
index 8df148282352..c5c5c01bcccd 100644
--- a/static/locales/zh-CN.yaml
+++ b/static/locales/zh-CN.yaml
@@ -630,6 +630,8 @@ Video:
   Skipped segment: 跳过片段
   Premieres in: 首映于
   Premieres: 首映
+  Scroll to Bottom: 滚动到底部
+  Show Super Chat Comment: 显示超级聊天评论
 Videos:
   #& Sort By
   Sort By:
@@ -702,6 +704,8 @@ Comments:
   From {channelName}: 来自 {channelName}
   And others: 及其他
   Member: 成员
+  Hearted: 喜欢的
+  View {replyCount} replies: 查看 {replyCount} 条回复
 Up Next: 'Up Next'
 
 # Toast Messages

From d4380d1d05ffb0063de3a6c7a70eb42ec20b0164 Mon Sep 17 00:00:00 2001
From: Massimo Pissarello <mapi68@gmail.com>
Date: Sat, 24 Dec 2022 08:16:02 +0000
Subject: [PATCH 140/301] Translated using Weblate (Italian)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/it/
---
 static/locales/it.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/static/locales/it.yaml b/static/locales/it.yaml
index 80e3035f6146..8a5e843adc77 100644
--- a/static/locales/it.yaml
+++ b/static/locales/it.yaml
@@ -703,6 +703,8 @@ Video:
     Mimetype: Tipo di media
   Premieres in: Anteprima in
   Premieres: Première
+  Scroll to Bottom: Scorri fino in fondo
+  Show Super Chat Comment: Mostra commento Super Chat
 Videos:
   #& Sort By
   Sort By:
@@ -783,6 +785,8 @@ Comments:
   And others: e altri
   Pinned by: Messo in primo piano da
   Member: Membro
+  Hearted: Di cuore
+  View {replyCount} replies: Visualizza {replyCount} risposte
 Up Next: 'Prossimi video'
 
 # Toast Messages

From e625a1a2de984e3141199c8432922292e884ce21 Mon Sep 17 00:00:00 2001
From: ovari <ovari123@zoho.com>
Date: Sat, 24 Dec 2022 08:28:59 +0000
Subject: [PATCH 141/301] Translated using Weblate (Hungarian)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/hu/
---
 static/locales/hu.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/static/locales/hu.yaml b/static/locales/hu.yaml
index d104aee795a0..8c2f909c061c 100644
--- a/static/locales/hu.yaml
+++ b/static/locales/hu.yaml
@@ -278,6 +278,7 @@ Settings:
     Max Video Playback Rate: Legfeljebb videó lejátszási sebesség
     Video Playback Rate Interval: Videó lejátszási sebesség időköze
     Enter Fullscreen on Display Rotate: Teljes képernyős mód a kijelzőn forgatáshoz
+    Skip by Scrolling Over Video Player: Kihagyás a Videolejátszó felett görgetve
   Privacy Settings:
     Privacy Settings: 'Adatvédelmi beállítások'
     Remember History: 'Előzmények megjegyzése'
@@ -730,6 +731,8 @@ Video:
     Dropped / Total Frames: Elvetve/Összes képkocka
     Bitrate: Átviteli sebesség
   Premieres: Első előadások
+  Show Super Chat Comment: Haladó csevegési megjegyzés megjelenítése
+  Scroll to Bottom: Görgetés legalulra
 Videos:
   #& Sort By
   Sort By:
@@ -810,6 +813,8 @@ Comments:
   And others: és mások
   Pinned by: 'Kitűzte:'
   Member: Tag
+  View {replyCount} replies: '{replyCount} válasz megtekintése'
+  Hearted: Kedvenc
 Up Next: 'Következő'
 
 # Toast Messages
@@ -881,6 +886,8 @@ Tooltips:
       Tartsa lenyomva a Control billentyűt (Mac gépen a Command billentyű), majd kattintson
       az egér bal gombjával az alapértelmezett lejátszási sebesség gyors visszatéréséhez
       (1x, hacsak nem módosították a beállításokban).
+    Skip by Scrolling Over Video Player: MPV módban a görgetőkerék használatával kihagyhatja
+      a videót.
   Privacy Settings:
     Remove Video Meta Files: Ha engedélyezve van, a SzabadCső önműködően törli a videolejátszás
       során létrehozott metafájlokat, amikor a videómegtekintő oldal bezárul.

From 19dd23c36f45a94b81452edbe0a9a138f3eb9ba0 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sat, 24 Dec 2022 10:22:05 +0000
Subject: [PATCH 142/301] Translated using Weblate (Hebrew)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/he/
---
 static/locales/he.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/static/locales/he.yaml b/static/locales/he.yaml
index b0dcda992671..289aade506b1 100644
--- a/static/locales/he.yaml
+++ b/static/locales/he.yaml
@@ -264,6 +264,7 @@ Settings:
         ב־2 ספרות. ‎%T מילישניות ב־3 ספרות. ‎%s השנייה בסרטון. ‎%t מילישניות בסרטון
         ב־3 ספרות. ‎%i מזהה הסרטון. אפשר להשתמש גם ב־„/” או ב־„\” כדי ליצור תת־תיקיות.
     Enter Fullscreen on Display Rotate: מעבר למסך מלא עם סיבוב התצוגה
+    Skip by Scrolling Over Video Player: אפשר לדלג על ידי גלילה על נגן הווידאו
   Privacy Settings:
     Privacy Settings: 'הגדרות פרטיות'
     Remember History: 'זכור את היסטוריית הצפייה'
@@ -716,6 +717,8 @@ Video:
     Mimetype: סוג MIME
   Premieres in: בכורה בעוד
   Premieres: בכורות
+  Scroll to Bottom: גלילה לתחתית
+  Show Super Chat Comment: הצגת הערת סופר צ׳אט
 Videos:
   #& Sort By
   Sort By:
@@ -788,6 +791,8 @@ Comments:
   And others: ואחרים
   Pinned by: ננעץ על ידי
   Member: חבר
+  View {replyCount} replies: הצגת {replyCount} תגובות
+  Hearted: סומן בלב
 Up Next: 'הסרטון הבא'
 
 # Toast Messages
@@ -843,6 +848,8 @@ Tooltips:
       לשלוט בקצב הנגינה. לחיצה והחזקה של מקש Control (או Command ב־Mac) ולחיצה על
       הכפתור השמאלי בעכבר מחזירה במהירות לקצב הנגינה כברירת מחדל (1x אלמלא בוצע שינוי
       בהגדרות).
+    Skip by Scrolling Over Video Player: ניתן להשתמש בגלגלת כדי לדלג בתוך הסרטון,
+      כמו ב־MPV.
   Subscription Settings:
     Fetch Feeds from RSS: כאשר אפשרות זו פעילה. FreeTube ישתמש ב־RSS במקום בשיטת ברירת
       המחדל לאיסוף הזנת המינויים שלך. RSS היא שיטה מהירה יותר ומונעת חסימת IP אבל

From c98955029fd9e09d8009d84c631ea88a09aa2849 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Sat, 24 Dec 2022 12:49:33 +0000
Subject: [PATCH 143/301] Translated using Weblate (Galician)

Currently translated at 99.8% (656 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/gl/
---
 static/locales/gl.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/static/locales/gl.yaml b/static/locales/gl.yaml
index 587cb4a43c38..893086619d5f 100644
--- a/static/locales/gl.yaml
+++ b/static/locales/gl.yaml
@@ -726,6 +726,8 @@ Video:
     Dropped / Total Frames: Fotogramas Perdidos / Fotogramas Totales
   Premieres on: Estrease o
   Premieres: Estreos
+  Show Super Chat Comment: Mostralos comentarios do Super Chat
+  Scroll to Bottom: Desprácese ata abaixo
 Videos:
   #& Sort By
   Sort By:
@@ -806,6 +808,7 @@ Comments:
   Member: Membro
   From {channelName}: de {channelName}
   Show More Replies: Amosar máis respostas
+  View {replyCount} replies: Consulta {replyCount} respostas
 Up Next: 'Seguintes'
 
 #Tooltips

From 2d636cb4b5d43f78559abb035e57a8d09442a27d Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Sat, 24 Dec 2022 12:50:34 +0000
Subject: [PATCH 144/301] Translated using Weblate (Galician)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/gl/
---
 static/locales/gl.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/gl.yaml b/static/locales/gl.yaml
index 893086619d5f..aff1da984e4c 100644
--- a/static/locales/gl.yaml
+++ b/static/locales/gl.yaml
@@ -809,6 +809,7 @@ Comments:
   From {channelName}: de {channelName}
   Show More Replies: Amosar máis respostas
   View {replyCount} replies: Consulta {replyCount} respostas
+  Hearted: Corazón
 Up Next: 'Seguintes'
 
 #Tooltips

From 67be22e77c1dfa4a80201716f8fa2328b3c5b400 Mon Sep 17 00:00:00 2001
From: Ettore Atalan <atalanttore@googlemail.com>
Date: Sat, 24 Dec 2022 19:31:34 +0000
Subject: [PATCH 145/301] Translated using Weblate (German)

Currently translated at 99.3% (653 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/de/
---
 static/locales/de-DE.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/de-DE.yaml b/static/locales/de-DE.yaml
index c328d7cf8c05..849dc0e9cbfa 100644
--- a/static/locales/de-DE.yaml
+++ b/static/locales/de-DE.yaml
@@ -711,6 +711,7 @@ Video:
       ältere Videos nicht verfügbar
   Premieres in: Premieren in
   Premieres: Premiere
+  Show Super Chat Comment: Super-Chat-Kommentar anzeigen
 Videos:
   #& Sort By
   Sort By:
@@ -797,6 +798,7 @@ Comments:
   And others: und andere
   Pinned by: Angeheftet von
   Member: Mitglied
+  View {replyCount} replies: '{replyCount} Antworten ansehen'
 Up Next: Nächster Titel
 
 # Toast Messages

From 32af2280145d9389b36beffe3ca5c4d066239d4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Sat, 24 Dec 2022 21:43:03 +0000
Subject: [PATCH 146/301] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 82.0% (539 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/nb_NO/
---
 static/locales/nb_NO.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/static/locales/nb_NO.yaml b/static/locales/nb_NO.yaml
index 5f0dfaec5b89..e5ea7b7ab3af 100644
--- a/static/locales/nb_NO.yaml
+++ b/static/locales/nb_NO.yaml
@@ -229,6 +229,7 @@ Settings:
       Error:
         Forbidden Characters: Forbudte tegn
         Empty File Name: Tomt filnavn
+    Max Video Playback Rate: Maks. videoavspillingshastighet
   Privacy Settings:
     Privacy Settings: 'Personvernsinnstillinger'
     Remember History: 'Husk historikk'
@@ -327,6 +328,9 @@ Settings:
     Playlist File: Spillelistefil
     Export Playlists: Eksporter spillelister
     Import Playlists: Importer spillelister
+    All playlists has been successfully exported: Alle spillelister eksportert
+    Playlist insufficient data: Utilstrekkelig data for «{playlist}»-spillelisten.
+      Hopper over elementet.
   Proxy Settings:
     Region: Region
     Clicking on Test Proxy will send a request to: Klikk på «Test mellomtjener» for
@@ -357,6 +361,9 @@ Settings:
     Hide Playlists: Skjul spillelister
     Hide Comments: Skjul kommentarer
     Hide Live Streams: "\n"
+    Hide Chapters: Skjul kapitler
+    Hide Channels Placeholder: Kanalnavn eller ID
+    Hide Channels: Skjul videoer fra kanaler
   The app needs to restart for changes to take effect. Restart and apply change?: Start
     programmet på ny for å ta i bruk endringene?
   SponsorBlock Settings:
@@ -590,6 +597,8 @@ Video:
     Resolution: Oppløsning
     Player Dimensions: Avspillerdimensjoner
     Mimetype: Media-type
+  Show Super Chat Comment: Vis supersludringskommentar
+  Scroll to Bottom: Rull til bunnen
 Videos:
   #& Sort By
   Sort By:
@@ -822,3 +831,5 @@ Screenshot Success: Lagre skjermavbildning som «{filePath}»
 Screenshot Error: Skjermavbildning mislyktes. {error}
 Ok: OK
 Preferences: Innstillinger
+Downloading failed: Kunne ikke laste ned «{videoTitle}»
+Starting download: Starter nedlasting av «{videoTitle}» …

From c8363e01bc657e254d36625daf2a1024b23aa9b8 Mon Sep 17 00:00:00 2001
From: sith-on-mars <groguko36@pm.me>
Date: Sun, 25 Dec 2022 03:50:24 +0000
Subject: [PATCH 147/301] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/zh_Hans/
---
 static/locales/zh-CN.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/static/locales/zh-CN.yaml b/static/locales/zh-CN.yaml
index c5c5c01bcccd..0186b973c447 100644
--- a/static/locales/zh-CN.yaml
+++ b/static/locales/zh-CN.yaml
@@ -768,8 +768,7 @@ Profile:
 The playlist has been reversed: 播放列表已反转
 A new blog is now available, {blogTitle}. Click to view more: 已有新的博客，{blogTitle}。点击以查看更多
 Download From Site: 从网站下载
-Version {versionNumber} is now available!  Click for more details: 版本{versionNumber}已可使用！
-  点击以取得更多信息
+Version {versionNumber} is now available!  Click for more details: 版本{versionNumber}已可使用！  点击以取得更多信息
 This video is unavailable because of missing formats. This can happen due to country unavailability.: 没有这个视频因为缺少格式。这个可能发生由于国家不可用。
 Tooltips:
   Subscription Settings:

From 344d7d12bdbf5b0c5dda895329733010c65b379f Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Sun, 25 Dec 2022 08:51:24 +0100
Subject: [PATCH 148/301] Fixing Stale bot (#2992)

---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 0c0adba2b5a1..14c195a58333 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -20,4 +20,4 @@ jobs:
           stale-issue-label: 'U: stale'
           stale-pr-label: 'PR: stale'
           exempt-pr-labels: 'PR: WIP'
-          exempt-issue-labels: 'U: skip-stale'
+          exempt-issue-labels: 'enhancement'

From 90ac5e6bce560c2102d631b09732f27ae4a3cd1c Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 25 Dec 2022 08:59:45 +0100
Subject: [PATCH 149/301] Fix insecure coookie error (#2990)

---
 src/main/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index e6c3e1f64730..94920f41ef89 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -265,9 +265,7 @@ function runApp() {
 
     // Set CONSENT cookie on reasonable domains
     const consentCookieDomains = [
-      'http://www.youtube.com',
       'https://www.youtube.com',
-      'http://youtube.com',
       'https://youtube.com'
     ]
     consentCookieDomains.forEach(url => {

From 1a0786f39bac7b75f36ee8d0b86c98bd7b8ce688 Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Sun, 25 Dec 2022 20:06:18 +0800
Subject: [PATCH 150/301] ! Fix possible to do both actions in video player by
 scrolling (#2989)

"Scroll playback rate over video player" and "Skip by Scrolling Over Video Player"
---
 src/renderer/components/ft-video-player/ft-video-player.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
index aa8c84eb2ea4..fcbef9a98d70 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -729,6 +729,11 @@ export default Vue.extend({
     },
 
     mouseScrollSkip: function (event) {
+      // Avoid doing both
+      if ((event.ctrlKey || event.metaKey) && this.videoPlaybackRateMouseScroll) {
+        return
+      }
+
       // ensure that the mouse is over the player
       if (event.target && (event.target.matches('.vjs-tech') || event.target.matches('.ftVideoPlayer'))) {
         event.preventDefault()

From 8816d76a23923f4a968f54b725773595f9f8baa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9A=D0=BE=D1=82=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B1=D0=B0=D0=B9?= <artemkotlubai@yandex.ru>
Date: Sun, 25 Dec 2022 19:01:58 +0000
Subject: [PATCH 151/301] Translated using Weblate (Russian)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 760c133b4adf..78b4067eeaaf 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -267,6 +267,7 @@ Settings:
         для создания подпапок.
     Enter Fullscreen on Display Rotate: Входить в полноэкранный режим при повороте
       дисплея
+    Skip by Scrolling Over Video Player: Пропустить, прокручивая видеопроигрыватель
   Subscription Settings:
     Subscription Settings: 'Подписки'
     Hide Videos on Watch: 'Скрывать видео после просмотра'
@@ -688,6 +689,8 @@ Video:
   Premieres on: Премьеры
   Premieres in: Премьеры в
   Premieres: Премьеры
+  Show Super Chat Comment: Показать комментарий «Супер Чата»
+  Scroll to Bottom: Прокрутите вниз
 Videos:
   #& Sort By
   Sort By:
@@ -767,6 +770,8 @@ Comments:
   And others: и других
   Pinned by: Закреплено
   Member: Участник
+  View {replyCount} replies: Просмотреть {replyCount} ответ(а,ов)
+  Hearted: С сердечком
 Up Next: 'Следующий'
 
 # Toast Messages
@@ -885,6 +890,8 @@ Tooltips:
       и удерживайте клавишу Control (клавиша Command на Mac) и щелкните левой кнопкой
       мыши, чтобы быстро вернуться к обычной скорости воспроизведения (1x, если она
       не была изменена в настройках).
+    Skip by Scrolling Over Video Player: Используйте колесо прокрутки, чтобы пропустить
+      видео в стиле MPV.
   Privacy Settings:
     Remove Video Meta Files: Если эта настройка включена, FreeTube автоматически удаляет
       метаданные, созданные во время воспроизведения видео, когда страница просмотра
@@ -928,8 +935,8 @@ Search Bar:
 Are you sure you want to open this link?: Вы действительно хотите открыть эту ссылку?
 Starting download: Запуск загрузки «{videoTitle}»
 Downloading has completed: '«{videoTitle}» закончил загрузку'
-Downloading failed: Возникла проблема с загрузкой "{videoTitle}"
-Screenshot Success: Снимок экрана сохранён как "{filePath}"
+Downloading failed: Возникла проблема с загрузкой «{videoTitle}»
+Screenshot Success: Снимок экрана сохранён как «{filePath}»
 Screenshot Error: Снимок экрана не удался. {error}
 New Window: Новое окно
 Age Restricted:

From 3863d56e9708e1fe8952a3faa5549990581c6c53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Sun, 25 Dec 2022 20:16:05 +0000
Subject: [PATCH 152/301] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 89.8% (590 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/nb_NO/
---
 static/locales/nb_NO.yaml | 97 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)

diff --git a/static/locales/nb_NO.yaml b/static/locales/nb_NO.yaml
index e5ea7b7ab3af..eff27360f966 100644
--- a/static/locales/nb_NO.yaml
+++ b/static/locales/nb_NO.yaml
@@ -78,6 +78,9 @@ Subscriptions:
   This profile has a large number of subscriptions.  Forcing RSS to avoid rate limiting: Denne
     profilen har mange abonnementer. Påtvinger RSS for å unngå adgangsbegrensning
   Error Channels: Kanaler med feil
+  Disabled Automatic Fetching: Automatisk innhenting av abonnementer avskrudd. Gjenoppfrisk
+    abonnementer for å se dem her.
+  Empty Channels: Ingen videoer fra kanaler du abonnerer på enda.
 Trending:
   Trending: 'På vei opp'
   Trending Tabs: På vei opp-faner
@@ -159,6 +162,7 @@ Settings:
       Light: 'Lys'
       Dracula: 'Dracula'
       System Default: Systemforvalg
+      Catppuccin Mocha: Catppuccin-mokka
     Main Color Theme:
       Main Color Theme: 'Hovedfarge'
       Red: 'Rød'
@@ -184,6 +188,20 @@ Settings:
       Dracula Purple: 'Dracula Lilla'
       Dracula Red: 'Dracula Rød'
       Dracula Yellow: 'Dracula Gul'
+      Catppuccin Mocha Flamingo: Catppuccin-mokka-flamingo
+      Catppuccin Mocha Pink: Catppuccin-mokka-rosa
+      Catppuccin Mocha Mauve: Catppuccin-mokka-blålilla
+      Catppuccin Mocha Red: Catppuccin-mokka-rød
+      Catppuccin Mocha Maroon: Catppuccin-mokka-kastanjebrun
+      Catppuccin Mocha Peach: Catppuccin-mokka-fersken
+      Catppuccin Mocha Yellow: Catppuccin-mokka-gul
+      Catppuccin Mocha Lavender: Catppuccin-mokka-lavendel
+      Catppuccin Mocha Sapphire: Catppuccin-mokka-saffir
+      Catppuccin Mocha Blue: Catppuccin-mokka-blå
+      Catppuccin Mocha Sky: Catppuccin-mokka-himmelblå
+      Catppuccin Mocha Green: Catppuccin-mokka-grønn
+      Catppuccin Mocha Teal: Catppuccin-mokka-blågrønn
+      Catppuccin Mocha Rosewater: Catppuccin-mokka-rosévann
     Secondary Color Theme: 'Sekundærfarge'
         #* Main Color Theme
     UI Scale: Grensesnittskala
@@ -229,7 +247,23 @@ Settings:
       Error:
         Forbidden Characters: Forbudte tegn
         Empty File Name: Tomt filnavn
+      Enable: Skru på skjermavbildninger
+      Folder Label: Skjermavbildningsmappe
+      Folder Button: Velg mappe
+      Format Label: Skjermavbildningsformat
+      Quality Label: Skjermavbildningskvalitet
+      Ask Path: Spør om hvor ting skal lagres
+      File Name Tooltip: Du kan bruke variablene nedenfor. %Y år, i 4 siffer. %M måned,
+        i 2 siffer. %D dag, i to siffer. %H time, i to siffer. %N minutt, i to siffer.
+        %s sekund, i to siffer. %T millisekunder, i tre siffer. %s videosekund. %t
+        videomillisekunder, i tre siffer. %i video-ID. Du kan også bruke «\», eller
+        «/» for å lage undermapper.
     Max Video Playback Rate: Maks. videoavspillingshastighet
+    Scroll Playback Rate Over Video Player: Avspillingshastighet ved rulling over
+      videoavspiller
+    Video Playback Rate Interval: Intervall for videoavspillingshastighet
+    Enter Fullscreen on Display Rotate: Fullskjermsvisning når skjermen roteres
+    Skip by Scrolling Over Video Player: Hopp over ved å rulle over videoavspiller
   Privacy Settings:
     Privacy Settings: 'Personvernsinnstillinger'
     Remember History: 'Husk historikk'
@@ -259,6 +293,7 @@ Settings:
     Export Subscriptions: 'Eksporter abonnementer'
     How do I import my subscriptions?: 'Hvordan importerer jeg mine abonnementer?'
     Fetch Feeds from RSS: Hent informasjonskanaler fra RSS
+    Fetch Automatically: Hent informasjonskanaler automatisk
   Advanced Settings:
     Advanced Settings: 'Avanserte innstillinger'
     Enable Debug Mode (Prints data to the console): ''
@@ -364,6 +399,9 @@ Settings:
     Hide Chapters: Skjul kapitler
     Hide Channels Placeholder: Kanalnavn eller ID
     Hide Channels: Skjul videoer fra kanaler
+    Hide Sharing Actions: Skjul delingshandlinger
+    Hide Upcoming Premieres: Skjul kommende premièrer
+    Hide Video Description: Skjul videobeskrivelse
   The app needs to restart for changes to take effect. Restart and apply change?: Start
     programmet på ny for å ta i bruk endringene?
   SponsorBlock Settings:
@@ -375,6 +413,10 @@ Settings:
     SponsorBlock Settings: SponsorBlock-innstillinger
     Skip Options:
       Do Nothing: Ikke gjør noe
+      Prompt To Skip: Spør om å hoppe over
+      Skip Option: Alternativ for å hoppe over
+      Auto Skip: Automatisk
+      Show In Seek Bar: Vis i blafringsfelt
     Category Color: Kategorifarge
   External Player Settings:
     Custom External Player Arguments: Egendefinerte argumenter for ekstern avspiller
@@ -390,11 +432,28 @@ Settings:
     Download Settings: Nedlastingsinnstillinger
     Download in app: Last ned i programmet
     Open in web browser: Åpne i nettleser
+    Download Behavior: Nedlastingsadferd
+    Ask Download Path: Spør om nedlastingssti
   Parental Control Settings:
     Parental Control Settings: Foreldrekontroll
     Hide Search Bar: Skjul søkefelt
+    Show Family Friendly Only: Kun vis familievennlige
+    Hide Unsubscribe Button: Skjul knapp for opphevelse av abonnement
   Experimental Settings:
     Experimental Settings: Eksperimentelle innstillinger
+    Replace HTTP Cache: Erstatt HTTP-hurtiglager
+    Warning: Disse innstillingene er eksperimentelle, og kan forårsake krasj. Sikkerhetskopi
+      anbefales. Bruk på egen risiko.
+  Password Settings:
+    Remove Password: Fjern passord
+    Password Settings: Passordinnstillinger
+    Set Password To Prevent Access: Sett et passord for å forhindre tilgang til innstillingene
+    Set Password: Sett passord
+  Password Dialog:
+    Unlock: Lås opp
+    Enter Password To Unlock: Skriv inn passord for å låse opp innstillinger
+    Password Incorrect: Feil passord
+    Password: Passord
 About:
   #On About page
   About: 'Om'
@@ -597,8 +656,15 @@ Video:
     Resolution: Oppløsning
     Player Dimensions: Avspillerdimensjoner
     Mimetype: Media-type
+    Buffered: Mellomlagret
+    Video ID: Video-ID
+    Video statistics are not available for legacy videos: Videostatistikk er ikke
+      tilgjengelig for gammeldagse videoer
+    Dropped / Total Frames: Tapte/totalt antall rammer
   Show Super Chat Comment: Vis supersludringskommentar
   Scroll to Bottom: Rull til bunnen
+  Premieres on: Har première
+  Premieres: Première
 Videos:
   #& Sort By
   Sort By:
@@ -651,6 +717,7 @@ Share:
   Include Timestamp: Inkluder tidsstempel
   Invidious Channel URL copied to clipboard: Invidious-kanalnettadresse kopiert til
     utklippstavle
+  Share Channel: Del kanal
 Mini Player: 'Miniavspiller'
 Comments:
   Comments: 'Kommentarer'
@@ -675,6 +742,9 @@ Comments:
   From {channelName}: Fra {channelName}
   Pinned by: Festet av
   Member: Medlem
+  And others: og andre
+  View {replyCount} replies: Vis {replyCount} svar
+  Hearted: Hjertemerket
 Up Next: 'Neste'
 
 # Toast Messages
@@ -763,6 +833,8 @@ Tooltips:
     Fetch Feeds from RSS: Bruk RSS istedenfor FreeTube sin forvalgte metode for innhenting
       av din abonnementsstrøm. RSS er raskere og forhindrer IP-blokkering, men mangler
       noe informasjon som videovarighet og sanntidsstatus.
+    Fetch Automatically: Henter abonnementer når en ny video åpnes og ved bytting
+      av profil.
   Player Settings:
     Default Video Format: Sett formater brukt når en video spilles. DASH-formater
       kan spille høyere kvaliteter. Foreldede formater er begrenset til maks. 720p,
@@ -774,6 +846,13 @@ Tooltips:
       av som følge av regionsbegrensninger.
     Proxy Videos Through Invidious: Kobler til Invidious for å servere videoer istedenfor
       å koble direkte til YouTube. Overstyrer API-innstillinger.
+    Skip by Scrolling Over Video Player: Bruk rullehjulet for å hoppe deg gjennom
+      videoen i MPV-stil.
+    Scroll Playback Rate Over Video Player: Når pekeren er over videoen kan du trykke
+      og holde Ctrl-tasten (⌘ på Mac) og rulle musehjulet forover eller bakover for
+      å kontrollere avspillingshastigheten. Trykk og hold Ctrl-tasten (⌘ på Mac) og
+      venstreklikk på musen for å gå tilbake til fovalgt avspillingshastighet (1x
+      med minde det har blitt endret i innstillingene).
   Privacy Settings:
     Remove Video Meta Files: Hvis denne instillingen er på, vil FreeTube automatisk
       slette metadata generert under videoavspilling når du lukker avspillingsiden.
@@ -788,6 +867,14 @@ Tooltips:
     External Player: Valg av ekstern avspiller viser et ikon for åpning av video (spilleliste
       hvis det støttes) i den eksterne avspilleren, på miniatyrbildet.
     DefaultCustomArgumentsTemplate: "(Forvalg: '{defaultCustomArguments}')"
+  Experimental Settings:
+    Replace HTTP Cache: Skrur av Electrons diskbaserte HTTP-hurtiglager og skrur på
+      bildehurtiglager i minne. Medfører økt minnebruk.
+  Distraction Free Settings:
+    Hide Channels: Skiv inn et kanalnavn eller kanal-ID for å skjule alle videoer,
+      spillelister og selve kanalen fra å vises i søk eller på vei opp. Kanalnavnet
+      som skrives inn må være et nøyaktig treff, og gjør forskjell på små og store
+      bokstaver.
 A new blog is now available, {blogTitle}. Click to view more: Et nytt blogginnlegg
   er tilgjengelig, {blogTitle}. Klikk her for å se mer
 The playlist has been reversed: Spillelisten har blitt snudd
@@ -825,11 +912,21 @@ Age Restricted:
   Type:
     Channel: Kanal
     Video: Video
+  This {videoOrPlaylist} is age restricted: Denne {videoOrPlaylist} er aldersbegrenset
 Chapters:
   Chapters: Kapitler
+  'Chapters list visible, current chapter: {chapterName}': 'Kapittelliste synlig.
+    Nåværende kapittel: {chapterName}'
+  'Chapters list hidden, current chapter: {chapterName}': 'Kapittelliste skjult. Nåværende
+    kapittel: {chapterName}'
 Screenshot Success: Lagre skjermavbildning som «{filePath}»
 Screenshot Error: Skjermavbildning mislyktes. {error}
 Ok: OK
 Preferences: Innstillinger
 Downloading failed: Kunne ikke laste ned «{videoTitle}»
 Starting download: Starter nedlasting av «{videoTitle}» …
+Clipboard:
+  Cannot access clipboard without a secure connection: Får ikke tilgang til utklippstavlen
+    uten sikker forbindelse
+  Copy failed: Kunne ikke kopiere til utklippstavlen
+Downloading has completed: «{videoTitle}» er nedlastet

From 18e75325d775bb041063da8b7c50c88102d8f4bd Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Mon, 26 Dec 2022 02:25:13 +0000
Subject: [PATCH 153/301] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/zh_Hant/
---
 static/locales/zh-TW.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/static/locales/zh-TW.yaml b/static/locales/zh-TW.yaml
index 1dc5b408fe1e..b8b9976e4d92 100644
--- a/static/locales/zh-TW.yaml
+++ b/static/locales/zh-TW.yaml
@@ -640,6 +640,8 @@ Video:
     Mimetype: 多媒體類型
   Premieres in: 首映於
   Premieres: 首映
+  Show Super Chat Comment: 顯示超級聊天留言
+  Scroll to Bottom: 捲動至底部
 Videos:
   #& Sort By
   Sort By:
@@ -712,6 +714,8 @@ Comments:
   From {channelName}: 來自 {channelName}
   Pinned by: 釘選由
   Member: 成員
+  View {replyCount} replies: 檢視 {replyCount} 則回覆
+  Hearted: 喜歡的
 Up Next: '觀看其他類似影片'
 
 # Toast Messages

From d490e580227496842663fea9a7bb71e0516f0733 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Dec 2022 08:49:26 -0500
Subject: [PATCH 154/301] Bump videojs-contrib-quality-levels from 2.2.1 to
 3.0.0 (#2996)

Bumps [videojs-contrib-quality-levels](https://github.com/videojs/videojs-contrib-quality-levels) from 2.2.1 to 3.0.0.
- [Release notes](https://github.com/videojs/videojs-contrib-quality-levels/releases)
- [Changelog](https://github.com/videojs/videojs-contrib-quality-levels/blob/main/CHANGELOG.md)
- [Commits](https://github.com/videojs/videojs-contrib-quality-levels/compare/v2.2.1...v3.0.0)

---
updated-dependencies:
- dependency-name: videojs-contrib-quality-levels
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 89d948eaf1b5..aba114975b87 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "process": "^0.11.10",
     "socks-proxy-agent": "^7.0.0",
     "video.js": "7.20.3",
-    "videojs-contrib-quality-levels": "^2.2.1",
+    "videojs-contrib-quality-levels": "^3.0.0",
     "videojs-http-source-selector": "^1.1.6",
     "videojs-mobile-ui": "^0.8.0",
     "videojs-overlay": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 21214e5eebe2..546027171d7d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8236,7 +8236,7 @@ video.js@7.20.3, "video.js@^6 || ^7", "video.js@^6 || ^7 || ^8", video.js@^7.0.0
     videojs-font "3.2.0"
     videojs-vtt.js "^0.15.4"
 
-videojs-contrib-quality-levels@^2.0.4, videojs-contrib-quality-levels@^2.2.1:
+videojs-contrib-quality-levels@^2.0.4:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-2.2.1.tgz#46bd7e1db25e6e45824dadf933b08f0c6ec724a1"
   integrity sha512-cnF6OGGgoC/2nUrbdz54nzPm3BpEZQzMTpyekiX6AXs8imATX2sHbrUz97xXVSHITldk/+d7ZAUrdQYJJTyuug==
@@ -8244,6 +8244,13 @@ videojs-contrib-quality-levels@^2.0.4, videojs-contrib-quality-levels@^2.2.1:
     global "^4.3.2"
     video.js "^6 || ^7 || ^8"
 
+videojs-contrib-quality-levels@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-3.0.0.tgz#bc66f1333b763754b4425455bee4ef6e5ba53984"
+  integrity sha512-sNx38EYUx+Q+gmup1gVTv9P9/sPs28rM7gZOx1sedaHoKxEdYB+ysOGfHj6MSELBMNGMj6ZspdrpSiWguGvGxA==
+  dependencies:
+    global "^4.4.0"
+
 videojs-font@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-3.2.0.tgz#212c9d3f4e4ec3fa7345167d64316add35e92232"

From 529b2164409cb6e7bab3725a46a7bfd24ba89124 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Dec 2022 09:15:55 -0500
Subject: [PATCH 155/301] Bump marked from 4.2.4 to 4.2.5 (#2998)

Bumps [marked](https://github.com/markedjs/marked) from 4.2.4 to 4.2.5.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v4.2.4...v4.2.5)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index aba114975b87..e5e3e2e72fcc 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "http-proxy-agent": "^5.0.0",
     "https-proxy-agent": "^5.0.0",
     "lodash.debounce": "^4.0.8",
-    "marked": "^4.2.4",
+    "marked": "^4.2.5",
     "nedb-promises": "^6.2.1",
     "process": "^0.11.10",
     "socks-proxy-agent": "^7.0.0",
diff --git a/yarn.lock b/yarn.lock
index 546027171d7d..5838a152cde2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5696,10 +5696,10 @@ make-dir@^3.0.2:
   dependencies:
     semver "^6.0.0"
 
-marked@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.4.tgz#5a4ce6c7a1ae0c952601fce46376ee4cf1797e1c"
-  integrity sha512-Wcc9ikX7Q5E4BYDPvh1C6QNSxrjC9tBgz+A/vAhp59KXUgachw++uMvMKiSW8oA85nopmPZcEvBoex/YLMsiyA==
+marked@^4.2.5:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.5.tgz#979813dfc1252cc123a79b71b095759a32f42a5d"
+  integrity sha512-jPueVhumq7idETHkb203WDD4fMA3yV9emQ5vLwop58lu8bTclMghBWcYAavlDqIEMaisADinV1TooIFCfqOsYQ==
 
 matcher@^3.0.0:
   version "3.0.0"

From e7a68eeeab77f858983b40eea7b7fbb7ee2bfa50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Dec 2022 09:17:07 -0500
Subject: [PATCH 156/301] Bump sass from 1.57.0 to 1.57.1 (#2995)

Bumps [sass](https://github.com/sass/dart-sass) from 1.57.0 to 1.57.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.57.0...1.57.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e5e3e2e72fcc..a9830693389a 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.1",
     "rimraf": "^3.0.2",
-    "sass": "^1.57.0",
+    "sass": "^1.57.1",
     "sass-loader": "^13.2.0",
     "tree-kill": "1.2.2",
     "vue-devtools": "^5.1.4",
diff --git a/yarn.lock b/yarn.lock
index 5838a152cde2..b78fc56a86e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7218,10 +7218,10 @@ sass-loader@^13.2.0:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
-sass@^1.57.0:
-  version "1.57.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.57.0.tgz#64c4144ed4e1c0ccb96dc18aef2c424cdbc0c12b"
-  integrity sha512-IZNEJDTK1cF5B1cGA593TPAV/1S0ysUDxq9XHjX/+SMy0QfUny+nfUsq5ZP7wWSl4eEf7wDJcEZ8ABYFmh3m/w==
+sass@^1.57.1:
+  version "1.57.1"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.57.1.tgz#dfafd46eb3ab94817145e8825208ecf7281119b5"
+  integrity sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"

From b77455ec81bdb4fa47d3d20cc19e61a9ca8db1c6 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Mon, 26 Dec 2022 19:15:55 +0100
Subject: [PATCH 157/301] Lazy load playlist components to improve performance
 (#2993)

---
 .../ft-list-video-lazy/ft-list-video-lazy.js  | 55 +++++++++++++++++++
 .../ft-list-video-lazy/ft-list-video-lazy.vue | 23 ++++++++
 .../watch-video-playlist.js                   |  4 +-
 .../watch-video-playlist.vue                  |  2 +-
 .../watch-video-recommendations.js            |  4 +-
 .../watch-video-recommendations.vue           |  2 +-
 src/renderer/views/Playlist/Playlist.js       |  4 +-
 src/renderer/views/Playlist/Playlist.vue      |  2 +-
 8 files changed, 87 insertions(+), 9 deletions(-)
 create mode 100644 src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js
 create mode 100644 src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.vue

diff --git a/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js b/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js
new file mode 100644
index 000000000000..fcffb9278796
--- /dev/null
+++ b/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js
@@ -0,0 +1,55 @@
+import Vue from 'vue'
+import FtListVideo from '../ft-list-video/ft-list-video.vue'
+
+export default Vue.extend({
+  name: 'FtListVideoLazy',
+  components: {
+    'ft-list-video': FtListVideo
+  },
+  props: {
+    data: {
+      type: Object,
+      required: true
+    },
+    playlistId: {
+      type: String,
+      default: null
+    },
+    playlistIndex: {
+      type: Number,
+      default: null
+    },
+    playlistReverse: {
+      type: Boolean,
+      default: false
+    },
+    playlistShuffle: {
+      type: Boolean,
+      default: false
+    },
+    playlistLoop: {
+      type: Boolean,
+      default: false
+    },
+    forceListType: {
+      type: String,
+      default: null
+    },
+    appearance: {
+      type: String,
+      required: true
+    }
+  },
+  data: function () {
+    return {
+      visible: false
+    }
+  },
+  methods: {
+    onVisibilityChanged: function (visible) {
+      if (visible) {
+        this.visible = visible
+      }
+    }
+  }
+})
diff --git a/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.vue b/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.vue
new file mode 100644
index 000000000000..590ca9e78e76
--- /dev/null
+++ b/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.vue
@@ -0,0 +1,23 @@
+<template>
+  <div
+    v-observe-visibility="{
+      callback: onVisibilityChanged,
+      once: true,
+    }"
+  >
+    <ft-list-video
+      v-if="visible"
+      :data="data"
+      :playlist-id="playlistId"
+      :playlist-index="playlistIndex"
+      :playlist-reverse="playlistReverse"
+      :playlist-shuffle="playlistShuffle"
+      :playlist-loop="playlistLoop"
+      :force-list-type="forceListType"
+      :appearance="appearance"
+      @pause-player="$emit('pause-player')"
+    />
+  </div>
+</template>
+
+<script src="./ft-list-video-lazy.js" />
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.js b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
index 32cb461cc16c..c9d78fff42e7 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.js
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import { mapActions, mapMutations } from 'vuex'
 import FtLoader from '../ft-loader/ft-loader.vue'
 import FtCard from '../ft-card/ft-card.vue'
-import FtListVideo from '../ft-list-video/ft-list-video.vue'
+import FtListVideoLazy from '../ft-list-video-lazy/ft-list-video-lazy.vue'
 import { copyToClipboard, showToast } from '../../helpers/utils'
 import { getLocalPlaylist, parseLocalPlaylistVideo } from '../../helpers/api/local'
 
@@ -11,7 +11,7 @@ export default Vue.extend({
   components: {
     'ft-loader': FtLoader,
     'ft-card': FtCard,
-    'ft-list-video': FtListVideo
+    'ft-list-video-lazy': FtListVideoLazy
   },
   props: {
     playlistId: {
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
index 099501da8015..489cb7a35288 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.vue
@@ -108,7 +108,7 @@
               {{ index + 1 }}
             </p>
           </div>
-          <ft-list-video
+          <ft-list-video-lazy
             :data="item"
             :playlist-id="playlistId"
             :playlist-index="reversePlaylist ? playlistItems.length - index - 1 : index"
diff --git a/src/renderer/components/watch-video-recommendations/watch-video-recommendations.js b/src/renderer/components/watch-video-recommendations/watch-video-recommendations.js
index a5107bfcab86..bc52a540b020 100644
--- a/src/renderer/components/watch-video-recommendations/watch-video-recommendations.js
+++ b/src/renderer/components/watch-video-recommendations/watch-video-recommendations.js
@@ -1,14 +1,14 @@
 import Vue from 'vue'
 import { mapActions } from 'vuex'
 import FtCard from '../ft-card/ft-card.vue'
-import FtListVideo from '../ft-list-video/ft-list-video.vue'
+import FtListVideoLazy from '../ft-list-video-lazy/ft-list-video-lazy.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 
 export default Vue.extend({
   name: 'WatchVideoRecommendations',
   components: {
     'ft-card': FtCard,
-    'ft-list-video': FtListVideo,
+    'ft-list-video-lazy': FtListVideoLazy,
     'ft-toggle-switch': FtToggleSwitch
   },
   props: {
diff --git a/src/renderer/components/watch-video-recommendations/watch-video-recommendations.vue b/src/renderer/components/watch-video-recommendations/watch-video-recommendations.vue
index 3e05f8c2bbed..a8b8dd87b656 100644
--- a/src/renderer/components/watch-video-recommendations/watch-video-recommendations.vue
+++ b/src/renderer/components/watch-video-recommendations/watch-video-recommendations.vue
@@ -16,7 +16,7 @@
         @change="updatePlayNextVideo"
       />
     </div>
-    <ft-list-video
+    <ft-list-video-lazy
       v-for="(video, index) in data"
       :key="index"
       :data="video"
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index cdddab46d6b3..9d007f36d9e2 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -3,7 +3,7 @@ import { mapActions, mapMutations } from 'vuex'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import PlaylistInfo from '../../components/playlist-info/playlist-info.vue'
-import FtListVideo from '../../components/ft-list-video/ft-list-video.vue'
+import FtListVideoLazy from '../../components/ft-list-video-lazy/ft-list-video-lazy.vue'
 import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
 import FtButton from '../../components/ft-button/ft-button.vue'
 import i18n from '../../i18n/index'
@@ -16,7 +16,7 @@ export default Vue.extend({
     'ft-loader': FtLoader,
     'ft-card': FtCard,
     'playlist-info': PlaylistInfo,
-    'ft-list-video': FtListVideo,
+    'ft-list-video-lazy': FtListVideoLazy,
     'ft-flex-box': FtFlexBox,
     'ft-button': FtButton
   },
diff --git a/src/renderer/views/Playlist/Playlist.vue b/src/renderer/views/Playlist/Playlist.vue
index 6cc23d7a7798..b7d60a8c774d 100644
--- a/src/renderer/views/Playlist/Playlist.vue
+++ b/src/renderer/views/Playlist/Playlist.vue
@@ -25,7 +25,7 @@
         >
           {{ index + 1 }}
         </p>
-        <ft-list-video
+        <ft-list-video-lazy
           :data="item"
           :playlist-id="playlistId"
           :playlist-index="index"

From 72a839fc1c00b5ba447c5bdb6e3d707af9b233f6 Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Tue, 27 Dec 2022 05:42:43 +0800
Subject: [PATCH 158/301] Update app menu to add items for side nav items
 (#2965)

* * Update app menu to add items for side nav items

* * Show app menu items accoridng to user settings

* * Update app menu on setting update

* ! Fix setting values reading when db entry(s) absent

* $ Use `?.` instead of try/catch

Suggested by absidue

Co-authored-by: absidue <48293849+absidue@users.noreply.github.com>

Co-authored-by: absidue <48293849+absidue@users.noreply.github.com>
---
 src/datastores/handlers/base.js |   8 +++
 src/main/index.js               | 124 +++++++++++++++++++++++++++-----
 2 files changed, 115 insertions(+), 17 deletions(-)

diff --git a/src/datastores/handlers/base.js b/src/datastores/handlers/base.js
index 1250052510cb..285307017abf 100644
--- a/src/datastores/handlers/base.js
+++ b/src/datastores/handlers/base.js
@@ -31,6 +31,14 @@ class Settings {
     return db.settings.findOne({ _id: 'baseTheme' })
   }
 
+  static _findSidenavSettings() {
+    return {
+      hideTrendingVideos: db.settings.findOne({ _id: 'hideTrendingVideos' }),
+      hidePopularVideos: db.settings.findOne({ _id: 'hidePopularVideos' }),
+      hidePlaylists: db.settings.findOne({ _id: 'hidePlaylists' }),
+    }
+  }
+
   static _updateBounds(value) {
     return db.settings.update({ _id: 'bounds' }, { _id: 'bounds', value }, { upsert: true })
   }
diff --git a/src/main/index.js b/src/main/index.js
index 94920f41ef89..10fcf5aac0aa 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -740,6 +740,17 @@ function runApp() {
             event,
             { event: SyncEvents.GENERAL.UPSERT, data }
           )
+          switch (data._id) {
+            // Update app menu on related setting update
+            case 'hideTrendingVideos':
+            case 'hidePopularVideos':
+            case 'hidePlaylists':
+              await setMenu()
+              break
+
+            default:
+              // Do nothing for unmatched settings
+          }
           return null
 
         default:
@@ -1041,7 +1052,12 @@ function runApp() {
     mainWindow.webContents.send('change-view', data)
   }
 
-  function setMenu() {
+  async function setMenu() {
+    const sidenavSettings = baseHandlers.settings._findSidenavSettings()
+    const hideTrendingVideos = (await sidenavSettings.hideTrendingVideos)?.value
+    const hidePopularVideos = (await sidenavSettings.hidePopularVideos)?.value
+    const hidePlaylists = (await sidenavSettings.hidePlaylists)?.value
+
     const template = [
       {
         label: 'File',
@@ -1129,22 +1145,6 @@ function runApp() {
           { type: 'separator' },
           { role: 'togglefullscreen' },
           { type: 'separator' },
-          {
-            label: 'History',
-            // MacOS: Command + Y
-            // Other OS: Ctrl + H
-            accelerator: process.platform === 'darwin' ? 'Cmd+Y' : 'Ctrl+H',
-            click: (_menuItem, browserWindow, _event) => {
-              if (browserWindow == null) { return }
-
-              browserWindow.webContents.send(
-                'change-view',
-                { route: '/history' }
-              )
-            },
-            type: 'normal'
-          },
-          { type: 'separator' },
           {
             label: 'Back',
             accelerator: 'Alt+Left',
@@ -1171,6 +1171,96 @@ function runApp() {
           },
         ]
       },
+      {
+        label: 'Navigate',
+        submenu: [
+          {
+            label: 'Subscriptions',
+            click: (_menuItem, browserWindow, _event) => {
+              if (browserWindow == null) {
+                return
+              }
+
+              browserWindow.webContents.send(
+                'change-view',
+                { route: '/subscriptions' }
+              )
+            },
+            type: 'normal'
+          },
+          {
+            label: 'Channels',
+            click: (_menuItem, browserWindow, _event) => {
+              if (browserWindow == null) {
+                return
+              }
+
+              browserWindow.webContents.send(
+                'change-view',
+                { route: '/subscribedchannels' }
+              )
+            },
+            type: 'normal'
+          },
+          !hideTrendingVideos && {
+            label: 'Trending',
+            click: (_menuItem, browserWindow, _event) => {
+              if (browserWindow == null) {
+                return
+              }
+
+              browserWindow.webContents.send(
+                'change-view',
+                { route: '/trending' }
+              )
+            },
+            type: 'normal'
+          },
+          !hidePopularVideos && {
+            label: 'Most Popular',
+            click: (_menuItem, browserWindow, _event) => {
+              if (browserWindow == null) {
+                return
+              }
+
+              browserWindow.webContents.send(
+                'change-view',
+                { route: '/popular' }
+              )
+            },
+            type: 'normal'
+          },
+          !hidePlaylists && {
+            label: 'Playlists',
+            click: (_menuItem, browserWindow, _event) => {
+              if (browserWindow == null) {
+                return
+              }
+
+              browserWindow.webContents.send(
+                'change-view',
+                { route: '/userplaylists' }
+              )
+            },
+            type: 'normal'
+          },
+          {
+            label: 'History',
+            // MacOS: Command + Y
+            // Other OS: Ctrl + H
+            accelerator: process.platform === 'darwin' ? 'Cmd+Y' : 'Ctrl+H',
+            click: (_menuItem, browserWindow, _event) => {
+              if (browserWindow == null) { return }
+
+              browserWindow.webContents.send(
+                'change-view',
+                { route: '/history' }
+              )
+            },
+            type: 'normal'
+          },
+        ].filter((v) => v !== false),
+      },
       {
         role: 'window',
         submenu: [

From e80d26551b33bc35936e813a947b3eb2189164c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9A=D0=BE=D1=82=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B1=D0=B0=D0=B9?= <artemkotlubai@yandex.ru>
Date: Mon, 26 Dec 2022 20:40:52 +0000
Subject: [PATCH 159/301] Translated using Weblate (Russian)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 78b4067eeaaf..80922e232dd1 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -770,7 +770,7 @@ Comments:
   And others: и других
   Pinned by: Закреплено
   Member: Участник
-  View {replyCount} replies: Просмотреть {replyCount} ответ(а,ов)
+  View {replyCount} replies: Просмотреть {replyCount} ответа(ов)
   Hearted: С сердечком
 Up Next: 'Следующий'
 

From 7163ddff0c3df1e1572e08e5c09ae978d646b058 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 27 Dec 2022 03:14:23 +0100
Subject: [PATCH 160/301] Escape special characters in channel names in ompl
 export (#3004)

---
 .../components/data-settings/data-settings.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/renderer/components/data-settings/data-settings.js b/src/renderer/components/data-settings/data-settings.js
index 857816276370..ceac3eea40af 100644
--- a/src/renderer/components/data-settings/data-settings.js
+++ b/src/renderer/components/data-settings/data-settings.js
@@ -620,20 +620,21 @@ export default Vue.extend({
       }
 
       let opmlData = '<opml version="1.1"><body><outline text="YouTube Subscriptions" title="YouTube Subscriptions">'
-      const endingOpmlString = '</outline></body></opml>'
-
-      let count = 0
 
       this.profileList[0].subscriptions.forEach((channel) => {
-        const channelOpmlString = `<outline text="${channel.name}" title="${channel.name}" type="rss" xmlUrl="https://www.youtube.com/feeds/videos.xml?channel_id=${channel.id}"/>`
-        count++
+        const escapedName = channel.name
+          .replace(/&/g, '&amp;')
+          .replace(/</g, '&lt;')
+          .replace(/>/g, '&gt;')
+          .replace(/"/g, '&quot;')
+          .replace(/'/g, '&apos;')
+
+        const channelOpmlString = `<outline text="${escapedName}" title="${escapedName}" type="rss" xmlUrl="https://www.youtube.com/feeds/videos.xml?channel_id=${channel.id}"/>`
         opmlData += channelOpmlString
-
-        if (count === this.profileList[0].subscriptions.length) {
-          opmlData += endingOpmlString
-        }
       })
 
+      opmlData += '</outline></body></opml>'
+
       const response = await showSaveDialog(options)
       if (response.canceled || response.filePath === '') {
         // User canceled the save dialog

From bef610f91b490ef0c6ee4a52d852e229e887321c Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 27 Dec 2022 03:15:15 +0100
Subject: [PATCH 161/301] Import the product name instead of using a define for
 it (#3003)

---
 _scripts/webpack.main.config.js       | 9 +--------
 _scripts/webpack.renderer.config.js   | 3 ---
 _scripts/webpack.web.config.js        | 3 ---
 src/renderer/App.js                   | 6 +++---
 src/renderer/views/Channel/Channel.js | 5 +++--
 5 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/_scripts/webpack.main.config.js b/_scripts/webpack.main.config.js
index beec7ea9eb94..c787cf02b474 100644
--- a/_scripts/webpack.main.config.js
+++ b/_scripts/webpack.main.config.js
@@ -1,10 +1,7 @@
 const path = require('path')
-const webpack = require('webpack')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const JsonMinimizerPlugin = require('json-minimizer-webpack-plugin')
 
-const { productName } = require('../package.json')
-
 const isDevMode = process.env.NODE_ENV === 'development'
 
 const config = {
@@ -36,11 +33,7 @@ const config = {
     __dirname: isDevMode,
     __filename: isDevMode
   },
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env.PRODUCT_NAME': JSON.stringify(productName),
-    }),
-  ],
+  plugins: [],
   output: {
     filename: '[name].js',
     libraryTarget: 'commonjs2',
diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
index 5425e605c014..898ba0ffbc45 100644
--- a/_scripts/webpack.renderer.config.js
+++ b/_scripts/webpack.renderer.config.js
@@ -6,8 +6,6 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
 const ProcessLocalesPlugin = require('./ProcessLocalesPlugin')
 
-const { productName } = require('../package.json')
-
 const isDevMode = process.env.NODE_ENV === 'development'
 
 const config = {
@@ -110,7 +108,6 @@ const config = {
   },
   plugins: [
     new webpack.DefinePlugin({
-      'process.env.PRODUCT_NAME': JSON.stringify(productName),
       'process.env.IS_ELECTRON': true
     }),
     new HtmlWebpackPlugin({
diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
index df1b3f4fd79e..015eb8019a05 100644
--- a/_scripts/webpack.web.config.js
+++ b/_scripts/webpack.web.config.js
@@ -9,8 +9,6 @@ const JsonMinimizerPlugin = require('json-minimizer-webpack-plugin')
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
 const ProcessLocalesPlugin = require('./ProcessLocalesPlugin')
 
-const { productName } = require('../package.json')
-
 const isDevMode = process.env.NODE_ENV === 'development'
 
 const config = {
@@ -114,7 +112,6 @@ const config = {
   },
   plugins: [
     new webpack.DefinePlugin({
-      'process.env.PRODUCT_NAME': JSON.stringify(productName),
       'process.env.IS_ELECTRON': false
     }),
     new webpack.ProvidePlugin({
diff --git a/src/renderer/App.js b/src/renderer/App.js
index 92cd8066a9ba..a4500b93fe95 100644
--- a/src/renderer/App.js
+++ b/src/renderer/App.js
@@ -76,10 +76,10 @@ export default Vue.extend({
       if (this.$route.meta.title !== 'Channel' && this.$route.meta.title !== 'Watch') {
         let title =
         this.$route.meta.path === '/home'
-          ? process.env.PRODUCT_NAME
-          : `${this.$t(this.$route.meta.title)} - ${process.env.PRODUCT_NAME}`
+          ? packageDetails.productName
+          : `${this.$t(this.$route.meta.title)} - ${packageDetails.productName}`
         if (!title) {
-          title = process.env.PRODUCT_NAME
+          title = packageDetails.productName
         }
         return title
       } else {
diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index ec66b5b37caf..4550ddf1f12c 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -16,6 +16,7 @@ import autolinker from 'autolinker'
 import { MAIN_PROFILE_ID } from '../../../constants'
 import i18n from '../../i18n/index'
 import { copyToClipboard, showToast } from '../../helpers/utils'
+import packageDetails from '../../../../package.json'
 
 export default Vue.extend({
   name: 'Search',
@@ -273,7 +274,7 @@ export default Vue.extend({
         this.idType = 1
         this.channelName = channelName
         this.isFamilyFriendly = response.isFamilyFriendly
-        document.title = `${this.channelName} - ${process.env.PRODUCT_NAME}`
+        document.title = `${this.channelName} - ${packageDetails.productName}`
         if (this.hideChannelSubscriptions || response.subscriberCount === 0) {
           this.subCount = null
         } else {
@@ -373,7 +374,7 @@ export default Vue.extend({
         const channelName = response.author
         const channelId = response.authorId
         this.channelName = channelName
-        document.title = `${this.channelName} - ${process.env.PRODUCT_NAME}`
+        document.title = `${this.channelName} - ${packageDetails.productName}`
         this.id = channelId
         this.isFamilyFriendly = response.isFamilyFriendly
         if (this.hideChannelSubscriptions) {

From cdc1b712bd22014446cccae1853d0900763982cb Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 27 Dec 2022 03:15:38 +0100
Subject: [PATCH 162/301] Use path.sep instead of working out the directory
 separator ourselves (#3002)

---
 src/renderer/components/ft-video-player/ft-video-player.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
index fcbef9a98d70..a120861c8e8f 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -1390,10 +1390,9 @@ export default Vue.extend({
         return
       }
 
-      const dirChar = process.platform === 'win32' ? '\\' : '/'
       let subDir = ''
-      if (filename.indexOf(dirChar) !== -1) {
-        const lastIndex = filename.lastIndexOf(dirChar)
+      if (filename.indexOf(path.sep) !== -1) {
+        const lastIndex = filename.lastIndexOf(path.sep)
         subDir = filename.substring(0, lastIndex)
         filename = filename.substring(lastIndex + 1)
       }

From cb0349d36508d4822c33ee348de463cc6d13d826 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Dec 2022 10:15:59 +0800
Subject: [PATCH 163/301] Bump @babel/core from 7.20.5 to 7.20.7 (#2997)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.20.5 to 7.20.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.20.7/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 134 +++++++++++++++++++++++++++++----------------------
 2 files changed, 77 insertions(+), 59 deletions(-)

diff --git a/package.json b/package.json
index a9830693389a..172117edcc99 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "ytsr": "^3.8.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.5",
+    "@babel/core": "^7.20.7",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/preset-env": "^7.20.2",
     "babel-eslint": "^10.1.0",
diff --git a/yarn.lock b/yarn.lock
index b78fc56a86e0..ed383557885e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -29,38 +29,43 @@
   dependencies:
     "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.0", "@babel/compat-data@^7.20.1":
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733"
   integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==
 
-"@babel/core@^7.20.5":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113"
-  integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==
+"@babel/compat-data@^7.20.5":
+  version "7.20.10"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec"
+  integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==
+
+"@babel/core@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz#37072f951bd4d28315445f66e0ec9f6ae0c8c35f"
+  integrity sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.5"
-    "@babel/helper-compilation-targets" "^7.20.0"
-    "@babel/helper-module-transforms" "^7.20.2"
-    "@babel/helpers" "^7.20.5"
-    "@babel/parser" "^7.20.5"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.5"
-    "@babel/types" "^7.20.5"
+    "@babel/generator" "^7.20.7"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-module-transforms" "^7.20.7"
+    "@babel/helpers" "^7.20.7"
+    "@babel/parser" "^7.20.7"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.20.7"
+    "@babel/types" "^7.20.7"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.20.5":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95"
-  integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==
+"@babel/generator@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a"
+  integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==
   dependencies:
-    "@babel/types" "^7.20.5"
+    "@babel/types" "^7.20.7"
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
@@ -79,14 +84,15 @@
     "@babel/helper-explode-assignable-expression" "^7.18.6"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a"
-  integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb"
+  integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==
   dependencies:
-    "@babel/compat-data" "^7.20.0"
+    "@babel/compat-data" "^7.20.5"
     "@babel/helper-validator-option" "^7.18.6"
     browserslist "^4.21.3"
+    lru-cache "^5.1.1"
     semver "^6.3.0"
 
 "@babel/helper-create-class-features-plugin@^7.18.6":
@@ -179,19 +185,19 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712"
-  integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.7":
+  version "7.20.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0"
+  integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
     "@babel/helper-module-imports" "^7.18.6"
     "@babel/helper-simple-access" "^7.20.2"
     "@babel/helper-split-export-declaration" "^7.18.6"
     "@babel/helper-validator-identifier" "^7.19.1"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.1"
-    "@babel/types" "^7.20.2"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.20.10"
+    "@babel/types" "^7.20.7"
 
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
@@ -293,14 +299,14 @@
     "@babel/traverse" "^7.18.11"
     "@babel/types" "^7.18.10"
 
-"@babel/helpers@^7.20.5":
-  version "7.20.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763"
-  integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==
+"@babel/helpers@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce"
+  integrity sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==
   dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.5"
-    "@babel/types" "^7.20.5"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.20.7"
+    "@babel/types" "^7.20.7"
 
 "@babel/highlight@^7.10.4":
   version "7.17.9"
@@ -320,10 +326,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.18.10", "@babel/parser@^7.18.4", "@babel/parser@^7.20.5", "@babel/parser@^7.7.0":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8"
-  integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
+"@babel/parser@^7.18.4", "@babel/parser@^7.20.7", "@babel/parser@^7.7.0":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
+  integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
@@ -924,35 +930,35 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.18.10", "@babel/template@^7.18.6":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
-  integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
+"@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
+  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
   dependencies:
     "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.18.10"
-    "@babel/types" "^7.18.10"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
 
-"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5", "@babel/traverse@^7.7.0":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133"
-  integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==
+"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.7", "@babel/traverse@^7.7.0":
+  version "7.20.10"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.10.tgz#2bf98239597fcec12f842756f186a9dde6d09230"
+  integrity sha512-oSf1juCgymrSez8NI4A2sr4+uB/mFd9MXplYGPEBnfAuWmmyeVcHa6xLPiaRBcXkcb/28bgxmQLTVwFKE1yfsg==
   dependencies:
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.5"
+    "@babel/generator" "^7.20.7"
     "@babel/helper-environment-visitor" "^7.18.9"
     "@babel/helper-function-name" "^7.19.0"
     "@babel/helper-hoist-variables" "^7.18.6"
     "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.20.5"
-    "@babel/types" "^7.20.5"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84"
-  integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==
+"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
+  integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
   dependencies:
     "@babel/helper-string-parser" "^7.19.4"
     "@babel/helper-validator-identifier" "^7.19.1"
@@ -5657,6 +5663,13 @@ lru-cache@^4.1.2:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -8638,6 +8651,11 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"

From a3a20a64b1a2dcccfdeee780c85a9fb23d6bff63 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 27 Dec 2022 03:20:32 +0100
Subject: [PATCH 164/301] Only show prompt close button when it is needed
 (#3001)

---
 src/renderer/components/data-settings/data-settings.vue | 1 +
 src/renderer/components/ft-prompt/ft-prompt.js          | 4 ++++
 src/renderer/components/ft-prompt/ft-prompt.vue         | 1 +
 3 files changed, 6 insertions(+)

diff --git a/src/renderer/components/data-settings/data-settings.vue b/src/renderer/components/data-settings/data-settings.vue
index 2d842a802727..efe753c0e962 100644
--- a/src/renderer/components/data-settings/data-settings.vue
+++ b/src/renderer/components/data-settings/data-settings.vue
@@ -48,6 +48,7 @@
       :label="$t('Settings.Data Settings.Select Export Type')"
       :option-names="exportSubscriptionsPromptNames"
       :option-values="subscriptionsPromptValues"
+      :show-close="true"
       @click="exportSubscriptions"
     />
   </ft-settings-section>
diff --git a/src/renderer/components/ft-prompt/ft-prompt.js b/src/renderer/components/ft-prompt/ft-prompt.js
index 309f7d015dbd..22b6c2bf0212 100644
--- a/src/renderer/components/ft-prompt/ft-prompt.js
+++ b/src/renderer/components/ft-prompt/ft-prompt.js
@@ -27,6 +27,10 @@ export default Vue.extend({
     optionValues: {
       type: Array,
       default: () => { return [] }
+    },
+    showClose: {
+      type: Boolean,
+      default: false
     }
   },
   data: function () {
diff --git a/src/renderer/components/ft-prompt/ft-prompt.vue b/src/renderer/components/ft-prompt/ft-prompt.vue
index ba9e2272e3ee..7f02421031f6 100644
--- a/src/renderer/components/ft-prompt/ft-prompt.vue
+++ b/src/renderer/components/ft-prompt/ft-prompt.vue
@@ -34,6 +34,7 @@
             @click="$emit('click', optionValues[index])"
           />
           <ft-button
+            v-if="showClose"
             :id="'prompt-' + sanitizedLabel + '-close'"
             :label="$t('Close')"
             tabindex="0"

From 76159e19aec6b0957daacb96b2df45fa3f8a5512 Mon Sep 17 00:00:00 2001
From: "J. Lavoie" <j.lavoie@net-c.ca>
Date: Tue, 27 Dec 2022 09:24:10 +0000
Subject: [PATCH 165/301] Translated using Weblate (German)

Currently translated at 99.6% (655 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/de/
---
 static/locales/de-DE.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/static/locales/de-DE.yaml b/static/locales/de-DE.yaml
index 849dc0e9cbfa..fe0d076d7926 100644
--- a/static/locales/de-DE.yaml
+++ b/static/locales/de-DE.yaml
@@ -269,6 +269,7 @@ Settings:
         Millisekunde 3 Ziffern. %i Video-ID. Sie können auch \ oder / verwenden, um
         Unterordner zu erstellen.
     Enter Fullscreen on Display Rotate: Bei drehen des Bildschirms zu Vollbild wechseln
+    Skip by Scrolling Over Video Player: Überspringen durch Scrollen über den Videoplayer
   Subscription Settings:
     Subscription Settings: Abonnement-Einstellungen
     Hide Videos on Watch: Verstecke Videos bei Wiedergabe
@@ -712,6 +713,7 @@ Video:
   Premieres in: Premieren in
   Premieres: Premiere
   Show Super Chat Comment: Super-Chat-Kommentar anzeigen
+  Scroll to Bottom: Nach unten scrollen
 Videos:
   #& Sort By
   Sort By:
@@ -799,6 +801,7 @@ Comments:
   Pinned by: Angeheftet von
   Member: Mitglied
   View {replyCount} replies: '{replyCount} Antworten ansehen'
+  Hearted: Gefällt mir
 Up Next: Nächster Titel
 
 # Toast Messages
@@ -914,6 +917,8 @@ Tooltips:
       zu steuern. Halten Sie die Strg-Taste (Befehlstaste auf dem Mac) gedrückt und
       klicken Sie mit der linken Maustaste, um schnell zur Standard-Wiedergabegeschwindigkeit
       zurückzukehren (1x, sofern sie nicht in den Einstellungen geändert wurde).
+    Skip by Scrolling Over Video Player: Verwenden Sie das Scrollrad, um durch das
+      Video zu springen, MPV-Stil.
   Privacy Settings:
     Remove Video Meta Files: Bei Aktivierung löscht FreeTube alle Meta-Dateien die
       während der Videowiedergabe erzeugt werden, sobald die Videoseite verlassen

From 4a62e8f83279e3a147d30465bd67e4453645995c Mon Sep 17 00:00:00 2001
From: "J. Lavoie" <j.lavoie@net-c.ca>
Date: Tue, 27 Dec 2022 09:26:07 +0000
Subject: [PATCH 166/301] Translated using Weblate (Finnish)

Currently translated at 99.0% (651 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/fi/
---
 static/locales/fi.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/static/locales/fi.yaml b/static/locales/fi.yaml
index 60596b9dbfe1..62c4e3a38ada 100644
--- a/static/locales/fi.yaml
+++ b/static/locales/fi.yaml
@@ -262,6 +262,7 @@ Settings:
         %t Videon Millisekunnit 3 numeroa. %i Videotunniste eli ID. Voit myös käyttää
         "\" tai "/" luodaksesi alikansioita.
     Enter Fullscreen on Display Rotate: Siirry koko näytön kokoiseen näytön kiertoon
+    Skip by Scrolling Over Video Player: Ohita vierittämällä videosoittimen yli
   Subscription Settings:
     Subscription Settings: 'Tilausasetukset'
     Hide Videos on Watch: 'Piilota katsotut videot'
@@ -676,6 +677,8 @@ Video:
     Dropped / Total Frames: Pudotettu / Yhteensä
   Premieres on: Julkaistaan
   Premieres: Ensilähetykset
+  Show Super Chat Comment: Näytä Super Chat -kommentti
+  Scroll to Bottom: Vieritä alaspäin
 Videos:
   #& Sort By
   Sort By:
@@ -750,6 +753,7 @@ Comments:
   From {channelName}: kanavalta {channelName}
   And others: ja muut
   Member: Jäsen
+  View {replyCount} replies: Näytä {replyCount} vastausta
 Up Next: 'Seuraavaksi'
 
 # Toast Messages

From cf645bc5bbb47467a38978d83ef890258c9392ea Mon Sep 17 00:00:00 2001
From: "J. Lavoie" <j.lavoie@net-c.ca>
Date: Tue, 27 Dec 2022 09:23:53 +0000
Subject: [PATCH 167/301] Translated using Weblate (French)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/fr/
---
 static/locales/fr-FR.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/static/locales/fr-FR.yaml b/static/locales/fr-FR.yaml
index 346cefe790d8..213c225bfcd1 100644
--- a/static/locales/fr-FR.yaml
+++ b/static/locales/fr-FR.yaml
@@ -278,6 +278,7 @@ Settings:
       File Name Label: Modèle de nom de fichier
       Folder Label: Dossier de capture d'écran
     Enter Fullscreen on Display Rotate: Entrer en plein écran sur l'affichage Rotation
+    Skip by Scrolling Over Video Player: Sauter en faisant défiler le lecteur vidéo
   Subscription Settings:
     Subscription Settings: 'Paramètres des abonnements'
     Hide Videos on Watch: 'Masquer les vidéos visionnées'
@@ -723,6 +724,8 @@ Video:
   Premieres on: Avant-première le
   Premieres in: Première dans
   Premieres: Avant-première
+  Show Super Chat Comment: Afficher le commentaire Super Chat
+  Scroll to Bottom: Faire défiler jusqu'en bas
 Videos:
   #& Sort By
   Sort By:
@@ -803,6 +806,8 @@ Comments:
   Pinned by: Épinglé par
   And others: et d'autres
   Member: Membre
+  Hearted: Aimé
+  View {replyCount} replies: Voir les {replyCount} réponses
 Up Next: 'À suivre'
 
 # Toast Messages
@@ -908,6 +913,8 @@ Tooltips:
       de lecture. Maintenez la touche Contrôle (touche Commande sur Mac) enfoncée
       et cliquez sur le bouton gauche de la souris pour revenir rapidement à la vitesse
       de lecture par défaut (1x, sauf si elle a été modifiée dans les paramètres).
+    Skip by Scrolling Over Video Player: Utilisez la molette de défilement pour passer
+      d'une vidéo à l'autre, en style MPV.
   General Settings:
     Invidious Instance: L'instance Invidious à laquelle FreeTube se connectera pour
       les appels API.

From 75046777e937eb7a94ce8457d37449fa1be9324a Mon Sep 17 00:00:00 2001
From: "J. Lavoie" <j.lavoie@net-c.ca>
Date: Tue, 27 Dec 2022 09:27:12 +0000
Subject: [PATCH 168/301] Translated using Weblate (English (United Kingdom))

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/en_GB/
---
 static/locales/en_GB.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/static/locales/en_GB.yaml b/static/locales/en_GB.yaml
index f745eb264a75..f9ae758c303a 100644
--- a/static/locales/en_GB.yaml
+++ b/static/locales/en_GB.yaml
@@ -268,6 +268,7 @@ Settings:
       Format Label: Screenshot format
       Ask Path: Ask for Save Folder
       File Name Label: Filename pattern
+    Skip by Scrolling Over Video Player: Skip by scrolling over video player
   External Player Settings:
     External Player Settings: External Player Settings
     External Player: External Player
@@ -711,6 +712,8 @@ Video:
     Video ID: Video ID
   Premieres in: Premieres in
   Premieres: Premieres
+  Show Super Chat Comment: Show Super Chat comment
+  Scroll to Bottom: Scroll to bottom
 Videos:
   #& Sort By
   Sort By:
@@ -787,6 +790,8 @@ Comments:
   From {channelName}: from {channelName}
   And others: and others
   Member: Member
+  Hearted: Hearted
+  View {replyCount} replies: View {replyCount} replies
 Up Next: 'Up Next'
 
 # Toast Messages
@@ -835,6 +840,8 @@ Tooltips:
       or backwards to control the playback rate. Press and hold the Control key (Command
       Key on Mac) and left click the mouse to quickly return to the default playback
       rate (1x unless it has been changed in the settings).
+    Skip by Scrolling Over Video Player: Use the scroll wheel to skip through the
+      video, MPV style.
   General Settings:
     Region for Trending: The region of trends allows you to pick which country’s trending
       videos you want to have displayed. Not all countries displayed are actually

From b208e496ad77eb15a4a83589740a0c51a7f886bc Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 27 Dec 2022 16:15:50 +0100
Subject: [PATCH 169/301] Migrate the trending page to YouTube.js (#3005)

* Migrate the trending page to YouTube.js

* Move more of the logic to the local API file

* This function doesn't need to be exported anymore
---
 package.json                            |  1 -
 src/renderer/helpers/api/local.js       | 64 +++++++++++++++++++++++--
 src/renderer/views/Search/Search.js     |  4 +-
 src/renderer/views/Trending/Trending.js | 29 +++++------
 yarn.lock                               |  7 ---
 5 files changed, 73 insertions(+), 32 deletions(-)

diff --git a/package.json b/package.json
index 172117edcc99..994bb6c6d3f6 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,6 @@
     "@fortawesome/vue-fontawesome": "^2.0.9",
     "@freetube/youtube-chat": "^1.1.2",
     "@freetube/yt-comment-scraper": "^6.2.0",
-    "@freetube/yt-trending-scraper": "^3.1.1",
     "@silvermine/videojs-quality-selector": "^1.2.5",
     "autolinker": "^4.0.0",
     "browserify": "^17.0.0",
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 398bee391f15..f4edfb4cb562 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -2,7 +2,7 @@ import { Innertube, Session } from 'youtubei.js'
 import { join } from 'path'
 
 import { PlayerCache } from './PlayerCache'
-import { getUserDataPath } from '../utils'
+import { extractNumberFromString, getUserDataPath } from '../utils'
 
 /**
  * Creates a lightweight Innertube instance, which is faster to create or
@@ -12,21 +12,24 @@ import { getUserDataPath } from '../utils'
  * 1. the request for the session
  * 2. fetch a page that contains a link to the player
  * 3. if the player isn't cached, it is downloaded and transformed
- * @param {boolean} withPlayer set to true to get an Innertube instance that can decode the streaming URLs
+ * @param {object} options
+ * @param {boolean} options.withPlayer set to true to get an Innertube instance that can decode the streaming URLs
+ * @param {string|undefined} options.location the geolocation to pass to YouTube get different content
  * @returns the Innertube instance
  */
-async function createInnertube(withPlayer = false) {
-  if (withPlayer) {
+async function createInnertube(options = { withPlayer: false, location: undefined }) {
+  if (options.withPlayer) {
     const userData = await getUserDataPath()
 
     return await Innertube.create({
       // use browser fetch
+      location: options.location,
       fetch: (input, init) => fetch(input, init),
       cache: new PlayerCache(join(userData, 'player_cache'))
     })
   } else {
     // from https://github.com/LuanRT/YouTube.js/pull/240
-    const sessionData = await Session.getSessionData()
+    const sessionData = await Session.getSessionData(undefined, options.location)
 
     const session = new Session(
       sessionData.context,
@@ -62,6 +65,35 @@ export async function getLocalPlaylist(id) {
   return await innertube.getPlaylist(id)
 }
 
+/**
+ * @typedef {import('youtubei.js/dist/src/core/TabbedFeed').default} TabbedFeed
+ */
+
+/**
+ * @param {string} location
+ * @param {string} tab
+ * @param {TabbedFeed|null} instance
+ */
+export async function getLocalTrending(location, tab, instance) {
+  if (instance === null) {
+    const innertube = await createInnertube({ location })
+    instance = await innertube.getTrending()
+  }
+
+  // youtubei.js's tab names are localised, so we need to use the index to get tab name that youtubei.js expects
+  const tabIndex = ['default', 'music', 'gaming', 'movies'].indexOf(tab)
+  const resultsInstance = await instance.getTabByName(instance.tabs[tabIndex])
+
+  const results = resultsInstance.videos
+    .filter((video) => video.type === 'Video')
+    .map(parseLocalListVideo)
+
+  return {
+    results,
+    instance: resultsInstance
+  }
+}
+
 /**
  * @typedef {import('youtubei.js/dist/src/parser/classes/PlaylistVideo').default} PlaylistVideo
  */
@@ -78,3 +110,25 @@ export function parseLocalPlaylistVideo(video) {
     lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds
   }
 }
+
+/**
+ * @typedef {import('youtubei.js/dist/src/parser/classes/Video').default} Video
+ */
+
+/**
+ * @param {Video} video
+ */
+function parseLocalListVideo(video) {
+  return {
+    type: 'video',
+    videoId: video.id,
+    title: video.title.text,
+    author: video.author.name,
+    authorId: video.author.id,
+    description: video.description,
+    viewCount: extractNumberFromString(video.view_count.text),
+    publishedText: video.published.text,
+    lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds,
+    liveNow: video.is_live
+  }
+}
diff --git a/src/renderer/views/Search/Search.js b/src/renderer/views/Search/Search.js
index 6be08e05577d..0b762d76db50 100644
--- a/src/renderer/views/Search/Search.js
+++ b/src/renderer/views/Search/Search.js
@@ -3,7 +3,7 @@ import { mapActions } from 'vuex'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
-import { calculateLengthInSeconds } from '@freetube/yt-trending-scraper/src/HtmlParser'
+import { timeToSeconds } from 'youtubei.js/dist/src/utils/Utils'
 import { copyToClipboard, searchFiltersMatch, showToast } from '../../helpers/utils'
 
 export default Vue.extend({
@@ -155,7 +155,7 @@ export default Vue.extend({
             let videoDuration = video.duration
             const videoId = video.id
             if (videoDuration !== null && videoDuration !== '' && videoDuration !== 'LIVE' && videoDuration !== 'UPCOMING' && videoDuration !== 'PREMIERE') {
-              videoDuration = calculateLengthInSeconds(video.duration)
+              videoDuration = timeToSeconds(video.duration)
             }
             dataToShow.push(
               {
diff --git a/src/renderer/views/Trending/Trending.js b/src/renderer/views/Trending/Trending.js
index 22402cfead2b..3950adda2826 100644
--- a/src/renderer/views/Trending/Trending.js
+++ b/src/renderer/views/Trending/Trending.js
@@ -6,8 +6,8 @@ import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
 import FtIconButton from '../../components/ft-icon-button/ft-icon-button.vue'
 import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
 
-import { scrapeTrendingPage } from '@freetube/yt-trending-scraper'
 import { copyToClipboard, showToast } from '../../helpers/utils'
+import { getLocalTrending } from '../../helpers/api/local'
 
 export default Vue.extend({
   name: 'Trending',
@@ -22,7 +22,8 @@ export default Vue.extend({
     return {
       isLoading: false,
       shownResults: [],
-      currentTab: 'default'
+      currentTab: 'default',
+      trendingInstance: null
     }
   },
   computed: {
@@ -77,27 +78,21 @@ export default Vue.extend({
       }
     },
 
-    getTrendingInfoLocal: function () {
+    getTrendingInfoLocal: async function () {
       this.isLoading = true
 
-      const param = {
-        parseCreatorOnRise: false,
-        page: this.currentTab,
-        geoLocation: this.region
-      }
-
-      scrapeTrendingPage(param).then((result) => {
-        const returnData = result.filter((item) => {
-          return item.type === 'video' || item.type === 'channel' || item.type === 'playlist'
-        })
+      try {
+        const { results, instance } = await getLocalTrending(this.region, this.currentTab, this.trendingInstance)
 
-        this.shownResults = returnData
+        this.shownResults = results
         this.isLoading = false
-        this.$store.commit('setTrendingCache', { value: returnData, page: this.currentTab })
+        this.trendingInstance = instance
+
+        this.$store.commit('setTrendingCache', { value: results, page: this.currentTab })
         setTimeout(() => {
           this.$refs[this.currentTab].focus()
         })
-      }).catch((err) => {
+      } catch (err) {
         console.error(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
         showToast(`${errorMessage}: ${err}`, 10000, () => {
@@ -109,7 +104,7 @@ export default Vue.extend({
         } else {
           this.isLoading = false
         }
-      })
+      }
     },
 
     getTrendingInfoCache: function () {
diff --git a/yarn.lock b/yarn.lock
index ed383557885e..216257d92be6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1066,13 +1066,6 @@
   dependencies:
     axios "^0.27.2"
 
-"@freetube/yt-trending-scraper@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@freetube/yt-trending-scraper/-/yt-trending-scraper-3.1.1.tgz#82d11ac3dad3ea25bc0f30d68e315364e9977046"
-  integrity sha512-qgWFLefcKiLfJmETtEeDVuv9MQ50JFwkGlR3NITDG/SzdrhTFBizG5Ggs34sub6UQd6M6Ib8HxI/lgtKYqN7qA==
-  dependencies:
-    axios "^0.27.2"
-
 "@humanwhocodes/config-array@^0.5.0":
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"

From 46ce42dbacfe5d03f49dd7a9b162de72d16ab9ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9A=D0=BE=D1=82=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B1=D0=B0=D0=B9?= <artemkotlubai@yandex.ru>
Date: Tue, 27 Dec 2022 20:40:49 +0000
Subject: [PATCH 170/301] Translated using Weblate (Russian)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 80922e232dd1..c9c26e075a1f 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -509,7 +509,7 @@ About:
   FAQ: ЧАВО
   FreeTube Wiki: Вики FreeTube
   Help: Помощь
-  GitHub releases: Релизы на GitHub
+  GitHub releases: Выпуски на GitHub
   Downloads / Changelog: Скачать / Список изменений
   View License: Посмотреть лицензию
   Licensed under the AGPLv3: Лицензия AGPLv3

From bb179aec702b79915622d63cd105bb1e08f3e87f Mon Sep 17 00:00:00 2001
From: Kyotaro Iijima <kyotaro.eyes@gmail.com>
Date: Wed, 28 Dec 2022 12:28:58 +0000
Subject: [PATCH 171/301] Translated using Weblate (Japanese)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ja/
---
 static/locales/ja.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/static/locales/ja.yaml b/static/locales/ja.yaml
index 25f52f837efd..ae11889ce2fe 100644
--- a/static/locales/ja.yaml
+++ b/static/locales/ja.yaml
@@ -383,7 +383,7 @@ Settings:
     Skip Options:
       Skip Option: オプションのスキップ
       Auto Skip: 自動スキップ
-      Show In Seek Bar: 動画の進行状況バーの非表示
+      Show In Seek Bar: 動画の進行バーの非表示
       Prompt To Skip: ログイン プロンプトのスキップ
       Do Nothing: 何もしない
     Category Color: カテゴリの色
@@ -635,6 +635,8 @@ Video:
     Dropped / Total Frames: ドロップ率 / 総フレーム数
   Premieres in: 配信開始まで
   Premieres: プレミア
+  Show Super Chat Comment: Super Chat のコメント表示
+  Scroll to Bottom: 下までスクロール
 Videos:
   #& Sort By
   Sort By:
@@ -707,6 +709,8 @@ Comments:
   Pinned by: ピン留め
   From {channelName}: '{channelName} から'
   Member: メンバー
+  Hearted: ハート付
+  View {replyCount} replies: '{replyCount} 件の返信を表示'
 Up Next: '次の動画'
 
 # Toast Messages

From f50c77e1bab7cdd0c2148169d03bc8dd5ffb1cfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9A=D0=BE=D1=82=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B1=D0=B0=D0=B9?= <artemkotlubai@yandex.ru>
Date: Wed, 28 Dec 2022 11:30:56 +0000
Subject: [PATCH 172/301] Translated using Weblate (Russian)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index c9c26e075a1f..786ce9038af3 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -127,7 +127,7 @@ Settings:
       Grid: 'Сеткой'
       List: 'Списком'
     Thumbnail Preference:
-      Thumbnail Preference: 'Настройки миниатюр'
+      Thumbnail Preference: 'Настройка заставок'
       Default: 'По умолчанию'
       Beginning: 'В начале'
       Middle: 'В середине'
@@ -850,8 +850,8 @@ This video is unavailable because of missing formats. This can happen due to cou
   ограничений.
 Tooltips:
   General Settings:
-    Thumbnail Preference: Все эскизы во FreeTube будут заменены кадром видео вместо
-      эскиза по умолчанию.
+    Thumbnail Preference: Все заставки во FreeTube будут заменены снимком из видео
+      вместо заставки по умолчанию.
     Invidious Instance: Образец Invidious, к которому FreeTube будет подключаться
       для вызовов набора функций.
     Fallback to Non-Preferred Backend on Failure: Если у вашего предпочитаемого набора

From 1d1e6eacea4e190f44359fc2c268addcc8d6f75d Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Thu, 29 Dec 2022 02:19:48 +0100
Subject: [PATCH 173/301] Switch from sync fs APIs to fs/promises (#2991)

* Switch from sync fs APIs to fs/promises

* Fix error and await storyboard creation

* Start a new file for filesystem helpers starting with pathExists
---
 _scripts/webpack.renderer.config.js           | 28 ++----
 _scripts/webpack.web.config.js                |  2 +-
 .../experimental-settings.js                  | 27 +++---
 .../ft-video-player/ft-video-player.js        | 36 ++++----
 .../general-settings/general-settings.js      | 18 +---
 src/renderer/helpers/api/PlayerCache.js       | 28 +++---
 src/renderer/helpers/filesystem.js            | 14 +++
 src/renderer/helpers/utils.js                 | 26 ++----
 src/renderer/i18n/index.js                    | 39 +++-----
 src/renderer/store/modules/invidious.js       |  7 +-
 src/renderer/store/modules/settings.js        |  4 +-
 src/renderer/store/modules/utils.js           | 33 +++----
 src/renderer/views/Watch/Watch.js             | 88 +++++++++----------
 13 files changed, 155 insertions(+), 195 deletions(-)
 create mode 100644 src/renderer/helpers/filesystem.js

diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
index 898ba0ffbc45..ecf1249adc2d 100644
--- a/_scripts/webpack.renderer.config.js
+++ b/_scripts/webpack.renderer.config.js
@@ -8,6 +8,12 @@ const ProcessLocalesPlugin = require('./ProcessLocalesPlugin')
 
 const isDevMode = process.env.NODE_ENV === 'development'
 
+const processLocalesPlugin = new ProcessLocalesPlugin({
+  compress: !isDevMode,
+  inputDir: path.join(__dirname, '../static/locales'),
+  outputDir: 'static/locales',
+})
+
 const config = {
   name: 'renderer',
   mode: process.env.NODE_ENV,
@@ -107,8 +113,10 @@ const config = {
     __filename: isDevMode
   },
   plugins: [
+    processLocalesPlugin,
     new webpack.DefinePlugin({
-      'process.env.IS_ELECTRON': true
+      'process.env.IS_ELECTRON': true,
+      'process.env.LOCALE_NAMES': JSON.stringify(processLocalesPlugin.localeNames)
     }),
     new HtmlWebpackPlugin({
       excludeChunks: ['processTaskWorker'],
@@ -142,22 +150,4 @@ const config = {
   target: 'electron-renderer',
 }
 
-/**
- * Adjust rendererConfig for production settings
- */
-if (!isDevMode) {
-  const processLocalesPlugin = new ProcessLocalesPlugin({
-    compress: true,
-    inputDir: path.join(__dirname, '../static/locales'),
-    outputDir: 'static/locales',
-  })
-
-  config.plugins.push(
-    processLocalesPlugin,
-    new webpack.DefinePlugin({
-      'process.env.LOCALE_NAMES': JSON.stringify(processLocalesPlugin.localeNames)
-    })
-  )
-}
-
 module.exports = config
diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
index 015eb8019a05..a18115e95f87 100644
--- a/_scripts/webpack.web.config.js
+++ b/_scripts/webpack.web.config.js
@@ -137,7 +137,7 @@ const config = {
     fallback: {
       buffer: require.resolve('buffer/'),
       dns: require.resolve('browserify/lib/_empty.js'),
-      fs: require.resolve('browserify/lib/_empty.js'),
+      'fs/promises': require.resolve('browserify/lib/_empty.js'),
       http: require.resolve('stream-http'),
       https: require.resolve('https-browserify'),
       net: require.resolve('browserify/lib/_empty.js'),
diff --git a/src/renderer/components/experimental-settings/experimental-settings.js b/src/renderer/components/experimental-settings/experimental-settings.js
index ec0116809fb9..ff2a1cb7ca3b 100644
--- a/src/renderer/components/experimental-settings/experimental-settings.js
+++ b/src/renderer/components/experimental-settings/experimental-settings.js
@@ -1,9 +1,10 @@
-import { closeSync, existsSync, openSync, rmSync } from 'fs'
+import fs from 'fs/promises'
 import Vue from 'vue'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtPrompt from '../ft-prompt/ft-prompt.vue'
+import { pathExists } from '../../helpers/filesystem'
 import { getUserDataPath } from '../../helpers/utils'
 
 export default Vue.extend({
@@ -26,28 +27,19 @@ export default Vue.extend({
     getUserDataPath().then((userData) => {
       this.replaceHttpCachePath = `${userData}/experiment-replace-http-cache`
 
-      this.replaceHttpCache = existsSync(this.replaceHttpCachePath)
-      this.replaceHttpCacheLoading = false
+      pathExists(this.replaceHttpCachePath).then((exists) => {
+        this.replaceHttpCache = exists
+        this.replaceHttpCacheLoading = false
+      })
     })
   },
   methods: {
-    updateReplaceHttpCache: function () {
-      this.replaceHttpCache = !this.replaceHttpCache
-
-      if (this.replaceHttpCache) {
-        // create an empty file
-        closeSync(openSync(this.replaceHttpCachePath, 'w'))
-      } else {
-        rmSync(this.replaceHttpCachePath)
-      }
-    },
-
     handleRestartPrompt: function (value) {
       this.replaceHttpCache = value
       this.showRestartPrompt = true
     },
 
-    handleReplaceHttpCache: function (value) {
+    handleReplaceHttpCache: async function (value) {
       this.showRestartPrompt = false
 
       if (value === null || value === 'no') {
@@ -57,9 +49,10 @@ export default Vue.extend({
 
       if (this.replaceHttpCache) {
         // create an empty file
-        closeSync(openSync(this.replaceHttpCachePath, 'w'))
+        const handle = await fs.open(this.replaceHttpCachePath, 'w')
+        await handle.close()
       } else {
-        rmSync(this.replaceHttpCachePath)
+        await fs.rm(this.replaceHttpCachePath)
       }
 
       const { ipcRenderer } = require('electron')
diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
index a120861c8e8f..8a229b0335c4 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -3,7 +3,7 @@ import { mapActions } from 'vuex'
 
 import videojs from 'video.js'
 import qualitySelector from '@silvermine/videojs-quality-selector'
-import fs from 'fs'
+import fs from 'fs/promises'
 import path from 'path'
 import 'videojs-overlay/dist/videojs-overlay'
 import 'videojs-overlay/dist/videojs-overlay.css'
@@ -15,6 +15,7 @@ import 'videojs-mobile-ui/dist/videojs-mobile-ui.css'
 import { IpcChannels } from '../../../constants'
 import { sponsorBlockSkipSegments } from '../../helpers/sponsorblock'
 import { calculateColorLuminance, colors } from '../../helpers/colors'
+import { pathExists } from '../../helpers/filesystem'
 import { getPicturesPath, showSaveDialog, showToast } from '../../helpers/utils'
 
 export default Vue.extend({
@@ -769,22 +770,23 @@ export default Vue.extend({
       }
     },
 
-    determineMaxFramerate: function() {
+    determineMaxFramerate: async function() {
       if (this.dashSrc.length === 0) {
         this.maxFramerate = 60
         return
       }
-      fs.readFile(this.dashSrc[0].url, (err, data) => {
-        if (err) {
-          this.maxFramerate = 60
-          return
-        }
+
+      try {
+        const data = await fs.readFile(this.dashSrc[0].url)
+
         if (data.includes('frameRate="60"')) {
           this.maxFramerate = 60
         } else {
           this.maxFramerate = 30
         }
-      })
+      } catch {
+        this.maxFramerate = 60
+      }
     },
 
     determineDefaultQualityLegacy: function () {
@@ -1406,7 +1408,7 @@ export default Vue.extend({
           this.player.pause()
         }
 
-        if (this.screenshotFolder === '' || !fs.existsSync(this.screenshotFolder)) {
+        if (this.screenshotFolder === '' || !(await pathExists(this.screenshotFolder))) {
           dirPath = await getPicturesPath()
         } else {
           dirPath = this.screenshotFolder
@@ -1445,9 +1447,9 @@ export default Vue.extend({
           dirPath = path.join(this.screenshotFolder, subDir)
         }
 
-        if (!fs.existsSync(dirPath)) {
+        if (!(await pathExists(dirPath))) {
           try {
-            fs.mkdirSync(dirPath, { recursive: true })
+            fs.mkdir(dirPath, { recursive: true })
           } catch (err) {
             console.error(err)
             showToast(this.$t('Screenshot Error', { error: err }))
@@ -1462,14 +1464,14 @@ export default Vue.extend({
         result.arrayBuffer().then(ab => {
           const arr = new Uint8Array(ab)
 
-          fs.writeFile(filePath, arr, (err) => {
-            if (err) {
+          fs.writeFile(filePath, arr)
+            .then(() => {
+              showToast(this.$t('Screenshot Success', { filePath }))
+            })
+            .catch((err) => {
               console.error(err)
               showToast(this.$t('Screenshot Error', { error: err }))
-            } else {
-              showToast(this.$t('Screenshot Success', { filePath }))
-            }
-          })
+            })
         })
       }, mimeType, imageQuality)
       canvas.remove()
diff --git a/src/renderer/components/general-settings/general-settings.js b/src/renderer/components/general-settings/general-settings.js
index aa2f05fc5544..4c19aba53f5d 100644
--- a/src/renderer/components/general-settings/general-settings.js
+++ b/src/renderer/components/general-settings/general-settings.js
@@ -114,22 +114,10 @@ export default Vue.extend({
     },
 
     localeNames: function () {
-      if (process.env.NODE_ENV !== 'development' || !process.env.IS_ELECTRON) {
-        return [
-          this.$t('Settings.General Settings.System Default'),
-          ...process.env.LOCALE_NAMES
-        ]
-      }
-
-      const names = [
-        this.$t('Settings.General Settings.System Default')
+      return [
+        this.$t('Settings.General Settings.System Default'),
+        ...process.env.LOCALE_NAMES
       ]
-
-      Object.entries(this.$i18n.messages).forEach(([locale, localeData]) => {
-        names.push(localeData['Locale Name'] ?? locale)
-      })
-
-      return names
     },
 
     backendNames: function () {
diff --git a/src/renderer/helpers/api/PlayerCache.js b/src/renderer/helpers/api/PlayerCache.js
index 95e2a4f1ced8..345d9153c16e 100644
--- a/src/renderer/helpers/api/PlayerCache.js
+++ b/src/renderer/helpers/api/PlayerCache.js
@@ -1,5 +1,7 @@
-import { access, mkdir, readFile, unlink, writeFile } from 'fs/promises'
-import { resolve } from 'path'
+import fs from 'fs/promises'
+import path from 'path'
+
+import { pathExists } from '../filesystem'
 
 // based off https://github.com/LuanRT/YouTube.js/blob/6caa679df6ddc77d25be02dcb7355b722ab268aa/src/utils/Cache.ts
 // avoids errors caused by the fully dynamic `fs` and `path` module imports that youtubei.js's UniversalCache does
@@ -9,10 +11,10 @@ export class PlayerCache {
   }
 
   async get(key) {
-    const filePath = resolve(this.cacheDirectory, key)
+    const filePath = path.resolve(this.cacheDirectory, key)
 
     try {
-      const contents = await readFile(filePath)
+      const contents = await fs.readFile(filePath)
       return contents.buffer
     } catch (e) {
       if (e?.code === 'ENOENT') {
@@ -23,19 +25,19 @@ export class PlayerCache {
   }
 
   async set(key, value) {
-    await mkdir(this.cacheDirectory, { recursive: true })
+    await fs.mkdir(this.cacheDirectory, { recursive: true })
 
-    const filePath = resolve(this.cacheDirectory, key)
-    await writeFile(filePath, new Uint8Array(value))
+    const filePath = path.resolve(this.cacheDirectory, key)
+    await fs.writeFile(filePath, new Uint8Array(value))
   }
 
   async remove(key) {
-    const filePath = resolve(this.cacheDirectory, key)
+    const filePath = path.resolve(this.cacheDirectory, key)
 
-    // only try to delete the file if it exists, access() throws an exception if the file doesn't exist
-    try {
-      await access(filePath)
-      await unlink(filePath)
-    } catch { }
+    if (await pathExists(filePath)) {
+      try {
+        await fs.unlink(filePath)
+      } catch { }
+    }
   }
 }
diff --git a/src/renderer/helpers/filesystem.js b/src/renderer/helpers/filesystem.js
new file mode 100644
index 000000000000..c245070fc420
--- /dev/null
+++ b/src/renderer/helpers/filesystem.js
@@ -0,0 +1,14 @@
+import fs from 'fs/promises'
+
+/**
+ * Async version of existsSync, as node doesn't have it
+ * @param {string} path
+ */
+export async function pathExists(path) {
+  try {
+    await fs.access(path)
+    return true
+  } catch {
+    return false
+  }
+}
diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index 83334c118099..55a5fcf327a9 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -1,4 +1,4 @@
-import fs from 'fs'
+import fs from 'fs/promises'
 
 import { IpcChannels } from '../../constants'
 import FtToastEvents from '../components/ft-toast/ft-toast-events'
@@ -260,13 +260,11 @@ export function readFileFromDialog(response, index = 0) {
   return new Promise((resolve, reject) => {
     if (process.env.IS_ELECTRON) {
       // if this is Electron, use fs
-      fs.readFile(response.filePaths[index], (err, data) => {
-        if (err) {
-          reject(err)
-          return
-        }
-        resolve(new TextDecoder('utf-8').decode(data))
-      })
+      fs.readFile(response.filePaths[index])
+        .then(data => {
+          resolve(new TextDecoder('utf-8').decode(data))
+        })
+        .catch(reject)
     } else {
       // if this is web, use FileReader
       try {
@@ -315,16 +313,8 @@ export async function showSaveDialog (options) {
 */
 export async function writeFileFromDialog (response, content) {
   if (process.env.IS_ELECTRON) {
-    return await new Promise((resolve, reject) => {
-      const { filePath } = response
-      fs.writeFile(filePath, content, (error) => {
-        if (error) {
-          reject(error)
-        } else {
-          resolve()
-        }
-      })
-    })
+    const { filePath } = response
+    return await fs.writeFile(filePath, content)
   } else {
     if ('showOpenFilePicker' in window) {
       const { handle } = response
diff --git a/src/renderer/i18n/index.js b/src/renderer/i18n/index.js
index a6b25992d67a..56c17705d041 100644
--- a/src/renderer/i18n/index.js
+++ b/src/renderer/i18n/index.js
@@ -1,27 +1,9 @@
 import Vue from 'vue'
 import VueI18n from 'vue-i18n'
-import fs from 'fs'
 import { createWebURL } from '../helpers/utils'
 // List of locales approved for use
 import activeLocales from '../../../static/locales/activeLocales.json'
 
-const messages = {}
-
-if (process.env.NODE_ENV === 'development' && process.env.IS_ELECTRON) {
-  const { load } = require('js-yaml')
-
-  // Take active locales and load respective YAML file
-  activeLocales.forEach((locale) => {
-    try {
-      // File location when running in dev
-      const doc = load(fs.readFileSync(`static/locales/${locale}.yaml`))
-      messages[locale] = doc
-    } catch (e) {
-      console.error(locale, e)
-    }
-  })
-}
-
 class CustomVueI18n extends VueI18n {
   constructor(options) {
     super(options)
@@ -29,8 +11,6 @@ class CustomVueI18n extends VueI18n {
   }
 
   async loadLocale(locale) {
-    // we don't lazy load locales in development in electron
-    if (process.env.NODE_ENV === 'development' && process.env.IS_ELECTRON) { return }
     // don't need to load it if it's already loaded
     if (this.availableLocales.includes(locale)) {
       return
@@ -39,14 +19,18 @@ class CustomVueI18n extends VueI18n {
       console.error(`Unable to load unknown locale: "${locale}"`)
     }
 
-    if (process.env.IS_ELECTRON) {
-      const { brotliDecompressSync } = require('zlib')
+    if (process.env.IS_ELECTRON && process.env.NODE_ENV !== 'development') {
+      const { readFile } = require('fs/promises')
+      const { promisify } = require('util')
+      const { brotliDecompress } = require('zlib')
+      const brotliDecompressAsync = promisify(brotliDecompress)
       // locales are only compressed in our production Electron builds
       try {
         // decompress brotli compressed json file and then load it
         // eslint-disable-next-line node/no-path-concat
-        const compressed = fs.readFileSync(`${__dirname}/static/locales/${locale}.json.br`)
-        const data = JSON.parse(brotliDecompressSync(compressed).toString())
+        const compressed = await readFile(`${__dirname}/static/locales/${locale}.json.br`)
+        const decompressed = await brotliDecompressAsync(compressed)
+        const data = JSON.parse(decompressed.toString())
         this.setLocaleMessage(locale, data)
       } catch (err) {
         console.error(locale, err)
@@ -65,12 +49,9 @@ Vue.use(CustomVueI18n)
 
 const i18n = new CustomVueI18n({
   locale: 'en-US',
-  fallbackLocale: { default: 'en-US' },
-  messages
+  fallbackLocale: { default: 'en-US' }
 })
 
-if (process.env.NODE_ENV !== 'development' || !process.env.IS_ELECTRON) {
-  i18n.loadLocale('en-US')
-}
+i18n.loadLocale('en-US')
 
 export default i18n
diff --git a/src/renderer/store/modules/invidious.js b/src/renderer/store/modules/invidious.js
index dea8942ac617..669ae926f9a7 100644
--- a/src/renderer/store/modules/invidious.js
+++ b/src/renderer/store/modules/invidious.js
@@ -1,4 +1,5 @@
-import fs from 'fs'
+import fs from 'fs/promises'
+import { pathExists } from '../../helpers/filesystem'
 
 const state = {
   currentInvidiousInstance: '',
@@ -42,9 +43,9 @@ const actions = {
       const fileName = 'invidious-instances.json'
       /* eslint-disable-next-line */
       const fileLocation = process.env.NODE_ENV === 'development' ? './static/' : `${__dirname}/static/`
-      if (fs.existsSync(`${fileLocation}${fileName}`)) {
+      if (await pathExists(`${fileLocation}${fileName}`)) {
         console.warn('reading static file for invidious instances')
-        const fileData = fs.readFileSync(`${fileLocation}${fileName}`)
+        const fileData = await fs.readFile(`${fileLocation}${fileName}`)
         instances = JSON.parse(fileData).map((entry) => {
           return entry.url
         })
diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
index fbcdbb97d343..141ebd4f8c87 100644
--- a/src/renderer/store/modules/settings.js
+++ b/src/renderer/store/modules/settings.js
@@ -324,9 +324,7 @@ const stateWithSideEffects = {
         }
       }
 
-      if (process.env.NODE_ENV !== 'development' || !process.env.IS_ELECTRON) {
-        await i18n.loadLocale(targetLocale)
-      }
+      await i18n.loadLocale(targetLocale)
 
       i18n.locale = targetLocale
       await dispatch('getRegionData', {
diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index 77a8385cfce4..29479da3df1a 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -1,8 +1,9 @@
-import fs from 'fs'
+import fs from 'fs/promises'
 import path from 'path'
 import i18n from '../../i18n/index'
 
 import { IpcChannels } from '../../../constants'
+import { pathExists } from '../../helpers/filesystem'
 import {
   createWebURL,
   openExternalLink,
@@ -136,9 +137,9 @@ const actions = {
 
       folderPath = response.filePath
     } else {
-      if (!fs.existsSync(folderPath)) {
+      if (!(await pathExists(folderPath))) {
         try {
-          fs.mkdirSync(folderPath, { recursive: true })
+          await fs.mkdir(folderPath, { recursive: true })
         } catch (err) {
           console.error(err)
           showToast(err)
@@ -181,14 +182,14 @@ const actions = {
     const blobFile = new Blob(chunks)
     const buffer = await blobFile.arrayBuffer()
 
-    fs.writeFile(folderPath, new DataView(buffer), (err) => {
-      if (err) {
-        console.error(err)
-        showToast(errorMessage)
-      } else {
-        showToast(i18n.t('Downloading has completed', { videoTitle: title }))
-      }
-    })
+    try {
+      await fs.writeFile(folderPath, new DataView(buffer))
+
+      showToast(i18n.t('Downloading has completed', { videoTitle: title }))
+    } catch (err) {
+      console.error(err)
+      showToast(errorMessage)
+    }
   },
 
   parseScreenshotCustomFileName: function({ rootState }, payload) {
@@ -241,12 +242,12 @@ const actions = {
     // Exclude __dirname from path if not in electron
     const fileLocation = `${process.env.IS_ELECTRON ? process.env.NODE_ENV === 'development' ? '.' : __dirname : ''}/static/geolocations/`
     if (process.env.IS_ELECTRON) {
-      localePathExists = fs.existsSync(`${fileLocation}${locale}`)
+      localePathExists = await pathExists(`${fileLocation}${locale}`)
     } else {
       localePathExists = process.env.GEOLOCATION_NAMES.includes(locale)
     }
     const pathName = `${fileLocation}${localePathExists ? locale : 'en-US'}/countries.json`
-    const fileData = process.env.IS_ELECTRON ? JSON.parse(fs.readFileSync(pathName)) : await (await fetch(createWebURL(pathName))).json()
+    const fileData = process.env.IS_ELECTRON ? JSON.parse(await fs.readFile(pathName)) : await (await fetch(createWebURL(pathName))).json()
 
     const countries = fileData.map((entry) => { return { id: entry.id, name: entry.name, code: entry.alpha2 } })
     countries.sort((a, b) => { return a.id - b.id })
@@ -512,14 +513,14 @@ const actions = {
     showToast(i18n.t('Video.External Player.UnsupportedActionTemplate', { externalPlayer, action }))
   },
 
-  getExternalPlayerCmdArgumentsData ({ commit }, payload) {
+  async getExternalPlayerCmdArgumentsData ({ commit }, payload) {
     const fileName = 'external-player-map.json'
     let fileData
     /* eslint-disable-next-line */
     const fileLocation = process.env.NODE_ENV === 'development' ? './static/' : `${__dirname}/static/`
 
-    if (fs.existsSync(`${fileLocation}${fileName}`)) {
-      fileData = fs.readFileSync(`${fileLocation}${fileName}`)
+    if (await pathExists(`${fileLocation}${fileName}`)) {
+      fileData = await fs.readFile(`${fileLocation}${fileName}`)
     } else {
       fileData = '[{"name":"None","value":"","cmdArguments":null}]'
     }
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 6ce4172dc6f8..fd82bf18b1ab 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { mapActions } from 'vuex'
-import fs from 'fs'
+import fs from 'fs/promises'
 import ytDashGen from 'yt-dash-manifest-generator'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtVideoPlayer from '../../components/ft-video-player/ft-video-player.vue'
@@ -13,6 +13,7 @@ import WatchVideoPlaylist from '../../components/watch-video-playlist/watch-vide
 import WatchVideoRecommendations from '../../components/watch-video-recommendations/watch-video-recommendations.vue'
 import FtAgeRestricted from '../../components/ft-age-restricted/ft-age-restricted.vue'
 import i18n from '../../i18n/index'
+import { pathExists } from '../../helpers/filesystem'
 import {
   buildVTTFileLocally,
   copyToClipboard,
@@ -616,7 +617,7 @@ export default Vue.extend({
 
             if (typeof result.player_response.storyboards !== 'undefined') {
               const templateUrl = result.player_response.storyboards.playerStoryboardSpecRenderer.spec
-              this.createLocalStoryboardUrls(templateUrl)
+              await this.createLocalStoryboardUrls(templateUrl)
             }
           }
 
@@ -1199,22 +1200,22 @@ export default Vue.extend({
           const dashFileLocation = `static/dashFiles/${videoId}.xml`
           const vttFileLocation = `static/storyboards/${videoId}.vtt`
           // only delete the file it actually exists
-          if (fs.existsSync(dashFileLocation)) {
-            fs.rmSync(dashFileLocation)
+          if (await pathExists(dashFileLocation)) {
+            await fs.rm(dashFileLocation)
           }
-          if (fs.existsSync(vttFileLocation)) {
-            fs.rmSync(vttFileLocation)
+          if (await pathExists(vttFileLocation)) {
+            await fs.rm(vttFileLocation)
           }
         } else {
           const userData = await getUserDataPath()
           const dashFileLocation = `${userData}/dashFiles/${videoId}.xml`
           const vttFileLocation = `${userData}/storyboards/${videoId}.vtt`
 
-          if (fs.existsSync(dashFileLocation)) {
-            fs.rmSync(dashFileLocation)
+          if (await pathExists(dashFileLocation)) {
+            await fs.rm(dashFileLocation)
           }
-          if (fs.existsSync(vttFileLocation)) {
-            fs.rmSync(vttFileLocation)
+          if (await pathExists(vttFileLocation)) {
+            await fs.rm(vttFileLocation)
           }
         }
       }
@@ -1247,23 +1248,23 @@ export default Vue.extend({
         fileLocation = `static/dashFiles/${this.videoId}.xml`
         uriSchema = `dashFiles/${this.videoId}.xml`
         // if the location does not exist, writeFileSync will not create the directory, so we have to do that manually
-        if (!fs.existsSync('static/dashFiles/')) {
-          fs.mkdirSync('static/dashFiles/')
+        if (!(await pathExists('static/dashFiles/'))) {
+          await fs.mkdir('static/dashFiles/')
         }
 
-        if (fs.existsSync(fileLocation)) {
-          fs.rmSync(fileLocation)
+        if (await pathExists(fileLocation)) {
+          await fs.rm(fileLocation)
         }
-        fs.writeFileSync(fileLocation, xmlData)
+        await fs.writeFile(fileLocation, xmlData)
       } else {
         fileLocation = `${userData}/dashFiles/${this.videoId}.xml`
         uriSchema = `file://${fileLocation}`
 
-        if (!fs.existsSync(`${userData}/dashFiles/`)) {
-          fs.mkdirSync(`${userData}/dashFiles/`)
+        if (!(await pathExists(`${userData}/dashFiles/`))) {
+          await fs.mkdir(`${userData}/dashFiles/`)
         }
 
-        fs.writeFileSync(fileLocation, xmlData)
+        await fs.writeFile(fileLocation, xmlData)
       }
 
       return [
@@ -1293,7 +1294,7 @@ export default Vue.extend({
       ]
     },
 
-    createLocalStoryboardUrls: function (templateUrl) {
+    createLocalStoryboardUrls: async function (templateUrl) {
       const storyboards = templateUrl.split('|')
       const storyboardArray = []
       // Second storyboard: L1/M0 - Third storyboard: L2/M0 - Fourth: L3/M0
@@ -1318,35 +1319,34 @@ export default Vue.extend({
       })
       // TODO: MAKE A VARIABLE WHICH CAN CHOOSE BETWEEN STORYBOARD ARRAY ELEMENTS
       const results = buildVTTFileLocally(storyboardArray[1])
-      getUserDataPath().then((userData) => {
-        let fileLocation
-        let uriSchema
-
-        // Dev mode doesn't have access to the file:// schema, so we access
-        // storyboards differently when run in dev
-        if (process.env.NODE_ENV === 'development') {
-          fileLocation = `static/storyboards/${this.videoId}.vtt`
-          uriSchema = `storyboards/${this.videoId}.vtt`
-          // if the location does not exist, writeFileSync will not create the directory, so we have to do that manually
-          if (!fs.existsSync('static/storyboards/')) {
-            fs.mkdirSync('static/storyboards/')
-          }
+      const userData = await getUserDataPath()
+      let fileLocation
+      let uriSchema
 
-          fs.rm(fileLocation, () => {
-            fs.writeFileSync(fileLocation, results)
-          })
-        } else {
-          if (!fs.existsSync(`${userData}/storyboards/`)) {
-            fs.mkdirSync(`${userData}/storyboards/`)
-          }
-          fileLocation = `${userData}/storyboards/${this.videoId}.vtt`
-          uriSchema = `file://${fileLocation}`
+      // Dev mode doesn't have access to the file:// schema, so we access
+      // storyboards differently when run in dev
+      if (process.env.NODE_ENV === 'development') {
+        fileLocation = `static/storyboards/${this.videoId}.vtt`
+        uriSchema = `storyboards/${this.videoId}.vtt`
+        // if the location does not exist, writeFile will not create the directory, so we have to do that manually
+        if (!(await pathExists('static/storyboards/'))) {
+          fs.mkdir('static/storyboards/')
+        } else if (await pathExists(fileLocation)) {
+          await fs.rm(fileLocation)
+        }
 
-          fs.writeFileSync(fileLocation, results)
+        await fs.writeFile(fileLocation, results)
+      } else {
+        if (!(await pathExists(`${userData}/storyboards/`))) {
+          await fs.mkdir(`${userData}/storyboards/`)
         }
+        fileLocation = `${userData}/storyboards/${this.videoId}.vtt`
+        uriSchema = `file://${fileLocation}`
 
-        this.videoStoryboardSrc = uriSchema
-      })
+        await fs.writeFile(fileLocation, results)
+      }
+
+      this.videoStoryboardSrc = uriSchema
     },
 
     tryAddingTranslatedLocaleCaption: function (captionTracks, locale, baseUrl) {

From dc770422b9eead13ddcd1fe6b55497a63de6cb96 Mon Sep 17 00:00:00 2001
From: jc <jcwkgxc@nightorb.com>
Date: Thu, 29 Dec 2022 01:48:40 +0000
Subject: [PATCH 174/301] Translated using Weblate (Portuguese (Portugal))

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt_PT/
---
 static/locales/pt-PT.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/static/locales/pt-PT.yaml b/static/locales/pt-PT.yaml
index c4d085a3cfcd..a908773b3c86 100644
--- a/static/locales/pt-PT.yaml
+++ b/static/locales/pt-PT.yaml
@@ -674,6 +674,8 @@ Video:
     Player Dimensions: Dimensões do reprodutor
   Premieres on: Estreia a
   Premieres: Estreias
+  Show Super Chat Comment: Mostrar Comentário do Super Chat
+  Scroll to Bottom: Percorrer para o fundo
 Videos:
   #& Sort By
   Sort By:
@@ -754,6 +756,8 @@ Comments:
   From {channelName}: de {channelName}
   Pinned by: Fixado por
   Member: Membro
+  View {replyCount} replies: Ver {Contagem de respostas} respostas
+  Hearted: Coração
 Up Next: Próximo
 
 #Tooltips

From 0890c57c6ea527254bc065bdac12929ddce44a33 Mon Sep 17 00:00:00 2001
From: Milo Ivir <mail@milotype.de>
Date: Thu, 29 Dec 2022 18:35:23 +0000
Subject: [PATCH 175/301] Translated using Weblate (Croatian)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/hr/
---
 static/locales/hr.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/static/locales/hr.yaml b/static/locales/hr.yaml
index 5dde4c1ce756..57e78ffc11eb 100644
--- a/static/locales/hr.yaml
+++ b/static/locales/hr.yaml
@@ -207,7 +207,7 @@ Settings:
     Secondary Color Theme: 'Sekundarna boja teme'
         #* Main Color Theme
     UI Scale: Uvećanje korisničkog sučelja
-    Disable Smooth Scrolling: Deaktiviraj neisprekidano klizanje
+    Disable Smooth Scrolling: Deaktiviraj neisprekidano pomicanje
     Expand Side Bar by Default: Standardno proširi bočnu traku
     Hide Side Bar Labels: Sakrij oznake bočnih traka
     Hide FreeTube Header Logo: Sakrij FreeTube logotip u zaglavlju
@@ -266,6 +266,7 @@ Settings:
         podmapa.
     Enter Fullscreen on Display Rotate: Koristi cjeloekranski prikaz pri okretanju
       ekrana
+    Skip by Scrolling Over Video Player: Preskoči pomicanjem preko video playera
   Privacy Settings:
     Privacy Settings: 'Postavke privatnosti'
     Remember History: 'Zapamti povijest'
@@ -734,6 +735,8 @@ Video:
     Dropped / Total Frames: Ispušteni/ukupni kadrovi
   Premieres in: Premijera u
   Premieres: Premijere
+  Show Super Chat Comment: Prikaži Super Chat komentar
+  Scroll to Bottom: Pomakni se skroz dolje
 Videos:
   #& Sort By
   Sort By:
@@ -810,6 +813,8 @@ Comments:
   And others: i drugi
   Pinned by: Prikvačio/la
   Member: Član
+  Hearted: Omiljeno
+  View {replyCount} replies: Pogledaj {replyCount} odgovora
 Up Next: 'Sljedeći'
 
 # Toast Messages
@@ -857,6 +862,8 @@ Tooltips:
       ili natrag za upravljanje brzine reprodukcije. Pritisni i drži tipku Control
       (Command tipka na Macu) i pritisni lijevom tipkom miša za brzo vraćanje na standardnu
       brzinu reprodukcije (jednostruka brzina, ukoliko nije promijenjena u postavkama).
+    Skip by Scrolling Over Video Player: Koristi kotačić za pregledavanje videa, MPV
+      stil.
   General Settings:
     Invidious Instance: Invidious primjerak na koji će se FreeTube povezati za pozive
       API-a.

From 38ef4a3e47069451618e7f3764f6949997e02b74 Mon Sep 17 00:00:00 2001
From: Rusi Dimitrov <astral_86@mail.bg>
Date: Thu, 29 Dec 2022 17:23:42 +0000
Subject: [PATCH 176/301] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/bg/
---
 static/locales/bg.yaml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/static/locales/bg.yaml b/static/locales/bg.yaml
index 8e59ddc43bb0..015d968799c5 100644
--- a/static/locales/bg.yaml
+++ b/static/locales/bg.yaml
@@ -275,6 +275,7 @@ Settings:
       Format Label: Формат
       Folder Button: Избор на папка
     Enter Fullscreen on Display Rotate: Режим на цял екран при завъртане на дисплея
+    Skip by Scrolling Over Video Player: Пропускане чрез превъртане над видео плейъра
   Privacy Settings:
     Privacy Settings: 'Настройки за поверителност'
     Remember History: 'Запазване на историята'
@@ -391,6 +392,8 @@ Settings:
     Hide Live Streams: Скриване на предавания на живо
     Hide Chapters: Скриване на главите
     Hide Upcoming Premieres: Скриване на предстоящите премиери
+    Hide Channels: Скриване видеата от каналите
+    Hide Channels Placeholder: Име или идентификатор на канала
   The app needs to restart for changes to take effect. Restart and apply change?: Приложението
     трябва да се рестартира за да се приложат промените. Рестартиране?
   Proxy Settings:
@@ -451,6 +454,17 @@ Settings:
     Replace HTTP Cache: Замяна на HTTP кеша
     Warning: Тези настройки са експериментални и причиняват сривове, докато са разрешени.
       Силно се препоръчва създаването на резервни копия. Използвайте на свой риск!
+  Password Settings:
+    Password Settings: Настройки на паролата
+    Set Password To Prevent Access: Задайте парола, за да предотвратите достъпа до
+      настройките
+    Set Password: Задаване на парола
+    Remove Password: Премахване на паролата
+  Password Dialog:
+    Enter Password To Unlock: Въведете парола за отключване на настройките
+    Password Incorrect: Грешна парола
+    Unlock: Отключване
+    Password: Парола
 About:
   #On About page
   About: 'Относно'
@@ -722,6 +736,8 @@ Video:
   Premieres on: Премиера на
   Premieres in: Премиери в
   Premieres: Премиерa
+  Show Super Chat Comment: Показване на Super Chat коментар
+  Scroll to Bottom: Превъртане в долната част
 Videos:
   #& Sort By
   Sort By:
@@ -797,6 +813,8 @@ Comments:
   From {channelName}: от {channelName}
   And others: и други
   Member: Член
+  View {replyCount} replies: Преглед на {replyCount} отговора
+  Hearted: Сърдечно
 Up Next: 'Следващ'
 
 # Toast Messages
@@ -848,6 +866,8 @@ Tooltips:
       и задръжте клавиша Control (Command Key на Mac) и щракнете с левия бутон на
       мишката, за да се върнете бързо към скоростта на възпроизвеждане по подразбиране
       (1x, освен ако не е променена в настройките).
+    Skip by Scrolling Over Video Player: Използване колелцето за превъртане, за прескачане
+      на видео в стил MPV.
   General Settings:
     Region for Trending: Регионът на набиращите популярност дава възможност да се
       избере страната, за която това се отнася. Не всички страни показани тук се поддържат
@@ -885,6 +905,11 @@ Tooltips:
     Replace HTTP Cache: Деактивира HTTP кеша на Electron върху носителя и активира
       персонализиран кеш за изображения в паметта. Ще доведе до увеличаване на използването
       на RAM паметта.
+  Distraction Free Settings:
+    Hide Channels: Въведете име или идентификатор на канал, за да скриете всички видеа,
+      плейлисти и самия канал от показване в търсенето или набиращите популярност.
+      Въведеното име на канал трябва да съвпада напълно и е чувствително към малки
+      и големи букви.
 More: Още
 Playing Next Video Interval: Пускане на следващото видео веднага. Щракнете за отказ.
   | Пускане на следващото видео след {nextVideoInterval} секунда. Щракнете за отказ.
@@ -936,3 +961,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Списъкът с глави е скрит,
     текуща глава: {chapterName}'
 Preferences: Предпочитания
+Ok: Добре

From e29a35bf3f6e17107391879f7c3a6a6e7ee4e7c0 Mon Sep 17 00:00:00 2001
From: Rusi Dimitrov <astral_86@mail.bg>
Date: Thu, 29 Dec 2022 23:09:44 +0000
Subject: [PATCH 177/301] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/bg/
---
 static/locales/bg.yaml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/static/locales/bg.yaml b/static/locales/bg.yaml
index 015d968799c5..efff755347d7 100644
--- a/static/locales/bg.yaml
+++ b/static/locales/bg.yaml
@@ -254,10 +254,10 @@ Settings:
       видео плейъра
     Scroll Volume Over Video Player: Промяна на звука при превъртане над видео плейъра
     Fast-Forward / Rewind Interval: Интервал за бързо превъртане напред / назад
-    Scroll Playback Rate Over Video Player: Превъртане на скоростта на възпроизвеждане
+    Scroll Playback Rate Over Video Player: Промяна на скоростта на възпроизвеждане
       над видео плейъра
-    Max Video Playback Rate: Максимална скорост на възпроизвеждане на видео
-    Video Playback Rate Interval: Интервал на скоростта на възпроизвеждане на видео
+    Max Video Playback Rate: Максимална скорост на възпроизвеждане
+    Video Playback Rate Interval: Интервал на скоростта на възпроизвеждане
     Screenshot:
       Enable: Включване на снимки на екрана
       Quality Label: Качество
@@ -275,7 +275,7 @@ Settings:
       Format Label: Формат
       Folder Button: Избор на папка
     Enter Fullscreen on Display Rotate: Режим на цял екран при завъртане на дисплея
-    Skip by Scrolling Over Video Player: Пропускане чрез превъртане над видео плейъра
+    Skip by Scrolling Over Video Player: Превъртане над видео плейъра
   Privacy Settings:
     Privacy Settings: 'Настройки за поверителност'
     Remember History: 'Запазване на историята'
@@ -455,9 +455,9 @@ Settings:
     Warning: Тези настройки са експериментални и причиняват сривове, докато са разрешени.
       Силно се препоръчва създаването на резервни копия. Използвайте на свой риск!
   Password Settings:
-    Password Settings: Настройки на паролата
-    Set Password To Prevent Access: Задайте парола, за да предотвратите достъпа до
-      настройките
+    Password Settings: Настройки на парола
+    Set Password To Prevent Access: Задаване на парола, за предотвратяване на достъпа
+      до настройките
     Set Password: Задаване на парола
     Remove Password: Премахване на паролата
   Password Dialog:
@@ -863,10 +863,10 @@ Tooltips:
     Scroll Playback Rate Over Video Player: Докато курсорът е върху видеоклипа, натиснете
       и задръжте клавиша Control (Command Key за Mac) и превъртете колелцето на мишката
       напред или назад, за да контролирате скоростта на възпроизвеждане. Натиснете
-      и задръжте клавиша Control (Command Key на Mac) и щракнете с левия бутон на
-      мишката, за да се върнете бързо към скоростта на възпроизвеждане по подразбиране
+      и задръжте клавиша Control (Command Key за Mac) и щракнете с левия бутон на
+      мишката, за да се върнете бързо към стандартната скорост на възпроизвеждане
       (1x, освен ако не е променена в настройките).
-    Skip by Scrolling Over Video Player: Използване колелцето за превъртане, за прескачане
+    Skip by Scrolling Over Video Player: Използване колелцето на мишката за превъртане
       на видео в стил MPV.
   General Settings:
     Region for Trending: Регионът на набиращите популярност дава възможност да се
@@ -908,8 +908,8 @@ Tooltips:
   Distraction Free Settings:
     Hide Channels: Въведете име или идентификатор на канал, за да скриете всички видеа,
       плейлисти и самия канал от показване в търсенето или набиращите популярност.
-      Въведеното име на канал трябва да съвпада напълно и е чувствително към малки
-      и големи букви.
+      Въведеното име трябва да съвпада напълно и е чувствително към главни и малки
+      букви.
 More: Още
 Playing Next Video Interval: Пускане на следващото видео веднага. Щракнете за отказ.
   | Пускане на следващото видео след {nextVideoInterval} секунда. Щракнете за отказ.

From 8b0711f09b34b2623fd3248391042a53eca5f8ab Mon Sep 17 00:00:00 2001
From: tryvseu <tryvseu@tuta.io>
Date: Thu, 29 Dec 2022 22:33:20 +0000
Subject: [PATCH 178/301] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 75.0% (493 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/nn/
---
 static/locales/nn.yaml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/static/locales/nn.yaml b/static/locales/nn.yaml
index a53e3fae667a..22aed88c295f 100644
--- a/static/locales/nn.yaml
+++ b/static/locales/nn.yaml
@@ -30,11 +30,11 @@ Close: 'Lukk'
 Back: 'Tilbake'
 Forward: 'Framover'
 
-Version {versionNumber} is now available!  Click for more details: 'Versjon {versionNumber} er no tilgjengeleg!
-  Klikk for meir informasjon'
+Version {versionNumber} is now available!  Click for more details: 'Versjon {versionNumber}
+  er no tilgjengeleg! Klikk for meir informasjon'
 Download From Site: 'Last ned frå nettstaden'
-A new blog is now available, {blogTitle}. Click to view more: 'Eit nytt blogginnlegg er tilgjengeleg,
-  {blogTitle}. Klikk her for å sjå meir'
+A new blog is now available, {blogTitle}. Click to view more: 'Eit nytt blogginnlegg
+  er tilgjengeleg, {blogTitle}. Klikk her for å sjå meir'
 
 # Search Bar
 Search / Go to URL: 'Søk/gå til nettadresse'
@@ -367,8 +367,8 @@ Profile:
   Your profile name cannot be empty: 'Profilnamnet ditt kan ikkje vere tomt'
   Profile has been created: 'Profilet har blitt laga'
   Profile has been updated: 'Profilet har blitt oppdatert'
-  Your default profile has been set to {profile}: 'Ditt forvalte profil har blitt satt til
-    {profile}'
+  Your default profile has been set to {profile}: 'Ditt forvalte profil har blitt
+    satt til {profile}'
   Removed {profile} from your profiles: 'Fjerna {profile} frå profila dine'
   Your default profile has been changed to your primary profile: 'Ditt forvalte profil
     har blitt endra til ditt hovudprofil'
@@ -398,7 +398,8 @@ Channel:
   Unsubscribe: 'Opphev abonnement'
   Channel has been removed from your subscriptions: 'Kanalen har blitt fjerna frå
     dine abonnement'
-  Removed subscription from {count} other channel(s): 'Fjerna abonnement frå {count} kanal(ar)'
+  Removed subscription from {count} other channel(s): 'Fjerna abonnement frå {count}
+    kanal(ar)'
   Added channel to your subscriptions: 'Lagt til kanal til dine abonnentar'
   Search Channel: 'Søk i kanal'
   Your search results have returned 0 results: 'Søket gitt gav 0 resultat'
@@ -680,3 +681,5 @@ Hashtags have not yet been implemented, try again later: Emneknaggar er ikkje im
 Search Bar:
   Clear Input: Tøm inndata
 Are you sure you want to open this link?: Er du sikker på at du vil opne denne lenka?
+New Window: Nytt Vindauga
+Preferences: Innstillingar

From e2c4cf4128940906258136bb828c8cde7797fa01 Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Fri, 30 Dec 2022 08:12:58 +0000
Subject: [PATCH 179/301] Update conflicts.yml (#3009)

* Update conflicts.yml

* Delete dummy-conflicts.yml
---
 .github/workflows/conflicts.yml       | 4 +---
 .github/workflows/dummy-conflicts.yml | 9 ---------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 .github/workflows/dummy-conflicts.yml

diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
index c0f2210258c8..cceb14d31c46 100644
--- a/.github/workflows/conflicts.yml
+++ b/.github/workflows/conflicts.yml
@@ -7,9 +7,6 @@ on:
   # In `pull_request` we wouldn't be able to change labels of fork PRs
   pull_request_target:
     types: [synchronize]
-  workflow_run:
-    workflows: ['Dummy workflow for conflicts']
-    types: [requested]
 
 jobs:
   main:
@@ -23,3 +20,4 @@ jobs:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
           commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
+
diff --git a/.github/workflows/dummy-conflicts.yml b/.github/workflows/dummy-conflicts.yml
deleted file mode 100644
index cc4ba42504ee..000000000000
--- a/.github/workflows/dummy-conflicts.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: Dummy workflow for conflicts
-on:
-  pull_request_review:
-    types: [submitted]
-jobs:
-  dummy:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "this is a dummy workflow that triggers a workflow_run; it's necessary because otherwise the repo secrets will not be in scope for externally forked pull requests"

From 7e7571065dab90c438369d9dee32a36e5d49d55b Mon Sep 17 00:00:00 2001
From: Emma <MarmadileManteater@proton.me>
Date: Fri, 30 Dec 2022 03:13:45 -0500
Subject: [PATCH 180/301] Improve responsiveness of `Hide Videos From Channels`
 (#2994)

* Add wrapper in `ft-input`  to correct absolute pos

Previously, the action icon was absolutely positioned
to the relative `ft-input-component`; however,
when the label wrapped (on small displays), the height of the
ft-input-component changed, and the icon would overflow
the bottom of the component.  Now, it should be absolutely
positioned to the relative `inputWrapper` which
begins with the top of the input element, and thus, it should
not change position based on the height of the label making it
easier to ensure it is in the right position.

* Modify wrapper to not interfere with existing components

* Make ft-input-tags `width: 100%` on small displays

There isn't a lot of screen real estate on small displays, so
this component should just expand to fill it instead of crunching
in on itself.

* Modify media queries to use more standard breakpoint

# Conflicts:
#	src/renderer/components/ft-input/ft-input.css

* Hide line-break in distraction-settings on small displays

* Fix lint issue by removing self-close from `br`
---
 .../distraction-settings.css                  |  5 ++
 .../distraction-settings.vue                  |  3 +-
 .../ft-input-tags/ft-input-tags.css           |  5 ++
 src/renderer/components/ft-input/ft-input.css | 15 ++----
 src/renderer/components/ft-input/ft-input.vue | 53 ++++++++++---------
 5 files changed, 44 insertions(+), 37 deletions(-)
 create mode 100644 src/renderer/components/distraction-settings/distraction-settings.css

diff --git a/src/renderer/components/distraction-settings/distraction-settings.css b/src/renderer/components/distraction-settings/distraction-settings.css
new file mode 100644
index 000000000000..d6cefc07134a
--- /dev/null
+++ b/src/renderer/components/distraction-settings/distraction-settings.css
@@ -0,0 +1,5 @@
+@media only screen and (max-width: 800px) {
+  br.hide-on-mobile {
+    display: none;
+  }
+}
diff --git a/src/renderer/components/distraction-settings/distraction-settings.vue b/src/renderer/components/distraction-settings/distraction-settings.vue
index b800757296d3..2603f3022eaa 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.vue
+++ b/src/renderer/components/distraction-settings/distraction-settings.vue
@@ -104,7 +104,7 @@
         />
       </div>
     </div>
-    <br>
+    <br class="hide-on-mobile">
     <ft-flex-box>
       <ft-input-tags
         :label="$t('Settings.Distraction Free Settings.Hide Channels')"
@@ -119,3 +119,4 @@
 </template>
 
 <script src="./distraction-settings.js" />
+<style src="./distraction-settings.css" />
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.css b/src/renderer/components/ft-input-tags/ft-input-tags.css
index bcce0109030f..d5878a42a620 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.css
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.css
@@ -48,3 +48,8 @@
   margin-top: 10px;
 }
 
+@media only screen and (max-width: 576px) {
+  .ft-input-tags-component {
+    width: 100%;
+  }
+}
diff --git a/src/renderer/components/ft-input/ft-input.css b/src/renderer/components/ft-input/ft-input.css
index b503317de3d8..c9b1df41e779 100644
--- a/src/renderer/components/ft-input/ft-input.css
+++ b/src/renderer/components/ft-input/ft-input.css
@@ -114,11 +114,15 @@
   color: #EEEEEE;
 }
 
+.inputWrapper {
+  position: relative;
+}
+
 .inputAction {
   position: absolute;
   margin: 0 3px;
   padding: 10px;
-  top: 5px;
+  top: -8px;
   right: 0;
   border-radius: 100%;
   color: var(--primary-text-color);
@@ -132,20 +136,11 @@
   cursor: pointer;
 }
 
-.inputAction.withLabel {
-  /* If showLabel defined, re-centralize the input button*/
-  top: 34px;
-}
-
 
 .search ::-webkit-calendar-picker-indicator {
   display: none;
 }
 
-.search .inputAction {
-  top: 12px;
-}
-
 .forceTextColor .inputAction {
   color: #EEEEEE;
 }
diff --git a/src/renderer/components/ft-input/ft-input.vue b/src/renderer/components/ft-input/ft-input.vue
index d1408416c8f8..5ced9eea7ab8 100644
--- a/src/renderer/components/ft-input/ft-input.vue
+++ b/src/renderer/components/ft-input/ft-input.vue
@@ -38,32 +38,33 @@
       @keydown.space.prevent="handleClearTextClick"
       @keydown.enter.prevent="handleClearTextClick"
     />
-    <input
-      :id="id"
-      ref="input"
-      v-model="inputData"
-      :list="idDataList"
-      class="ft-input"
-      :type="inputType"
-      :placeholder="placeholder"
-      :disabled="disabled"
-      :spellcheck="spellcheck"
-      @input="e => handleInput(e.target.value)"
-      @focus="handleFocus"
-      @blur="handleInputBlur"
-      @keydown="handleKeyDown"
-    >
-    <font-awesome-icon
-      v-if="showActionButton"
-      :icon="actionButtonIconName"
-      class="inputAction"
-      :class="{
-        enabled: inputDataPresent,
-        withLabel: showLabel
-      }"
-      @click="handleClick"
-    />
-
+    <span class="inputWrapper">
+      <input
+        :id="id"
+        ref="input"
+        v-model="inputData"
+        :list="idDataList"
+        class="ft-input"
+        :type="inputType"
+        :placeholder="placeholder"
+        :disabled="disabled"
+        :spellcheck="spellcheck"
+        @input="e => handleInput(e.target.value)"
+        @focus="handleFocus"
+        @blur="handleInputBlur"
+        @keydown="handleKeyDown"
+      >
+      <font-awesome-icon
+        v-if="showActionButton"
+        :icon="actionButtonIconName"
+        class="inputAction"
+        :class="{
+          enabled: inputDataPresent,
+          withLabel: showLabel
+        }"
+        @click="handleClick"
+      />
+    </span>
     <div class="options">
       <ul
         v-if="inputData !== '' && visibleDataList.length > 0 && searchState.showOptions"

From c5f22ed6e904e27569db3ae85832938ea4ac0246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9A=D0=BE=D1=82=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B1=D0=B0=D0=B9?= <artemkotlubai@yandex.ru>
Date: Fri, 30 Dec 2022 08:49:12 +0000
Subject: [PATCH 181/301] Translated using Weblate (Russian)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 786ce9038af3..25d57329a2cd 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -138,7 +138,7 @@ Settings:
         #! List countries
     Check for Latest Blog Posts: Проверять последние записи в блоге
     Check for Updates: Проверять обновления
-    View all Invidious instance information: Посмотреть все экземпляры Invidious
+    View all Invidious instance information: Просмотреть все экземпляры Invidious
     System Default: Системные установки по умолчанию
     Clear Default Instance: Очистить экземпляр по умолчанию
     Set Current Instance as Default: Установить текущий экземпляр по умолчанию

From a72b38171eba7ded00cc49cfd090121e4cd57480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9A=D0=BE=D1=82=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B1=D0=B0=D0=B9?= <artemkotlubai@yandex.ru>
Date: Fri, 30 Dec 2022 16:48:20 +0000
Subject: [PATCH 182/301] Translated using Weblate (Russian)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 25d57329a2cd..247fe0e6f9d4 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -612,7 +612,7 @@ Video:
     Minute: Минута
     Less than a minute: Менее минуты
     In less than a minute: Меньше чем через минуту
-  Published on: 'Опубликовано'
+  Published on: 'Размещено'
   Publicationtemplate: '{number} {unit} назад'
 #& Videos
   Autoplay: Автовоспроизведение

From e749a2f978f292f0b48b851fd1147e35e97a78ed Mon Sep 17 00:00:00 2001
From: Massimo Pissarello <mapi68@gmail.com>
Date: Fri, 30 Dec 2022 18:34:53 +0000
Subject: [PATCH 183/301] Translated using Weblate (Italian)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/it/
---
 static/locales/it.yaml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/static/locales/it.yaml b/static/locales/it.yaml
index 8a5e843adc77..004fcdadb7ca 100644
--- a/static/locales/it.yaml
+++ b/static/locales/it.yaml
@@ -219,7 +219,7 @@ Settings:
   Player Settings:
     Player Settings: 'Impostazioni del riproduttore video'
     Force Local Backend for Legacy Formats: 'Forza riproduttore locale per formati
-      legacy'
+      compatibili'
     Play Next Video: 'Riproduci il prossimo video'
     Turn on Subtitles by Default: 'Abilita i sottotitoli per impostazione predefinita'
     Autoplay Videos: 'Riproduci i video automaticamente'
@@ -231,8 +231,8 @@ Settings:
     Default Video Format:
       Default Video Format: 'Formato video predefinito'
       Dash Formats: 'Formati DASH'
-      Legacy Formats: 'Formati legacy'
-      Audio Formats: 'Formati Audio'
+      Legacy Formats: 'Formati compatibili'
+      Audio Formats: 'Formati audio'
     Default Quality:
       Default Quality: 'Qualità predefinita'
       Auto: 'Auto'
@@ -369,7 +369,7 @@ Settings:
     Select Export Type: Seleziona il tipo di esportazione
     Select Import Type: Seleziona il tipo di importazione
     Data Settings: Impostazioni dei dati
-    Check for Legacy Subscriptions: Controlla le iscrizioni legacy
+    Check for Legacy Subscriptions: Controlla le iscrizioni compatibili
     Manage Subscriptions: Gestisci i profili
     Import Playlists: Importa playlist
     Export Playlists: Esporta playlist
@@ -691,7 +691,7 @@ Video:
     video id: ID video (YouTube)
     player resolution: Finestra di visualizzazione
     Video statistics are not available for legacy videos: Le statistiche sui video
-      non sono disponibili per i video legacy
+      non sono disponibili per i video compatibili
     Video ID: ID video
     Resolution: Risoluzione
     Player Dimensions: Dimensioni del lettore
@@ -734,9 +734,9 @@ Toggle Theatre Mode: 'Attiva modalità cinema'
 Change Format:
   Change Media Formats: 'Cambia formato video'
   Use Dash Formats: 'Usa i formati DASH'
-  Use Legacy Formats: 'Usa i formati legacy'
+  Use Legacy Formats: 'Usa i formati compatibili'
   Use Audio Formats: 'Usa i formati audio'
-  Audio formats are not available for this video: I formati Audio non sono disponibili
+  Audio formats are not available for this video: I formati audio non sono disponibili
     per questo video
   Dash formats are not available for this video: I formati DASH non sono disponibili
     per questo video
@@ -865,13 +865,13 @@ This video is unavailable because of missing formats. This can happen due to cou
 Tooltips:
   Player Settings:
     Force Local Backend for Legacy Formats: Funziona solo quando Invidious è l'API
-      predefinita. Quando abilitate, le API locali useranno i formati legacy al posto
-      di quelli di Invidious. Utile quando i video di Invidious non vengono riprodotti
-      a causa di restrizioni geografiche.
+      predefinita. Quando abilitate, le API locali useranno i formati compatibili
+      al posto di quelli di Invidious. Utile quando i video di Invidious non vengono
+      riprodotti a causa di restrizioni geografiche.
     Default Video Format: Imposta i formati usati quando un video viene riprodotto.
-      I formati DASH possono riprodurre qualità maggiore. I formati Legacy sono limitati
-      ad un massimo di 720p ma usano meno banda. I formati Audio riproducono solo
-      l'audio.
+      I formati DASH possono riprodurre qualità maggiore. I formati compatibili sono
+      limitati ad un massimo di 720p ma usano meno banda. I formati audio riproducono
+      solo l'audio.
     Proxy Videos Through Invidious: Connessione a Invidious per riprodurre i video
       invece di una connessione diretta a YouTube. Sovrascrive le preferenze API.
     Scroll Playback Rate Over Video Player: Mentre il cursore è sopra il video, tieni

From 8a30e322517099f3f86f2643aa0f074078fa9ac1 Mon Sep 17 00:00:00 2001
From: Fjuro <ifjuro@proton.me>
Date: Fri, 30 Dec 2022 18:53:11 +0000
Subject: [PATCH 184/301] Translated using Weblate (Czech)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/cs/
---
 static/locales/cs.yaml | 131 ++++++++++++++++++++---------------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml
index d435e6a84c72..2295bb68cb16 100644
--- a/static/locales/cs.yaml
+++ b/static/locales/cs.yaml
@@ -124,8 +124,8 @@ Settings:
     General Settings: 'Obecné nastavení'
     Check for Updates: 'Kontrolovat aktualizace'
     Check for Latest Blog Posts: 'Kontrolovat nejnovější příspěvky blogů'
-    Fallback to Non-Preferred Backend on Failure: 'Přepnutí na nepreferovaný backend
-      při chybě'
+    Fallback to Non-Preferred Backend on Failure: 'Při chybě přepnout na nepreferovaný
+      backend'
     Enable Search Suggestions: 'Zapnout návrhy vyhledávání'
     Default Landing Page: 'Výchozí vstupní stránka'
     Locale Preference: 'Předvolby jazyka'
@@ -134,7 +134,7 @@ Settings:
       Local API: 'Lokální API'
       Invidious API: 'Invidious API'
     Video View Type:
-      Video View Type: 'Typ zobrazení videa'
+      Video View Type: 'Typ zobrazení videí'
       Grid: 'Mřížka'
       List: 'Seznam'
     Thumbnail Preference:
@@ -152,7 +152,7 @@ Settings:
     System Default: Výchozí nastavení systému
     Clear Default Instance: Vymazat výchozí instanci
     Set Current Instance as Default: Nastavit současnou instanci jako výchozí
-    Current instance will be randomized on startup: Při startu bude vybrána náhodná
+    Current instance will be randomized on startup: Při spuštění bude vybrána náhodná
       instance
     Current Invidious Instance: Současná instance Invidious
     No default instance has been set: Není nastavena žádná výchozí instance
@@ -165,43 +165,43 @@ Settings:
       External Link Handling: Zpracování externích odkazů
   Theme Settings:
     Theme Settings: 'Nastavení motivu'
-    Match Top Bar with Main Color: 'Přizpůsobit hlavní lištu hlavní barvě'
+    Match Top Bar with Main Color: 'Přizpůsobit horní lištu hlavní barvě'
     Expand Side Bar by Default: 'Ve výchozím stavu rozbalený postranní panel'
     Disable Smooth Scrolling: 'Zakázat plynulé posouvání'
-    UI Scale: 'Škála UI'
+    UI Scale: 'Měřítko rozhraní'
     Base Theme:
       Base Theme: 'Základní motiv'
       Black: 'Černý'
       Dark: 'Tmavý'
       Light: 'Světlý'
       Dracula: 'Drákula'
-      System Default: Výchozí nastavení systému
+      System Default: Podle systému
       Catppuccin Mocha: Catppuccin Mocha
     Main Color Theme:
-      Main Color Theme: 'Hlavní barevný motiv'
-      Red: 'Červený'
-      Pink: 'Růžový'
-      Purple: 'Fialový'
-      Deep Purple: 'Temně fialový'
+      Main Color Theme: 'Hlavní barva motivu'
+      Red: 'Červená'
+      Pink: 'Růžová'
+      Purple: 'Fialová'
+      Deep Purple: 'Temně fialová'
       Indigo: 'Indigo'
-      Blue: 'Modrý'
-      Light Blue: 'Světle modrý'
-      Cyan: 'Azurový'
-      Teal: 'Modrozelený'
-      Green: 'Zelený'
-      Light Green: 'Světle zelený'
-      Lime: 'Zelenožlutý'
-      Yellow: 'Žlutý'
-      Amber: 'Jantarový'
-      Orange: 'Oranžový'
-      Deep Orange: 'Tmavě oranžový'
-      Dracula Cyan: 'Drákula Azurový'
-      Dracula Green: 'Drákula Zelený'
-      Dracula Orange: 'Drákula Oranžový'
-      Dracula Pink: 'Drákula Růžový'
-      Dracula Purple: 'Drákula Fialový'
-      Dracula Red: 'Drákula Červený'
-      Dracula Yellow: 'Drákula Žlutý'
+      Blue: 'Modrá'
+      Light Blue: 'Světle modrá'
+      Cyan: 'Azurová'
+      Teal: 'Modrozelená'
+      Green: 'Zelená'
+      Light Green: 'Světle zelená'
+      Lime: 'Limetková'
+      Yellow: 'Žlutá'
+      Amber: 'Jantarová'
+      Orange: 'Oranžová'
+      Deep Orange: 'Temně oranžová'
+      Dracula Cyan: 'Azurový drákula'
+      Dracula Green: 'Zelený drákula'
+      Dracula Orange: 'Oranžový drákula'
+      Dracula Pink: 'Růžový drákula'
+      Dracula Purple: 'Fialový drákula'
+      Dracula Red: 'Červený drákula'
+      Dracula Yellow: 'Žlutý drákula'
       Catppuccin Mocha Rosewater: Catppuccin Mocha Rosewater
       Catppuccin Mocha Flamingo: Catppuccin Mocha Flamingo
       Catppuccin Mocha Pink: Catppuccin Mocha Pink
@@ -216,7 +216,7 @@ Settings:
       Catppuccin Mocha Yellow: Catppuccin Mocha Yellow
       Catppuccin Mocha Blue: Catppuccin Mocha Blue
       Catppuccin Mocha Lavender: Catppuccin Mocha Lavender
-    Secondary Color Theme: 'Téma sekundární barvy'
+    Secondary Color Theme: 'Sekundární barva motivu'
         #* Main Color Theme
     Hide Side Bar Labels: Skrýt štítky na bočním panelu
     Hide FreeTube Header Logo: Skrýt logo záhlaví FreeTube
@@ -228,7 +228,7 @@ Settings:
     Autoplay Videos: 'Automatické přehrávání videí'
     Proxy Videos Through Invidious: 'Proxy videa prostřednictvím Invidious'
     Autoplay Playlists: 'Automaticky přehrávat playlist'
-    Enable Theatre Mode by Default: 'Ve výchozím nastavení povolit režim Divadlo'
+    Enable Theatre Mode by Default: 'Ve výchozím nastavení povolit režim kino'
     Default Volume: 'Výchozí hlasitost'
     Default Playback Rate: 'Výchozí rychlost přehrávání'
     Default Video Format:
@@ -250,7 +250,7 @@ Settings:
       8k: '8k'
     Playlist Next Video Interval: Interval pro další video na playlistu
     Next Video Interval: Další interval videa
-    Display Play Button In Video Player: Zobrazit tlačítko 'přehrát' ve video přehrávači
+    Display Play Button In Video Player: Zobrazit tlačítko Přehrát v přehrávači videa
     Scroll Volume Over Video Player: Změnit hlasitost posouváním na videu
     Fast-Forward / Rewind Interval: Interval rychlého přetáčení vpřed / vzad
     Scroll Playback Rate Over Video Player: Změna rychlosti přehrávání posuvem kolečka
@@ -278,26 +278,26 @@ Settings:
     Privacy Settings: 'Nastavení soukromí'
     Remember History: 'Zapamatovat historii'
     Save Watched Progress: 'Uložit průběh zhlédnutých videí'
-    Clear Search Cache: 'Vyčistit cache vyhledávání'
+    Clear Search Cache: 'Vymazat mezipaměť vyhledávání'
     Are you sure you want to clear out your search cache?: 'Jste si jisti, že chcete
       smazat cache vyhledávání?'
     Search cache has been cleared: 'Cache vyhledávání byla vymazána'
-    Remove Watch History: 'Odstranit historii viděných videí'
+    Remove Watch History: 'Odstranit historii sledování'
     Are you sure you want to remove your entire watch history?: 'Opravdu chcete odstranit
       historii viděných videí?'
     Watch history has been cleared: 'Historie viděných videí byla odstraněna'
-    Remove All Subscriptions / Profiles: 'Odstranit všechna odebírání / profily'
-    Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: 'Chcete
-      opravdu odstranit všechna odebírání a profily? Toto nelze vrátit zpět.'
+    Remove All Subscriptions / Profiles: 'Odstranit všechny odběry / profily'
+    Are you sure you want to remove all subscriptions and profiles?  This cannot be undone.: 'Opravdu
+      chcete odstranit všechny odběry a profily? Tato akce je nevratná.'
     Automatically Remove Video Meta Files: Automaticky odstranit meta soubory videa
   Subscription Settings:
     Subscription Settings: 'Nastavení odběrů'
-    Hide Videos on Watch: 'Skrýt přehrané video'
+    Hide Videos on Watch: 'Skrýt přehraná videa'
     Fetch Feeds from RSS: 'Načíst kanály z RSS'
     Manage Subscriptions: 'Spravovat odebírané kanály'
     Fetch Automatically: Automaticky načítat odběry
   Distraction Free Settings:
-    Distraction Free Settings: 'Nastavení Režimu nerozptylování'
+    Distraction Free Settings: 'Nastavení rozptylování'
     Hide Video Views: 'Skrýt počet přehrání videa'
     Hide Video Likes And Dislikes: 'Skrýt hodnocení videa'
     Hide Channel Subscribers: 'Skrýt odběratele kanálu'
@@ -310,7 +310,7 @@ Settings:
     Hide Playlists: Skrýt playlist
     Hide Video Description: Skrýt popis videa
     Hide Comments: Skrýt komentáře
-    Hide Live Streams: Skrýt živé streamy
+    Hide Live Streams: Skrýt živé přenosy
     Hide Sharing Actions: Skrýt akce sdílení
     Hide Chapters: Skrýt kapitoly
     Hide Upcoming Premieres: Skrýt nadcházející premiéry
@@ -394,7 +394,7 @@ Settings:
     City: Město
     Ip: IP
     Your Info: Vaše informace
-    Enable Tor / Proxy: Povolit Tor / Proxy
+    Enable Tor / Proxy: Povolit Tor / proxy
     Region: Region
     Country: Země
     Test Proxy: Otestovat proxy
@@ -410,7 +410,7 @@ Settings:
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': URL API SponsorBlock
       (výchozí je https://sponsor.ajay.app)
     Enable SponsorBlock: Povolit SponsorBlock
-    SponsorBlock Settings: Nastavení SponsorBlock
+    SponsorBlock Settings: Nastavení služby SponsorBlock
     Skip Options:
       Do Nothing: Nic nedělat
       Skip Option: Možnost přeskočení
@@ -496,19 +496,19 @@ About:
   Mastodon: Mastodon
   Email: E-mail
   Blog: Blog
-  Website: Webová stránka
+  Website: Webové stránky
   FAQ: Často kladené dotazy
-  FreeTube Wiki: FreeTube Wiki
+  FreeTube Wiki: Wiki FreeTube
   Downloads / Changelog: Ke stažení / Seznam změn
   View License: Zobrazit licenci
   Translate: Překlady
   these people and projects: těmto lidem a projektům
-  FreeTube is made possible by: FreeTube je možné udělat díky
+  FreeTube is made possible by: FreeTube je možné dělat díky
   Please check for duplicates before posting: Před odesláním prosím zkontrolujte duplicity
   GitHub issues: Chyby na GitHub
   Report a problem: Nahlásit problém
   Help: Nápověda
-  GitHub releases: Vydaní na GitHub
+  GitHub releases: Vydání na GitHubu
 Profile:
   Profile Select: 'Výběr profilu'
   All Channels: 'Všechny kanály'
@@ -523,14 +523,14 @@ Profile:
   Make Default Profile: 'Vytvořit výchozí profil'
   Delete Profile: 'Smazat profil'
   Are you sure you want to delete this profile?: 'Opravdu smazat tento profil?'
-  All subscriptions will also be deleted.: 'Všechna odebírání budou také smazána.'
+  All subscriptions will also be deleted.: 'Budou také odstraněny všechny odběry.'
   Profile could not be found: 'Profil nebyl nalezen'
   Your profile name cannot be empty: 'Jméno profilu nemůže být prázdné'
   Profile has been created: 'Profil byl vytvořen'
   Profile has been updated: 'Profil byl upraven'
   Your default profile has been set to {profile}: 'Váš výchozí profil byl nastaven
     na {profile}'
-  Removed {profile} from your profiles: 'Odstranit {profile} z vašeho profilu'
+  Removed {profile} from your profiles: 'Profil {profile} byl odebrán'
   Your default profile has been changed to your primary profile: 'Váš výchozí profil
     byl změněn na primární profil'
   '{profile} is now the active profile': '{profile} je nyní aktivním profilem'
@@ -547,7 +547,7 @@ Profile:
   : 'Toto je váš primární profil.  Opravdu chcete odstranit vybrané kanály?  Stejné
     kanály budou smazány ze všech profilů, ve kterém se nacházejí.'
   Are you sure you want to delete the selected channels?  This will not delete the channel from any other profile.: 'Opravdu
-    chcete odstranit vybrané kanály?  Tím nebude kanál odstraněn z žádného jiného
+    chcete odstranit vybrané kanály?  Kanál tím nebude odstraněn z žádného jiného
     profilu.'
 #On Channel Page
   Profile Filter: Filtr profilu
@@ -558,9 +558,9 @@ Channel:
   Subscribe: 'Odebírat'
   Unsubscribe: 'Zrušit odběr'
   Channel has been removed from your subscriptions: 'Kanál byl odebrán z vašich odběrů'
-  Removed subscription from {count} other channel(s): 'Odběr odebrán z {count} jiných
+  Removed subscription from {count} other channel(s): 'Odběr odebrán z {count} dalších
     kanálů'
-  Added channel to your subscriptions: 'K vašim odběrům byl přidán kanál'
+  Added channel to your subscriptions: 'Kanál přidán do vašich odběrů'
   Search Channel: 'Hledat v kanálu'
   Your search results have returned 0 results: 'Vaše vyhledávání přineslo 0 výsledků'
   Sort By: 'Seřadit podle'
@@ -775,8 +775,7 @@ Mini Player: 'Mini přehrávač'
 Comments:
   Comments: 'Komentáře'
   Click to View Comments: 'Kliknutím zobrazíte komentáře'
-  Getting comment replies, please wait: 'Dostáváte odpovědi na komentář, počkejte
-    prosím'
+  Getting comment replies, please wait: 'Načítání odpovědí na komentář, čekejte prosím'
   There are no more comments for this video: 'U tohoto videa nejsou žádné další komentáře'
   Show Comments: 'Zobrazit komentáře'
   Hide Comments: 'Skrýt komentáře'
@@ -786,7 +785,7 @@ Comments:
   # Context: View 10 Replies, View 1 Reply
   View: 'Zobrazit'
   Hide: 'Skrýt'
-  Replies: 'Odpovědi'
+  Replies: 'Odpovědí'
   Reply: 'Odpověď'
   There are no comments available for this video: 'K tomuto videu nejsou dostupné
     žádné komentáře'
@@ -794,8 +793,8 @@ Comments:
   No more comments available: 'Žádné další komentáře nejsou k dispozici'
   Show More Replies: Načíst více výsledků
   Pinned by: připnuto uživatelem
-  From {channelName}: z {channelName}
-  And others: a ostatní
+  From {channelName}: od {channelName}
+  And others: a dalších
   Member: Člen
   View {replyCount} replies: Zobrazit {replyCount} odpovědí
   Hearted: Se srdíčkem
@@ -812,11 +811,11 @@ Tooltips:
       pokud je povoleno.'
     Thumbnail Preference: 'Všechny miniatury v celém FreeTube budou nahrazeny snímkem
       z videa namísto výchozí miniatury.'
-    Invidious Instance: 'Invidious instance, ke které se FreeTube připojí za účelem
+    Invidious Instance: 'Instance Invidious, ke které se FreeTube připojí za účelem
       volání API.'
-    Region for Trending: 'Region trendů vám umožní vybrat si zemi, ze které si přejete
-      zobrazovat videa trendů. Ne všechny zobrazené země jsou ale službou YouTube
-      reálně podporovány.'
+    Region for Trending: 'Oblast pro trendy vám umožní vybrat si zemi, ze které si
+      přejete zobrazovat videa v trendech. Ne všechny zobrazené země jsou ale službou
+      YouTube opravdu podporovány.'
     External Link Handling: "Zvolte výchozí chování při kliknutí na odkaz, který nelze\
       \ otevřít ve FreeTube.\nVe výchozím nastavení otevře FreeTube odkaz ve vašem\
       \ výchozím prohlížeči.\n"
@@ -840,8 +839,8 @@ Tooltips:
       ve stylu MPV.
   Subscription Settings:
     Fetch Feeds from RSS: 'Je-li povoleno, FreeTube použije RSS místo své výchozí
-      metody pro získání vašeho odebírání kanálů. RSS je rychlejší a brání blokování
-      IP, ale neposkytuje určité informace, jako je délka videa a podobně'
+      metody pro získání vašich odběrů. RSS je rychlejší a brání blokování IP, ale
+      neposkytuje určité informace, jako je délka videa a podobně'
 
 # Toast Messages
     Fetch Automatically: Při povolení tohoto nastavení bude FreeTube automaticky načítat
@@ -900,8 +899,8 @@ Hashtags have not yet been implemented, try again later: Hashtagy nebyly dosud i
 Unknown YouTube url type, cannot be opened in app: Neznámý typ adresy URL YouTube,
   nelze v aplikaci otevřít
 Open New Window: Otevřít nové okno
-Default Invidious instance has been cleared: Výchozí Invidious instance byla vymazána
-Default Invidious instance has been set to {instance}: Výchozí Invidious instance
+Default Invidious instance has been cleared: Výchozí instance Invidious byla vymazána
+Default Invidious instance has been set to {instance}: Výchozí instance Invidious
   byla nastavena na {instance}
 Search Bar:
   Clear Input: Vymazat
@@ -921,7 +920,7 @@ Channels:
   Channels: Kanály
   Title: Seznam kanálů
   Unsubscribed: Kanál {channelName} byl odebrán z vašich odběrů
-  Unsubscribe Prompt: Opavdu chcete zrušit odběr kanálu "{channelName}"?
+  Unsubscribe Prompt: Opavdu chcete zrušit odběr kanálu „{channelName}“?
   Empty: Seznam vašich kanálů je momentálně prázdný.
   Search bar placeholder: Hledat kanály
   Count: Nalezeno {number} kanálů.

From 5d1f465bf599e904e04ec2afbeaa233c6fd572c4 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sat, 31 Dec 2022 11:06:00 +0100
Subject: [PATCH 185/301] Fix styling of the comment author text (#3012)

---
 .../watch-video-comments/watch-video-comments.css     |  4 ++--
 .../watch-video-comments/watch-video-comments.vue     | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.css b/src/renderer/components/watch-video-comments/watch-video-comments.css
index 32c621871bdf..227981618182 100644
--- a/src/renderer/components/watch-video-comments/watch-video-comments.css
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.css
@@ -34,7 +34,6 @@
   height: 60px;
   border-radius: 200px 200px 200px 200px;
   -webkit-border-radius: 200px 200px 200px 200px;
-  cursor: pointer;
 }
 
 .commentAuthorWrapper {
@@ -53,7 +52,8 @@
 }
 
 .commentAuthor {
-  cursor: pointer;
+  color: inherit;
+  text-decoration: none;
 }
 
 .commentText {
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.vue b/src/renderer/components/watch-video-comments/watch-video-comments.vue
index 1878a191fb89..3e46ec668ab0 100644
--- a/src/renderer/components/watch-video-comments/watch-video-comments.vue
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.vue
@@ -77,18 +77,15 @@
         <p
           class="commentAuthorWrapper"
         >
-          <span
+          <router-link
             class="commentAuthor"
             :class="{
               commentOwner: comment.isOwner
             }"
+            :to="`/channel/${comment.authorLink}`"
           >
-            <router-link
-              :to="`/channel/${comment.authorLink}`"
-            >
-              {{ comment.author }}
-            </router-link>
-          </span>
+            {{ comment.author }}
+          </router-link>
           <img
             v-if="comment.isMember"
             :src="comment.memberIconUrl"

From 2f01dd4277b71404cc8ea2b13a3bda821f43e0c3 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sat, 31 Dec 2022 11:07:53 +0100
Subject: [PATCH 186/301] Parse channel handles in video descriptions (#3011)

---
 src/renderer/views/Watch/Watch.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index fd82bf18b1ab..9bdace8c92c4 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -904,8 +904,14 @@ export default Vue.extend({
       } else {
         // Some YouTube URLs don't have the urlEndpoint so we handle them here
 
-        const path = part.navigationEndpoint.commandMetadata.webCommandMetadata.url
-        return `https://www.youtube.com${path}`
+        const { browseEndpoint, commandMetadata: { webCommandMetadata } } = part.navigationEndpoint
+        // channel handle
+        if (webCommandMetadata.webPageType === 'WEB_PAGE_TYPE_CHANNEL' && part.text.startsWith('@')) {
+          return `<a href="https://www.youtube.com/channel/${browseEndpoint.browseId}">${part.text}</a>`
+        } else {
+          const path = webCommandMetadata.url
+          return `https://www.youtube.com${path}`
+        }
       }
     },
 

From 652b16b3591ff78e0aa58883d6b9b8feff01a94d Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sat, 31 Dec 2022 11:08:04 +0100
Subject: [PATCH 187/301] Use a function for menu navigations (#3010)

---
 src/main/index.js | 73 +++++++++++------------------------------------
 1 file changed, 17 insertions(+), 56 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index 10fcf5aac0aa..c6ca1a703400 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -1028,7 +1028,7 @@ function runApp() {
     }
   }
 
-  /**
+  /*
    * Auto Updater
    *
    * Uncomment the following code below and install `electron-updater` to
@@ -1047,9 +1047,15 @@ function runApp() {
   })
    */
 
-  /* eslint-disable-next-line */
-  const sendMenuEvent = async data => {
-    mainWindow.webContents.send('change-view', data)
+  function navigateTo(path, browserWindow) {
+    if (browserWindow == null) {
+      return
+    }
+
+    browserWindow.webContents.send(
+      'change-view',
+      { route: path }
+    )
   }
 
   async function setMenu() {
@@ -1078,12 +1084,7 @@ function runApp() {
             label: 'Preferences',
             accelerator: 'CmdOrCtrl+,',
             click: (_menuItem, browserWindow, _event) => {
-              if (browserWindow == null) { return }
-
-              browserWindow.webContents.send(
-                'change-view',
-                { route: '/settings' }
-              )
+              navigateTo('/settings', browserWindow)
             },
             type: 'normal'
           },
@@ -1177,70 +1178,35 @@ function runApp() {
           {
             label: 'Subscriptions',
             click: (_menuItem, browserWindow, _event) => {
-              if (browserWindow == null) {
-                return
-              }
-
-              browserWindow.webContents.send(
-                'change-view',
-                { route: '/subscriptions' }
-              )
+              navigateTo('/subscriptions', browserWindow)
             },
             type: 'normal'
           },
           {
             label: 'Channels',
             click: (_menuItem, browserWindow, _event) => {
-              if (browserWindow == null) {
-                return
-              }
-
-              browserWindow.webContents.send(
-                'change-view',
-                { route: '/subscribedchannels' }
-              )
+              navigateTo('/subscribedchannels', browserWindow)
             },
             type: 'normal'
           },
           !hideTrendingVideos && {
             label: 'Trending',
             click: (_menuItem, browserWindow, _event) => {
-              if (browserWindow == null) {
-                return
-              }
-
-              browserWindow.webContents.send(
-                'change-view',
-                { route: '/trending' }
-              )
+              navigateTo('/trending', browserWindow)
             },
             type: 'normal'
           },
           !hidePopularVideos && {
             label: 'Most Popular',
             click: (_menuItem, browserWindow, _event) => {
-              if (browserWindow == null) {
-                return
-              }
-
-              browserWindow.webContents.send(
-                'change-view',
-                { route: '/popular' }
-              )
+              navigateTo('/popular', browserWindow)
             },
             type: 'normal'
           },
           !hidePlaylists && {
             label: 'Playlists',
             click: (_menuItem, browserWindow, _event) => {
-              if (browserWindow == null) {
-                return
-              }
-
-              browserWindow.webContents.send(
-                'change-view',
-                { route: '/userplaylists' }
-              )
+              navigateTo('/userplaylists', browserWindow)
             },
             type: 'normal'
           },
@@ -1250,12 +1216,7 @@ function runApp() {
             // Other OS: Ctrl + H
             accelerator: process.platform === 'darwin' ? 'Cmd+Y' : 'Ctrl+H',
             click: (_menuItem, browserWindow, _event) => {
-              if (browserWindow == null) { return }
-
-              browserWindow.webContents.send(
-                'change-view',
-                { route: '/history' }
-              )
+              navigateTo('/history', browserWindow)
             },
             type: 'normal'
           },

From f91395de85c9ca1df1119b6147d5b607c5462140 Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Sat, 31 Dec 2022 20:30:43 +0800
Subject: [PATCH 188/301] Update copyleft year to 2023 (#3017)

---
 _scripts/build.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_scripts/build.js b/_scripts/build.js
index 91b92f93b0e0..3c4c0312b6d4 100644
--- a/_scripts/build.js
+++ b/_scripts/build.js
@@ -41,7 +41,7 @@ if (platform === 'darwin') {
 
 const config = {
   appId: `io.freetubeapp.${name}`,
-  copyright: 'Copyleft © 2020-2022 freetubeapp@protonmail.com',
+  copyright: 'Copyleft © 2020-2023 freetubeapp@protonmail.com',
   // asar: false,
   // compression: 'store',
   productName,

From eaeb472af1e05679256394ffdf3ecf67b887bb53 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sat, 31 Dec 2022 17:14:09 +0100
Subject: [PATCH 189/301] Remove unused meta.icon properties from the router
 config (#3000)

---
 src/renderer/router/index.js | 48 ++++++++++++------------------------
 1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js
index 3b956dea7732..8e8bddd5f459 100644
--- a/src/renderer/router/index.js
+++ b/src/renderer/router/index.js
@@ -54,32 +54,28 @@ const router = new CustomRouter({
     {
       path: '/',
       meta: {
-        title: 'Subscriptions.Subscriptions',
-        icon: 'fa-home'
+        title: 'Subscriptions.Subscriptions'
       },
       component: Subscriptions
     },
     {
       path: '/subscriptions',
       meta: {
-        title: 'Subscriptions.Subscriptions',
-        icon: 'fa-home'
+        title: 'Subscriptions.Subscriptions'
       },
       component: Subscriptions
     },
     {
       path: '/subscribedchannels',
       meta: {
-        title: 'Channels.Title',
-        icon: 'fa-home'
+        title: 'Channels.Title'
       },
       component: SubscribedChannels
     },
     {
       path: '/settings/profile',
       meta: {
-        title: 'Profile.Profile Settings',
-        icon: 'fa-home'
+        title: 'Profile.Profile Settings'
       },
       component: ProfileSettings
     },
@@ -87,8 +83,7 @@ const router = new CustomRouter({
       path: '/settings/profile/new',
       name: 'newProfile',
       meta: {
-        title: 'Profile.Create New Profile',
-        icon: 'fa-home'
+        title: 'Profile.Create New Profile'
       },
       component: ProfileEdit
     },
@@ -96,32 +91,28 @@ const router = new CustomRouter({
       path: '/settings/profile/edit/:id',
       name: 'editProfile',
       meta: {
-        title: 'Profile.Edit Profile',
-        icon: 'fa-home'
+        title: 'Profile.Edit Profile'
       },
       component: ProfileEdit
     },
     {
       path: '/trending',
       meta: {
-        title: 'Trending.Trending',
-        icon: 'fa-home'
+        title: 'Trending.Trending'
       },
       component: Trending
     },
     {
       path: '/popular',
       meta: {
-        title: 'Most Popular',
-        icon: 'fa-home'
+        title: 'Most Popular'
       },
       component: Popular
     },
     {
       path: '/userplaylists',
       meta: {
-        title: 'User Playlists.Your Playlists',
-        icon: 'fa-home'
+        title: 'User Playlists.Your Playlists'
       },
       component: UserPlaylists
     },
@@ -129,56 +120,49 @@ const router = new CustomRouter({
       path: '/history',
       name: 'history',
       meta: {
-        title: 'History.History',
-        icon: 'fa-home'
+        title: 'History.History'
       },
       component: History
     },
     {
       path: '/settings',
       meta: {
-        title: 'Settings.Settings',
-        icon: 'fa-home'
+        title: 'Settings.Settings'
       },
       component: Settings
     },
     {
       path: '/about',
       meta: {
-        title: 'About.About',
-        icon: 'fa-home'
+        title: 'About.About'
       },
       component: About
     },
     {
       path: '/search/:query',
       meta: {
-        title: 'Search Filters.Search Results',
-        icon: 'fa-home'
+        title: 'Search Filters.Search Results'
       },
       component: Search
     },
     {
       path: '/playlist/:id',
       meta: {
-        title: 'Playlist.Playlist',
-        icon: 'fa-home'
+        title: 'Playlist.Playlist'
       },
       component: Playlist
     },
     {
       path: '/channel/:id/:currentTab?',
       meta: {
-        title: 'Channel',
-        icon: 'fa-user'
+        title: 'Channel'
       },
       component: Channel
     },
     {
       path: '/watch/:id',
       meta: {
-        title: 'Watch',
-        icon: 'fa-user'
+        title: 'Watch'
       },
       component: Watch
     }

From b96c6b554222412014e9e8ac7e2e48ce4e33fffe Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Sun, 1 Jan 2023 00:30:06 +0800
Subject: [PATCH 190/301] Fix clear button covered by new input wrapper (#3016)

* $ Fix CSS warnings

* ! Fix clear button covered by new input wrapper
---
 src/renderer/components/ft-input/ft-input.css | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/ft-input/ft-input.css b/src/renderer/components/ft-input/ft-input.css
index c9b1df41e779..c4f151ce6d8e 100644
--- a/src/renderer/components/ft-input/ft-input.css
+++ b/src/renderer/components/ft-input/ft-input.css
@@ -38,10 +38,12 @@
 
 .clearInputTextButton {
   position: absolute;
-  margin: 0 3px;
-  padding: 10px;
   top: 5px;
   left: 0;
+  /* To be higher than `.inputWrapper` */
+  z-index: 1;
+  margin: 0 3px;
+  padding: 10px;
   border-radius: 100%;
   color: var(--primary-text-color);
   opacity: 0;
@@ -85,7 +87,6 @@
   width: 100%;
   padding: 1rem;
   border: none;
-  background: transparent;
   margin-bottom: 10px;
   font-size: 16px;
   height: 45px;
@@ -190,7 +191,7 @@
 
 .list li {
   display: block;
-  padding: 0px 15px;
+  padding: 0 15px;
   line-height: 2rem;
 }
 

From 492ad19558fe36b30ed9f756d844c1b882002470 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 1 Jan 2023 03:52:49 +0100
Subject: [PATCH 191/301] Make getVideoParamsFromUrl and
 showExternalPlayerUnsupportedActionToast helpers (#3018)

---
 src/renderer/helpers/utils.js       |  68 ++++++++++++++++++
 src/renderer/store/modules/utils.js | 107 +++-------------------------
 2 files changed, 79 insertions(+), 96 deletions(-)

diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index 55a5fcf327a9..6d66da201875 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -486,3 +486,71 @@ export function extractNumberFromString(str) {
     return NaN
   }
 }
+
+export function showExternalPlayerUnsupportedActionToast(externalPlayer, actionName) {
+  const action = i18n.t(`Video.External Player.Unsupported Actions.${actionName}`)
+  const message = i18n.t('Video.External Player.UnsupportedActionTemplate', { externalPlayer, action })
+  showToast(message)
+}
+
+export function getVideoParamsFromUrl(url) {
+  /** @type {URL} */
+  let urlObject
+  const paramsObject = { videoId: null, timestamp: null, playlistId: null }
+  try {
+    urlObject = new URL(url)
+  } catch (e) {
+    return paramsObject
+  }
+
+  function extractParams(videoId) {
+    paramsObject.videoId = videoId
+    paramsObject.timestamp = urlObject.searchParams.get('t')
+  }
+
+  const extractors = [
+    // anything with /watch?v=
+    function () {
+      if (urlObject.pathname === '/watch' && urlObject.searchParams.has('v')) {
+        extractParams(urlObject.searchParams.get('v'))
+        paramsObject.playlistId = urlObject.searchParams.get('list')
+        return paramsObject
+      }
+    },
+    // youtu.be
+    function () {
+      if (urlObject.host === 'youtu.be' && urlObject.pathname.match(/^\/[A-Za-z0-9_-]+$/)) {
+        extractParams(urlObject.pathname.slice(1))
+        return paramsObject
+      }
+    },
+    // youtube.com/embed
+    function () {
+      if (urlObject.pathname.match(/^\/embed\/[A-Za-z0-9_-]+$/)) {
+        const urlTail = urlObject.pathname.replace('/embed/', '')
+        if (urlTail === 'videoseries') {
+          paramsObject.playlistId = urlObject.searchParams.get('list')
+        } else {
+          extractParams(urlTail)
+        }
+        return paramsObject
+      }
+    },
+    // youtube.com/shorts
+    function () {
+      if (urlObject.pathname.match(/^\/shorts\/[A-Za-z0-9_-]+$/)) {
+        extractParams(urlObject.pathname.replace('/shorts/', ''))
+        return paramsObject
+      }
+    },
+    // cloudtube
+    function () {
+      if (urlObject.host.match(/^cadence\.(gq|moe)$/) && urlObject.pathname.match(/^\/cloudtube\/video\/[A-Za-z0-9_-]+$/)) {
+        extractParams(urlObject.pathname.slice('/cloudtube/video/'.length))
+        return paramsObject
+      }
+    }
+  ]
+
+  return extractors.reduce((a, c) => a || c(), null) || paramsObject
+}
diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index 29479da3df1a..357416b3039e 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -6,9 +6,11 @@ import { IpcChannels } from '../../../constants'
 import { pathExists } from '../../helpers/filesystem'
 import {
   createWebURL,
+  getVideoParamsFromUrl,
   openExternalLink,
   replaceFilenameForbiddenChars,
   searchFiltersMatch,
+  showExternalPlayerUnsupportedActionToast,
   showSaveDialog,
   showToast
 } from '../../helpers/utils'
@@ -259,68 +261,6 @@ const actions = {
     commit('setRegionValues', regionValues)
   },
 
-  getVideoParamsFromUrl (_, url) {
-    /** @type {URL} */
-    let urlObject
-    const paramsObject = { videoId: null, timestamp: null, playlistId: null }
-    try {
-      urlObject = new URL(url)
-    } catch (e) {
-      return paramsObject
-    }
-
-    function extractParams(videoId) {
-      paramsObject.videoId = videoId
-      paramsObject.timestamp = urlObject.searchParams.get('t')
-    }
-
-    const extractors = [
-      // anything with /watch?v=
-      function() {
-        if (urlObject.pathname === '/watch' && urlObject.searchParams.has('v')) {
-          extractParams(urlObject.searchParams.get('v'))
-          paramsObject.playlistId = urlObject.searchParams.get('list')
-          return paramsObject
-        }
-      },
-      // youtu.be
-      function() {
-        if (urlObject.host === 'youtu.be' && urlObject.pathname.match(/^\/[A-Za-z0-9_-]+$/)) {
-          extractParams(urlObject.pathname.slice(1))
-          return paramsObject
-        }
-      },
-      // youtube.com/embed
-      function() {
-        if (urlObject.pathname.match(/^\/embed\/[A-Za-z0-9_-]+$/)) {
-          const urlTail = urlObject.pathname.replace('/embed/', '')
-          if (urlTail === 'videoseries') {
-            paramsObject.playlistId = urlObject.searchParams.get('list')
-          } else {
-            extractParams(urlTail)
-          }
-          return paramsObject
-        }
-      },
-      // youtube.com/shorts
-      function() {
-        if (urlObject.pathname.match(/^\/shorts\/[A-Za-z0-9_-]+$/)) {
-          extractParams(urlObject.pathname.replace('/shorts/', ''))
-          return paramsObject
-        }
-      },
-      // cloudtube
-      function() {
-        if (urlObject.host.match(/^cadence\.(gq|moe)$/) && urlObject.pathname.match(/^\/cloudtube\/video\/[A-Za-z0-9_-]+$/)) {
-          extractParams(urlObject.pathname.slice('/cloudtube/video/'.length))
-          return paramsObject
-        }
-      }
-    ]
-
-    return extractors.reduce((a, c) => a || c(), null) || paramsObject
-  },
-
   getYoutubeUrlInfo ({ state }, urlStr) {
     // Returns
     // - urlType [String] `video`, `playlist`
@@ -348,7 +288,7 @@ const actions = {
     //
     // If `urlType` is "invalid_url"
     // Nothing else
-    const { videoId, timestamp, playlistId } = actions.getVideoParamsFromUrl(null, urlStr)
+    const { videoId, timestamp, playlistId } = getVideoParamsFromUrl(urlStr)
     if (videoId) {
       return {
         urlType: 'video',
@@ -509,10 +449,6 @@ const actions = {
     commit('setSessionSearchHistory', [])
   },
 
-  showExternalPlayerUnsupportedActionToast: function (_, { externalPlayer, action }) {
-    showToast(i18n.t('Video.External Player.UnsupportedActionTemplate', { externalPlayer, action }))
-  },
-
   async getExternalPlayerCmdArgumentsData ({ commit }, payload) {
     const fileName = 'external-player-map.json'
     let fileData
@@ -543,7 +479,7 @@ const actions = {
     commit('setExternalPlayerCmdArguments', externalPlayerCmdArguments)
   },
 
-  openInExternalPlayer ({ dispatch, state, rootState }, payload) {
+  openInExternalPlayer ({ state, rootState }, payload) {
     const args = []
     const externalPlayer = rootState.settings.externalPlayer
     const cmdArgs = state.externalPlayerCmdArguments[externalPlayer]
@@ -567,10 +503,7 @@ const actions = {
       if (typeof cmdArgs.startOffset === 'string') {
         args.push(`${cmdArgs.startOffset}${payload.watchProgress}`)
       } else if (!ignoreWarnings) {
-        dispatch('showExternalPlayerUnsupportedActionToast', {
-          externalPlayer,
-          action: i18n.t('Video.External Player.Unsupported Actions.starting video at offset')
-        })
+        showExternalPlayerUnsupportedActionToast(externalPlayer, 'starting video at offset')
       }
     }
 
@@ -578,10 +511,7 @@ const actions = {
       if (typeof cmdArgs.playbackRate === 'string') {
         args.push(`${cmdArgs.playbackRate}${payload.playbackRate}`)
       } else if (!ignoreWarnings) {
-        dispatch('showExternalPlayerUnsupportedActionToast', {
-          externalPlayer,
-          action: i18n.t('Video.External Player.Unsupported Actions.setting a playback rate')
-        })
+        showExternalPlayerUnsupportedActionToast(externalPlayer, 'setting a playback rate')
       }
     }
 
@@ -591,10 +521,7 @@ const actions = {
         if (typeof cmdArgs.playlistIndex === 'string') {
           args.push(`${cmdArgs.playlistIndex}${payload.playlistIndex}`)
         } else if (!ignoreWarnings) {
-          dispatch('showExternalPlayerUnsupportedActionToast', {
-            externalPlayer,
-            action: i18n.t('Video.External Player.Unsupported Actions.opening specific video in a playlist (falling back to opening the video)')
-          })
+          showExternalPlayerUnsupportedActionToast(externalPlayer, 'opening specific video in a playlist (falling back to opening the video)')
         }
       }
 
@@ -602,10 +529,7 @@ const actions = {
         if (typeof cmdArgs.playlistReverse === 'string') {
           args.push(cmdArgs.playlistReverse)
         } else if (!ignoreWarnings) {
-          dispatch('showExternalPlayerUnsupportedActionToast', {
-            externalPlayer,
-            action: i18n.t('Video.External Player.Unsupported Actions.reversing playlists')
-          })
+          showExternalPlayerUnsupportedActionToast(externalPlayer, 'reversing playlists')
         }
       }
 
@@ -613,10 +537,7 @@ const actions = {
         if (typeof cmdArgs.playlistShuffle === 'string') {
           args.push(cmdArgs.playlistShuffle)
         } else if (!ignoreWarnings) {
-          dispatch('showExternalPlayerUnsupportedActionToast', {
-            externalPlayer,
-            action: i18n.t('Video.External Player.Unsupported Actions.shuffling playlists')
-          })
+          showExternalPlayerUnsupportedActionToast(externalPlayer, 'shuffling playlists')
         }
       }
 
@@ -624,10 +545,7 @@ const actions = {
         if (typeof cmdArgs.playlistLoop === 'string') {
           args.push(cmdArgs.playlistLoop)
         } else if (!ignoreWarnings) {
-          dispatch('showExternalPlayerUnsupportedActionToast', {
-            externalPlayer,
-            action: i18n.t('Video.External Player.Unsupported Actions.looping playlists')
-          })
+          showExternalPlayerUnsupportedActionToast(externalPlayer, 'looping playlists')
         }
       }
       if (cmdArgs.supportsYtdlProtocol) {
@@ -637,10 +555,7 @@ const actions = {
       }
     } else {
       if (payload.playlistId !== null && payload.playlistId !== '' && !ignoreWarnings) {
-        dispatch('showExternalPlayerUnsupportedActionToast', {
-          externalPlayer,
-          action: i18n.t('Video.External Player.Unsupported Actions.opening playlists')
-        })
+        showExternalPlayerUnsupportedActionToast(externalPlayer, 'opening playlists')
       }
       if (payload.videoId !== null) {
         if (cmdArgs.supportsYtdlProtocol) {

From 7d509969a6d5f2567360313b75f0d0f73f43f9d0 Mon Sep 17 00:00:00 2001
From: Fjuro <ifjuro@proton.me>
Date: Sun, 1 Jan 2023 10:20:26 +0000
Subject: [PATCH 192/301] Translated using Weblate (Czech)

Currently translated at 100.0% (657 of 657 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/cs/
---
 static/locales/cs.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml
index 2295bb68cb16..0e104005942f 100644
--- a/static/locales/cs.yaml
+++ b/static/locales/cs.yaml
@@ -683,7 +683,7 @@ Video:
     sponsor: Sponzor
     recap: Shrnutí
     filler: Výplň
-  Skipped segment: Přeskočený segment
+  Skipped segment: Přeskočen segment
   External Player:
     Unsupported Actions:
       opening specific video in a playlist (falling back to opening the video): Otevření

From 36e34fb5ede70ce53f58a55f3a32799d6174cac9 Mon Sep 17 00:00:00 2001
From: Simon Epstein <simon@simondo.com>
Date: Sun, 1 Jan 2023 21:53:29 +0000
Subject: [PATCH 193/301] Add option to display distraction free titles (#2987)

* 2953 Added boilerplate to manage setting.

* Hooked in distraction free title to video list view.

* Tweaked the regexp to include apostrophe when looking for runs.

Also only change case for runs of 3 or more, to avoid messing with
common abbreviations.

* Addressed review feedback.

Co-authored-by: Simon Epstein <simon.epstein@67bricks.com>
---
 .../distraction-settings.js                   |  6 ++++-
 .../distraction-settings.vue                  |  6 +++++
 .../components/ft-list-video/ft-list-video.js | 16 +++++++++++--
 .../ft-list-video/ft-list-video.vue           |  2 +-
 src/renderer/helpers/utils.js                 | 23 +++++++++++++++++++
 src/renderer/store/modules/settings.js        |  1 +
 static/locales/en-US.yaml                     |  1 +
 7 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/distraction-settings/distraction-settings.js b/src/renderer/components/distraction-settings/distraction-settings.js
index 90870b5b3828..939ecba67f54 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.js
+++ b/src/renderer/components/distraction-settings/distraction-settings.js
@@ -65,6 +65,9 @@ export default Vue.extend({
     hideChapters: function () {
       return this.$store.getters.getHideChapters
     },
+    showDistractionFreeTitles: function () {
+      return this.$store.getters.getShowDistractionFreeTitles
+    },
     channelsHidden: function () {
       return JSON.parse(this.$store.getters.getChannelsHidden)
     }
@@ -100,7 +103,8 @@ export default Vue.extend({
       'updateHideUpcomingPremieres',
       'updateHideSharingActions',
       'updateHideChapters',
-      'updateChannelsHidden'
+      'updateChannelsHidden',
+      'updateShowDistractionFreeTitles'
     ])
   }
 })
diff --git a/src/renderer/components/distraction-settings/distraction-settings.vue b/src/renderer/components/distraction-settings/distraction-settings.vue
index 2603f3022eaa..81659956d3c2 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.vue
+++ b/src/renderer/components/distraction-settings/distraction-settings.vue
@@ -102,6 +102,12 @@
           :default-value="hideComments"
           @change="updateHideComments"
         />
+        <ft-toggle-switch
+          :label="$t('Settings.Distraction Free Settings.Display Titles Without Excessive Capitalisation')"
+          :compact="true"
+          :default-value="showDistractionFreeTitles"
+          @change="updateShowDistractionFreeTitles"
+        />
       </div>
     </div>
     <br class="hide-on-mobile">
diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js
index 5c31573c64e1..8111889d7be0 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.js
+++ b/src/renderer/components/ft-list-video/ft-list-video.js
@@ -7,7 +7,9 @@ import {
   formatDurationAsTimestamp,
   openExternalLink,
   showToast,
-  toLocalePublicationString
+  toLocalePublicationString,
+  toDistractionFreeTitle,
+
 } from '../../helpers/utils'
 
 export default Vue.extend({
@@ -282,7 +284,17 @@ export default Vue.extend({
 
     currentLocale: function () {
       return i18n.locale.replace('_', '-')
-    }
+    },
+    showDistractionFreeTitles: function () {
+      return this.$store.getters.getShowDistractionFreeTitles
+    },
+    displayTitle: function () {
+      if (this.showDistractionFreeTitles) {
+        return toDistractionFreeTitle(this.data.title)
+      } else {
+        return this.data.title
+      }
+    },
   },
   mounted: function () {
     this.parseVideoData()
diff --git a/src/renderer/components/ft-list-video/ft-list-video.vue b/src/renderer/components/ft-list-video/ft-list-video.vue
index 87ba4b5b5220..87fb220e1ae3 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.vue
+++ b/src/renderer/components/ft-list-video/ft-list-video.vue
@@ -82,7 +82,7 @@
           query: playlistId ? {playlistId} : {}
         }"
       >
-        {{ title }}
+        {{ displayTitle }}
       </router-link>
       <div class="infoLine">
         <router-link
diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index 6d66da201875..4491f2e468a2 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -554,3 +554,26 @@ export function getVideoParamsFromUrl(url) {
 
   return extractors.reduce((a, c) => a || c(), null) || paramsObject
 }
+
+/**
+ * This will match sequences of upper case characters and convert them into title cased words.
+ * @param {string} title the title to process
+ * @param {number} minUpperCase the minimum number of consecutive upper case characters to match
+ * @returns {string} the title with upper case characters removed
+ */
+export function toDistractionFreeTitle(title, minUpperCase = 3) {
+  const firstValidCharIndex = (word) => {
+    const reg = /[\p{L}]/u
+    return word.search(reg)
+  }
+
+  const capitalizedWord = (word) => {
+    const chars = word.split('')
+    const index = firstValidCharIndex(word)
+    chars[index] = chars[index].toUpperCase()
+    return chars.join('')
+  }
+
+  const reg = RegExp(`[\\p{Lu}|']{${minUpperCase},}`, 'ug')
+  return title.replace(reg, x => capitalizedWord(x.toLowerCase()))
+}
diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
index 141ebd4f8c87..f5e1aba23e07 100644
--- a/src/renderer/store/modules/settings.js
+++ b/src/renderer/store/modules/settings.js
@@ -213,6 +213,7 @@ const state = {
   hideWatchedSubs: false,
   hideLabelsSideBar: false,
   hideChapters: false,
+  showDistractionFreeTitles: false,
   landingPage: 'subscriptions',
   listType: 'grid',
   maxVideoPlaybackRate: 3,
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index da7f537efdf4..432a263a5c1e 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -323,6 +323,7 @@ Settings:
     Hide Active Subscriptions: Hide Active Subscriptions
     Hide Video Description: Hide Video Description
     Hide Comments: Hide Comments
+    Display Titles Without Excessive Capitalisation: Display Titles Without Excessive Capitalisation
     Hide Live Streams: Hide Live Streams
     Hide Upcoming Premieres: Hide Upcoming Premieres
     Hide Sharing Actions: Hide Sharing Actions

From e4302dce3df3ee07a7d219f9df43f221008b90c7 Mon Sep 17 00:00:00 2001
From: Kyotaro Iijima <kyotaro.eyes@gmail.com>
Date: Sun, 1 Jan 2023 22:23:37 +0000
Subject: [PATCH 194/301] Translated using Weblate (Japanese)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ja/
---
 static/locales/ja.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/ja.yaml b/static/locales/ja.yaml
index ae11889ce2fe..a9a76ad51ebc 100644
--- a/static/locales/ja.yaml
+++ b/static/locales/ja.yaml
@@ -359,6 +359,7 @@ Settings:
     Hide Upcoming Premieres: 今後のプレミア公開を非表示
     Hide Channels: チャンネルから動画を非表示
     Hide Channels Placeholder: チャネル名または ID
+    Display Titles Without Excessive Capitalisation: 英語の大文字化を控えたタイトル表示
   The app needs to restart for changes to take effect. Restart and apply change?: 変更の反映には、アプリの再起動が必要です。再起動して変更を適用しますか？
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: ネットワーク情報の取得中にエラーが発生しました。プロキシーを正しく設定してますか?

From 3d23881ce81d0a6a8b97ead7c4e6b8e81f1c1e20 Mon Sep 17 00:00:00 2001
From: Rusi Dimitrov <astral_86@mail.bg>
Date: Sun, 1 Jan 2023 22:03:34 +0000
Subject: [PATCH 195/301] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/bg/
---
 static/locales/bg.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/bg.yaml b/static/locales/bg.yaml
index efff755347d7..bc8c6518be8a 100644
--- a/static/locales/bg.yaml
+++ b/static/locales/bg.yaml
@@ -394,6 +394,8 @@ Settings:
     Hide Upcoming Premieres: Скриване на предстоящите премиери
     Hide Channels: Скриване видеата от каналите
     Hide Channels Placeholder: Име или идентификатор на канала
+    Display Titles Without Excessive Capitalisation: Показване на заглавията без излишни
+      главни букви
   The app needs to restart for changes to take effect. Restart and apply change?: Приложението
     трябва да се рестартира за да се приложат промените. Рестартиране?
   Proxy Settings:

From 68a8a0352dd92c3003c1640abd1e3beed30b4c3a Mon Sep 17 00:00:00 2001
From: ovari <ovari123@zoho.com>
Date: Sun, 1 Jan 2023 23:57:54 +0000
Subject: [PATCH 196/301] Translated using Weblate (Hungarian)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/hu/
---
 static/locales/hu.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/hu.yaml b/static/locales/hu.yaml
index 8c2f909c061c..b72f936dd829 100644
--- a/static/locales/hu.yaml
+++ b/static/locales/hu.yaml
@@ -398,6 +398,8 @@ Settings:
     Hide Upcoming Premieres: Közelgő első előadások elrejtése
     Hide Channels: Videók elrejtése a csatornákból
     Hide Channels Placeholder: Csatorna neve vagy azonosítója
+    Display Titles Without Excessive Capitalisation: Címek megjelenítése túlzott nagybetűk
+      nélkül
   The app needs to restart for changes to take effect. Restart and apply change?: Az
     alkalmazásnak újra kell indulnia, hogy a változtatások életbe lépjenek. Indítsa
     újra és alkalmazza a módosítást?

From 069ffd03b26e87f5450fc662ae1cc83c9c403cd5 Mon Sep 17 00:00:00 2001
From: Fjuro <ifjuro@proton.me>
Date: Sun, 1 Jan 2023 23:19:16 +0000
Subject: [PATCH 197/301] Translated using Weblate (Czech)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/cs/
---
 static/locales/cs.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml
index 0e104005942f..f3f80e92c4d8 100644
--- a/static/locales/cs.yaml
+++ b/static/locales/cs.yaml
@@ -316,6 +316,8 @@ Settings:
     Hide Upcoming Premieres: Skrýt nadcházející premiéry
     Hide Channels: Skrýt videa z kanálů
     Hide Channels Placeholder: Název nebo ID kanálu
+    Display Titles Without Excessive Capitalisation: Zobrazit názvy bez nadměrného
+      použití velkých písmen
   Data Settings:
     Data Settings: 'Nastavení dat'
     Select Import Type: 'Vybrat typ importu'

From 05e45d43fed273b6c54e5a3ca0d10240a880d96e Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Sun, 1 Jan 2023 22:02:39 +0000
Subject: [PATCH 198/301] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/uk/
---
 static/locales/uk.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/uk.yaml b/static/locales/uk.yaml
index 3de6686df485..856fba89dc43 100644
--- a/static/locales/uk.yaml
+++ b/static/locales/uk.yaml
@@ -319,6 +319,8 @@ Settings:
     Hide Upcoming Premieres: Сховати майбутні прем'єри
     Hide Channels: Сховати відео з каналів
     Hide Channels Placeholder: Назва або ID каналу
+    Display Titles Without Excessive Capitalisation: Показувати заголовки без надмірно
+      великих літер
   Data Settings:
     Data Settings: 'Налаштування даних'
     Select Import Type: 'Оберіть тип імпорту'

From 47613d8c37b43a42662b7a9a4b16bc93f062dcf9 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Mon, 2 Jan 2023 03:03:21 +0100
Subject: [PATCH 199/301] Fix no sources error on the watch page (#3019)

---
 src/renderer/views/Watch/Watch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 9bdace8c92c4..09cf28686a98 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -43,7 +43,7 @@ export default Vue.extend({
   },
   data: function () {
     return {
-      isLoading: false,
+      isLoading: true,
       firstLoad: true,
       useTheatreMode: false,
       showDashPlayer: true,

From eaaaf1084557373cc55149267a6fb6f98fa24b5e Mon Sep 17 00:00:00 2001
From: Eric <hamburger2048@users.noreply.hosted.weblate.org>
Date: Mon, 2 Jan 2023 02:47:19 +0000
Subject: [PATCH 200/301] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/zh_Hans/
---
 static/locales/zh-CN.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/zh-CN.yaml b/static/locales/zh-CN.yaml
index 0186b973c447..6bf7e3e0ef35 100644
--- a/static/locales/zh-CN.yaml
+++ b/static/locales/zh-CN.yaml
@@ -357,6 +357,7 @@ Settings:
     Hide Upcoming Premieres: 隐藏即将到来的首映
     Hide Channels: 隐藏频道中的视频
     Hide Channels Placeholder: 频道名称或 ID
+    Display Titles Without Excessive Capitalisation: 不过度大写标题名称
   The app needs to restart for changes to take effect. Restart and apply change?: 应用需要重启让修改生效。重启以应用修改？
   Proxy Settings:
     Proxy Protocol: 代理协议

From 550fe6a1dd8c552688e88a2c9c04112203708490 Mon Sep 17 00:00:00 2001
From: Eric <hamburger2048@users.noreply.hosted.weblate.org>
Date: Mon, 2 Jan 2023 02:51:37 +0000
Subject: [PATCH 201/301] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/zh_Hans/
---
 static/locales/zh-CN.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/zh-CN.yaml b/static/locales/zh-CN.yaml
index 6bf7e3e0ef35..c5270a52cae9 100644
--- a/static/locales/zh-CN.yaml
+++ b/static/locales/zh-CN.yaml
@@ -357,7 +357,7 @@ Settings:
     Hide Upcoming Premieres: 隐藏即将到来的首映
     Hide Channels: 隐藏频道中的视频
     Hide Channels Placeholder: 频道名称或 ID
-    Display Titles Without Excessive Capitalisation: 不过度大写标题名称
+    Display Titles Without Excessive Capitalisation: 不用过度大写字母的方式显示标题名称
   The app needs to restart for changes to take effect. Restart and apply change?: 应用需要重启让修改生效。重启以应用修改？
   Proxy Settings:
     Proxy Protocol: 代理协议

From fe8752d692a9bf378d093c6ed4563719e0558cb5 Mon Sep 17 00:00:00 2001
From: Massimo Pissarello <mapi68@gmail.com>
Date: Mon, 2 Jan 2023 03:45:30 +0000
Subject: [PATCH 202/301] Translated using Weblate (Italian)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/it/
---
 static/locales/it.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/it.yaml b/static/locales/it.yaml
index 004fcdadb7ca..23fae6516968 100644
--- a/static/locales/it.yaml
+++ b/static/locales/it.yaml
@@ -402,6 +402,8 @@ Settings:
     Hide Upcoming Premieres: Nascondi le prossime Première
     Hide Channels: Nascondi i video dai canali
     Hide Channels Placeholder: Nome o ID del canale
+    Display Titles Without Excessive Capitalisation: Visualizza i titoli senza maiuscole
+      eccessive
   The app needs to restart for changes to take effect. Restart and apply change?: L'applicazione
     deve essere riavviata per applicare i cambiamenti. Riavvio e applico i cambiamenti
     subito?

From fc6ae0ed027e4396d476869b451fd4aff5c92d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Mon, 2 Jan 2023 04:36:46 +0000
Subject: [PATCH 203/301] Translated using Weblate (Turkish)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/tr/
---
 static/locales/tr.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/tr.yaml b/static/locales/tr.yaml
index f3980b068853..8528ce56a7cb 100644
--- a/static/locales/tr.yaml
+++ b/static/locales/tr.yaml
@@ -392,6 +392,8 @@ Settings:
     Hide Upcoming Premieres: Yaklaşan İlk Gösterimleri Gizle
     Hide Channels Placeholder: Kanal Adı veya Kimliği
     Hide Channels: Kanallardan Videoları Gizle
+    Display Titles Without Excessive Capitalisation: Başlıkları Aşırı Büyük Harf Kullanmadan
+      Görüntüle
   The app needs to restart for changes to take effect. Restart and apply change?: Değişikliklerin
     etkili olması için uygulamanın yeniden başlatılması gerekiyor. Yeniden başlatılsın
     ve değişiklikler uygulansın mı?

From 44f5cffc614e60f4c20c7057c7cb2129f89bff33 Mon Sep 17 00:00:00 2001
From: Retrial <giwrgosmant@gmail.com>
Date: Mon, 2 Jan 2023 08:44:10 +0000
Subject: [PATCH 204/301] Translated using Weblate (Greek)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/el/
---
 static/locales/el.yaml | 146 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 139 insertions(+), 7 deletions(-)

diff --git a/static/locales/el.yaml b/static/locales/el.yaml
index 55d2996127fb..8b60866e68ca 100644
--- a/static/locales/el.yaml
+++ b/static/locales/el.yaml
@@ -81,6 +81,9 @@ Subscriptions:
     RSS για αποφυγή περιορισμού των κλήσεων
   Load More Videos: Φόρτωση περισσότερων Βίντεο
   Error Channels: Κανάλια με προβλήματα
+  Disabled Automatic Fetching: Έχετε απενεργοποιήσει την αυτόματη ανάκτηση συνδρομής.
+    Ανανεώστε τις συνδρομές για να τις δείτε εδώ.
+  Empty Channels: Τα εγγεγραμμένα κανάλια σας προς το παρόν δεν έχουν βίντεο.
 Trending:
   Trending: 'Τάσεις'
   Gaming: Παιχνίδια
@@ -167,6 +170,7 @@ Settings:
       Light: 'Φωτεινό'
       Dracula: 'Δράκουλας'
       System Default: Προεπιλογή Συστήματος
+      Catppuccin Mocha: Catppuccin Mocha
     Main Color Theme:
       Main Color Theme: 'Κύριο Χρώμα Θέματος'
       Red: 'Κόκκινο'
@@ -192,12 +196,27 @@ Settings:
       Dracula Purple: 'Δράκουλας Μωβ'
       Dracula Red: 'Δράκουλας Κόκκινο'
       Dracula Yellow: 'Δράκουλας Κίτρινο'
+      Catppuccin Mocha Teal: Catppuccin Mocha Teal
+      Catppuccin Mocha Green: Catppuccin Mocha Green
+      Catppuccin Mocha Sky: Catppuccin Mocha Sky
+      Catppuccin Mocha Blue: Catppuccin Mocha Blue
+      Catppuccin Mocha Sapphire: Catppuccin Mocha Sapphire
+      Catppuccin Mocha Lavender: Catppuccin Mocha Lavender
+      Catppuccin Mocha Rosewater: Catppuccin Mocha Rosewater
+      Catppuccin Mocha Flamingo: Catppuccin Mocha Flamingo
+      Catppuccin Mocha Pink: Catppuccin Mocha Pink
+      Catppuccin Mocha Mauve: Catppuccin Mocha Mauve
+      Catppuccin Mocha Red: Catppuccin Mocha Red
+      Catppuccin Mocha Maroon: Catppuccin Mocha Maroon
+      Catppuccin Mocha Peach: Catppuccin Mocha Peach
+      Catppuccin Mocha Yellow: Catppuccin Mocha Yellow
     Secondary Color Theme: 'Δευτερεύων Χρώμα Θέματος'
         #* Main Color Theme
     UI Scale: Μέγεθος κλίμακας διεπαφής χρήστη
     Expand Side Bar by Default: Λειτουργία προεπιλογής πλάγιας Μπάρας
     Disable Smooth Scrolling: Απενεργοποίηση ομαλής κύλισης
     Hide Side Bar Labels: Απόκρυψη ετικετών πλευρικής γραμμής
+    Hide FreeTube Header Logo: Απόκρυψη Λογότυπου Κεφαλίδας FreeTube
   Player Settings:
     Player Settings: 'Ρυθμίσεις προγράμματος αναπαραγωγής'
     Force Local Backend for Legacy Formats: 'Εξαναγκασμένη τοπική υποστήριξη για Προηγούμενες
@@ -238,6 +257,26 @@ Settings:
     Fast-Forward / Rewind Interval: Διάστημα Γρήγορης προώθησης / Επανατύλιξης
     Max Video Playback Rate: Μέγιστος ρυθμός αναπαραγωγής βίντεο
     Video Playback Rate Interval: Διάστημα ρυθμού αναπαραγωγής βίντεο
+    Screenshot:
+      Error:
+        Forbidden Characters: Απαγορευμένοι Χαρακτήρες
+        Empty File Name: Κενό Όνομα Αρχείου
+      Enable: Ενεργοποίηση Στιγμιότυπου οθόνης
+      Quality Label: Ποιότητα Στιγμιότυπου Οθόνης
+      Ask Path: Ερώτηση για Αποθήκευση Φακέλου
+      Folder Button: Επιλέξτε φάκελο
+      Folder Label: Φάκελος Στιγμιότυπου Οθόνης
+      File Name Label: Μοτίβο ονόματος αρχείου
+      File Name Tooltip: Μπορείτε να χρησιμοποιήσετε μεταβλητές παρακάτω. %Y Έτος
+        4 ψηφία. %M Μήνας 2 ψηφία. %D ψηφία ημέρας 2. %H Ώρα 2 ψηφία. %N Λεπτά 2 ψηφία.
+        %S Δεύτερα 2 ψηφία. %T χιλιοστού του δευτερολέπτου 3 ψηφία. %s Βίντεο δεύτερο.
+        %t Βίντεο χιλιοστού του δευτερολέπτου 3 ψηφία. %i Αναγνωριστικό Βίντεο. Μπορείτε
+        επίσης να χρησιμοποιήσετε το "\" ή το "/" για να δημιουργήσετε υποφακέλους.
+      Format Label: Μορφή Στιγμιότυπου Οθόνης
+    Skip by Scrolling Over Video Player: Παράλειψη με Κύλιση στο Πρόγραμμα Αναπαραγωγής
+      Βίντεο
+    Enter Fullscreen on Display Rotate: Μετάβαση στην Πλήρη Οθόνη κατά την Περιστροφή
+      Οθόνης
   Privacy Settings:
     Privacy Settings: 'Ρυθμίσεις απορρήτου'
     Remember History: 'Διατήρηση ιστορικού'
@@ -260,6 +299,7 @@ Settings:
     Hide Videos on Watch: 'Απόκρυψη των βίντεο κατά την αναπαραγωγή'
     Fetch Feeds from RSS: 'Φόρτωση τροφοδοσίας RSS'
     Manage Subscriptions: 'Διαχείριση Εγγραφών'
+    Fetch Automatically: Αυτόματη Λήψη Τροφοδοσίας
   Data Settings:
     Data Settings: 'Ρυθμίσεις Δεδομένων'
     Select Import Type: 'Επιλογή Τρόπου Εισαγωγής'
@@ -308,6 +348,9 @@ Settings:
       εισαχθεί με επιτυχία
     All playlists has been successfully exported: Όλες οι λίστες αναπαραγωγής έχουν
       εξαχθεί με επιτυχία
+    Subscription File: Αρχείο Συνδρομής
+    History File: Αρχείο Ιστορικού
+    Playlist File: Αρχείο Λίστας Αναπαραγωγής
   Advanced Settings:
     Advanced Settings: 'Ρυθμίσεις για προχωρημένους'
     Enable Debug Mode (Prints data to the console): 'Ενεργοποίηση λειτουργίας εντοπισμού
@@ -348,6 +391,16 @@ Settings:
     Hide Video Views: Απόκρυψη προβολών βίντεο
     Hide Active Subscriptions: Απόκρυψη ενεργών συνδρομών
     Hide Playlists: Απόκρυψη λιστών αναπαραγωγής
+    Hide Live Streams: Απόκρυψη Ζωντανών Ροών
+    Hide Sharing Actions: Απόκρυψη Ενεργειών Κοινής Χρήσης
+    Hide Channels: Απόκρυψη Βίντεο Από Κανάλια
+    Hide Upcoming Premieres: Απόκρυψη Επερχόμενων Πρεμιέρων
+    Hide Channels Placeholder: Όνομα Καναλιού ή Αναγνωριστικό
+    Hide Comments: Απόκρυψη Σχολίων
+    Hide Chapters: Απόκρυψη Κεφαλαίων
+    Hide Video Description: Απόκρυψη Περιγραφής Βίντεο
+    Display Titles Without Excessive Capitalisation: Εμφάνιση Τίτλων Χωρίς Υπερβολική
+      Χρήση Κεφαλαίων
   The app needs to restart for changes to take effect. Restart and apply change?: Η
     εφαρμογή πρέπει να κάνει επανεκκίνηση για να εφαρμοστούν οι αλλαγές. Επανεκκίνηση
     και εφαρμογή αλλαγών;
@@ -375,6 +428,9 @@ Settings:
     Custom External Player Executable: Εκτελέσιμο εξωτερικού προγράμματος αναπαραγωγής
     Custom External Player Arguments: Προσαρμοσμένα ορίσματα εξωτερικού προγράμματος
       αναπαραγωγής
+    Players:
+      None:
+        Name: Κανένα
   SponsorBlock Settings:
     Enable SponsorBlock: Ενεργοποίηση του SponsorBlock
     Notify when sponsor segment is skipped: Ειδοποίηση όταν παραλείπεται το τμήμα
@@ -382,10 +438,43 @@ Settings:
     SponsorBlock Settings: Ρυθμίσεις SponsorBlock
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': Διεύθυνση URL του
       API του SponsorBlock (Η προεπιλογή είναι https://sponsor.ajay.app)
+    Skip Options:
+      Skip Option: Επιλογή Παράλειψης
+      Do Nothing: Να Μην Γίνει Τίποτα
+      Auto Skip: Αυτόματη Παράλειψη
+      Show In Seek Bar: Εμφάνιση Στη Γραμμή Αναζήτησης
+      Prompt To Skip: Προτροπή Για Παράλειψη
+    Category Color: Χρώμα Κατηγορίας
   Download Settings:
     Download Settings: Λήψη ρυθμίσεων
     Ask Download Path: Ζητήστε τη διαδρομή λήψης
     Choose Path: Επιλέξτε διαδρομή
+    Download Behavior: Συμπεριφορά Λήψης
+    Download in app: Λήψη στην εφαρμογή
+    Open in web browser: Άνοιγμα στο πρόγραμμα περιήγησης ιστού
+  Password Dialog:
+    Password Incorrect: Λάθος κωδικός
+    Unlock: Ξεκλείδωμα
+    Enter Password To Unlock: Εισαγάγετε τον κωδικό πρόσβασης για να ξεκλειδώσετε
+      τις ρυθμίσεις
+    Password: Κωδικός πρόσβασης
+  Password Settings:
+    Password Settings: Ρυθμίσεις Κωδικού πρόσβασης
+    Set Password: Ορίστε Κωδικό πρόσβασης
+    Set Password To Prevent Access: Ορίστε έναν κωδικό πρόσβασης για να αποτρέψετε
+      την πρόσβαση στις ρυθμίσεις
+    Remove Password: Κατάργηση Κωδικού πρόσβασης
+  Experimental Settings:
+    Replace HTTP Cache: Αντικατάσταση HTTP Cache
+    Warning: Αυτές οι ρυθμίσεις είναι πειραματικές, προκαλούν σφάλματα ενώ είναι ενεργοποιημένες.
+      Συνιστάται ιδιαίτερα η δημιουργία αντιγράφων ασφαλείας. Χρησιμοποιήστε το με
+      δική σας ευθύνη!
+    Experimental Settings: Πειραματικές Ρυθμίσεις
+  Parental Control Settings:
+    Parental Control Settings: Ρυθμίσεις Γονικού Ελέγχου
+    Show Family Friendly Only: Εμφάνιση Μόνο Για Οικογένειες
+    Hide Unsubscribe Button: Απόκρυψη Κουμπιού Απεγγραφής
+    Hide Search Bar: Απόκρυψη Μπάρας Αναζήτησης
 About:
   #On About page
   About: 'Σχετικά με'
@@ -593,6 +682,7 @@ Video:
     Years: 'Χρόνια'
     Ago: 'Πριν'
     Upcoming: 'Κάνει πρεμιέρα στις'
+    In less than a minute: Σε λιγότερο από ένα λεπτό
   Published on: 'Δημοσιεύθηκε στις'
   Publicationtemplate: 'δημοσιεύθηκε πριν από {number} {unit}'
 #& Videos
@@ -618,12 +708,14 @@ Video:
   Save Video: Αποθήκευση βίντεο
   translated from English: μεταφράστηκε από τα Αγγλικά
   Sponsor Block category:
-    intro: εισαγωγή
-    interaction: αλληλεπίδραση
-    sponsor: χορηγός
-    outro: επίλογος
-    self-promotion: αυτοπροβολή
-    music offtopic: μουσική εκτός θέματος
+    intro: Εισαγωγή
+    interaction: Αλληλεπίδραση
+    sponsor: Χορηγός
+    outro: Επίλογος
+    self-promotion: Αυτοπροβολή
+    music offtopic: Μουσική Εκτός θέματος
+    recap: Ανακεφαλαίωση
+    filler: Γεμιστικό
   External Player:
     video: βίντεο
     OpenInTemplate: Άνοιγμα σε {externalPlayer}
@@ -661,6 +753,9 @@ Video:
     Buffered: Φορτωμένο
     Dropped / Total Frames: Πτωμένα / Συνολικά Καρέ
   Skipped segment: Τμήμα που παραλείφθηκε
+  Show Super Chat Comment: Εμφάνιση Σχολίου Super Chat
+  Scroll to Bottom: Κύλιση προς τα Κάτω
+  Premieres: Πρεμιέρες
 Videos:
   #& Sort By
   Sort By:
@@ -714,6 +809,7 @@ Share:
     στο πρόχειρο
   Invidious Channel URL copied to clipboard: Ο σύνδεσμος καναλιού Invidious αντιγράφηκε
     στο πρόχειρο
+  Share Channel: Κοινή χρήση Καναλιού
 Mini Player: 'Μικρή πλατφόρμα αναπαραγωγής'
 Comments:
   Comments: 'Σχόλια'
@@ -739,6 +835,9 @@ Comments:
   From {channelName}: από {channelName}
   Show More Replies: Εμφάνιση περισσότερων απαντήσεων
   Pinned by: Καρφώθηκε από
+  Member: Μέλος
+  Hearted: Αγαπημένο
+  View {replyCount} replies: Προβολή {replyCount} απαντήσεων
 Up Next: 'Επόμενο'
 
 # Toast Messages
@@ -779,6 +878,8 @@ Tooltips:
       για την προεπιλεγμένη μέθοδο για την ανανέωση της τροφοδοσίας των συνδρομών
       σας. Η RSS είναι ταχύτερη και εμποδίζει το κλείδωμα IP, αλλά δεν παρέχει ορισμένες
       πληροφορίες, όπως η διάρκεια του βίντεο ή την κατάσταση αυτών
+    Fetch Automatically: Όταν είναι ενεργοποιημένο, το FreeTube θα λαμβάνει αυτόματα
+      τη ροή της συνδρομής σας όταν ανοίγει ένα νέο παράθυρο και όταν αλλάζει προφίλ.
   Player Settings:
     Default Video Format: Ορίστε τις μορφές που χρησιμοποιούνται κατά την αναπαραγωγή
       ενός βίντεο. Οι μορφές DASH μπορούν να παίξουν υψηλότερη ποιότητα. Οι παλαιότερες
@@ -798,6 +899,8 @@ Tooltips:
       ρυθμό αναπαραγωγής. Πατήστε παρατεταμένα το πλήκτρο Control (Command Key σε
       Mac) και κάντε αριστερό κλικ στο ποντίκι για να επιστρέψετε γρήγορα στον προεπιλεγμένο
       ρυθμό αναπαραγωγής (1x εκτός αν έχει αλλάξει στις ρυθμίσεις).
+    Skip by Scrolling Over Video Player: Χρησιμοποιήστε τον τροχό κύλισης για να παρακάμψετε
+      το βίντεο, στυλ MPV.
   General Settings:
     Region for Trending: Η περιοχή των τάσεων σας επιτρέπει να επιλέξετε τα δημοφιλή
       βίντεο της χώρας που θέλετε να εμφανίζονται. Δεν υποστηρίζονται όλες οι χώρες
@@ -830,11 +933,21 @@ Tooltips:
       κ.λπ.).
     External Player: Η επιλογή ενός εξωτερικού προγράμματος αναπαραγωγής θα εμφανίσει
       ένα εικονίδιο, για το άνοιγμα του βίντεο (λίστα αναπαραγωγής, εάν υποστηρίζεται)
-      στο εξωτερικό πρόγραμμα αναπαραγωγής, στη μικρογραφία.
+      στο εξωτερικό πρόγραμμα αναπαραγωγής, στη μικρογραφία. Προειδοποίηση, Οι ακατάλληλες
+      ρυθμίσεις δεν επηρεάζουν τις εξωτερικές συσκευές αναπαραγωγής.
     DefaultCustomArgumentsTemplate: "(Προεπιλογή: '{defaultCustomArguments}')"
     Custom External Player Arguments: Τυχόν προσαρμοσμένα ορίσματα γραμμής εντολών,
       διαχωρισμένα με ερωτηματικά (';'), που θέλετε να μεταβιβαστούν στο εξωτερικό
       πρόγραμμα αναπαραγωγής.
+  Experimental Settings:
+    Replace HTTP Cache: Απενεργοποιεί το Electron's disk-based HTTP cache και ενεργοποιεί
+      μια προσαρμοσμένη προσωρινή μνήμη εικόνων στη μνήμη. Θα οδηγήσει σε αυξημένη
+      χρήση RAM.
+  Distraction Free Settings:
+    Hide Channels: Εισαγάγετε ένα όνομα καναλιού ή ένα αναγνωριστικό καναλιού για
+      να αποκρύψετε όλα τα βίντεο, τις λίστες αναπαραγωγής και το ίδιο το κανάλι ώστε
+      να μην εμφανίζονται στην αναζήτηση ή στις τάσεις. Το όνομα του καναλιού που
+      καταχωρίσατε πρέπει να ταιριάζει απόλυτα και να κάνει διάκριση πεζών-κεφαλαίων.
 Playing Next Video Interval: Αναπαραγωγή επόμενου βίντεο άμεσα. Κάντε κλικ για ακύρωση.
   | Αναπαραγωγή επόμενου βίντεο σε {nextVideoInterval} δευτερόλεπτο. Κάντε κλικ για
   ακύρωση. | Αναπαραγωγή επόμενου βίντεο σε {nextVideoInterval} δευτερόλεπτα. Κάντε
@@ -869,3 +982,22 @@ Channels:
   Unsubscribe Prompt: Είστε σίγουρος πως επιθυμείτε να απεγγραφείτε από το "$"?
 New Window: Νέο Παράθυρο
 Screenshot Error: Λήψη στιγμιότυπου απέτυχε. $
+Clipboard:
+  Copy failed: Η αντιγραφή στο πρόχειρο απέτυχε
+  Cannot access clipboard without a secure connection: Δεν είναι δυνατή η πρόσβαση
+    στο πρόχειρο χωρίς ασφαλή σύνδεση
+Chapters:
+  'Chapters list hidden, current chapter: {chapterName}': 'Κρυφή λίστα κεφαλαίων,
+    τρέχον κεφάλαιο: {chapterName}'
+  Chapters: Κεφάλαια
+  'Chapters list visible, current chapter: {chapterName}': 'Ορατή λίστα κεφαλαίων,
+    τρέχον κεφάλαιο: {chapterName}'
+Age Restricted:
+  This {videoOrPlaylist} is age restricted: Αυτό το {videoOrPlaylist} έχει περιορισμό
+    ηλικίας
+  Type:
+    Channel: Κανάλι
+    Video: Βίντεο
+Ok: Εντάξει
+Preferences: Προτιμήσεις
+Screenshot Success: Αποθηκευμένο στιγμιότυπο οθόνης ως "{filePath}"

From e7b9b32ea49d161c3de268c7e47e2950a6446d7b Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Mon, 2 Jan 2023 07:35:05 +0000
Subject: [PATCH 205/301] Translated using Weblate (Hebrew)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/he/
---
 static/locales/he.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/he.yaml b/static/locales/he.yaml
index 289aade506b1..48d410df8f90 100644
--- a/static/locales/he.yaml
+++ b/static/locales/he.yaml
@@ -380,6 +380,8 @@ Settings:
     Hide Upcoming Premieres: הסתרת בכורות קרובות
     Hide Channels: הסתרת סרטונים מהערוצים
     Hide Channels Placeholder: שם או מזהה ערוץ
+    Display Titles Without Excessive Capitalisation: להציג כותרות בלי הגזמה באותיות
+      גדולות
   The app needs to restart for changes to take effect. Restart and apply change?: צריך
     להפעיל את היישומון מחדש כדי שהשינויים ייכנסו לתוקף. להפעיל מחדש ולהחיל את השינוי?
   Proxy Settings:

From a6e21fcfa759cc59a059e64a2d4bf115796bc6cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Mon, 2 Jan 2023 08:01:33 +0000
Subject: [PATCH 206/301] Translated using Weblate (Icelandic)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/is/
---
 static/locales/is.yaml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/static/locales/is.yaml b/static/locales/is.yaml
index 24d127099b5e..ad24f4729490 100644
--- a/static/locales/is.yaml
+++ b/static/locales/is.yaml
@@ -278,6 +278,7 @@ Settings:
       Folder Button: Veldu möppu
       File Name Label: Mynstur skráaheita
     Enter Fullscreen on Display Rotate: Fara í skjáfylli við snúning á skjá
+    Skip by Scrolling Over Video Player: Sleppa með því að skruna ofan á myndspilara
   Privacy Settings:
     Privacy Settings: 'Stillingar gagnaleyndar'
     Remember History: 'Muna vinnsluferil'
@@ -319,6 +320,9 @@ Settings:
     Hide Comments: Fela athugasemdir
     Hide Chapters: Fela kafla
     Hide Upcoming Premieres: Fela væntanlegar frumsýningar
+    Hide Channels: Fela myndskeið úr rásum
+    Hide Channels Placeholder: Heiti eða auðkenni rásar
+    Display Titles Without Excessive Capitalisation: Birta titla án umfram-hástafa
   Data Settings:
     Data Settings: 'Stillingar gagna'
     Select Import Type: 'Veldu tegund innflutnings'
@@ -423,6 +427,16 @@ Settings:
     Warning: Þessar stillingar eru á tilraunastigi, þær geta valdið hruni þegar þær
       eru virkjaðar. Mælt er með því að öryggisafrit séu tekin. Notist á eigin ábyrgð!
     Replace HTTP Cache: Skipta út HTTP-skyndiminni
+  Password Dialog:
+    Password: Lykilorð
+    Password Incorrect: Rangt lykilorð
+    Enter Password To Unlock: Settu inn lykilorð til að aflæsa stillingum
+    Unlock: Aflæsa
+  Password Settings:
+    Set Password To Prevent Access: Settu lykilorð til að hindra aðgang að stillingum
+    Set Password: Setja lykilorð
+    Remove Password: Fjarlægja lykilorð
+    Password Settings: Stillingar lykilorðs
 About:
   #On About page
   About: 'Um hugbúnaðinn'
@@ -668,6 +682,8 @@ Video:
     Volume: Hljóðstyrkur
   Premieres in: Frumsýnt eftir
   Premieres: Frumsýnt
+  Show Super Chat Comment: Birta athugasemd Super Chat
+  Scroll to Bottom: Skruna neðst
 Videos:
   #& Sort By
   Sort By:
@@ -745,6 +761,8 @@ Comments:
   And others: og fleirum
   Pinned by: Fest af
   Member: Meðlimur
+  View {replyCount} replies: Skoða {replyCount} svör
+  Hearted: Líkað
 Up Next: 'Næst í spilun'
 
 #Tooltips
@@ -784,6 +802,8 @@ Tooltips:
       haltu niðri Ctrl-lyklinum ('Command' slaufulykill á Mac) og smelltu með vinstri
       músarhnappnum til að snúa aftur í sjálfgefinn hraða (1x nema ef því hefur verið
       breytt í stillingunum).
+    Skip by Scrolling Over Video Player: Nota skrunhjólið til að fletta í gegnum myndskeið,
+      svipað og í MPV.
   Subscription Settings:
     Fetch Feeds from RSS: 'Þegar þetta er virkt, mun FreeTube nota RSS í stað sjálfgefinnar
       aðferðar við að safna streymi áskriftarinnar þinnar. RSS er hraðvirkara og kemur
@@ -812,6 +832,10 @@ Tooltips:
   Experimental Settings:
     Replace HTTP Cache: Gerir HTTP-skyndiminni Electron óvirkt og virkjar sérsniðna
       minnislæga skyndiminnis-diskmynd. Veldur aukinni notkun á vinnsluminni.
+  Distraction Free Settings:
+    Hide Channels: Settu inn heiti eða auðkenni rásar til að fela öll myndskeið, spilunarlista
+      og sjálfa rásina við leit eða vinsældaskráningu. Heiti rásarinnar sem sett er
+      inn þarf að vera nákvæmlega stafrétt og tekur tillit til hástafa/lágstafa.
 Local API Error (Click to copy): 'Villa í staðværu API-kerfisviðmóti (smella til að
   afrita)'
 Invidious API Error (Click to copy): 'Villa í Invidious API-kerfisviðmóti (smella
@@ -884,3 +908,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Listi yfir kafla falinn,
     núverandi kafli: {chapterName}'
 Preferences: Kjörstillingar
+Ok: Í lagi

From 6d7aa79cbc998484f0c72640f8fe56b2d9cb047c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 13:36:06 +0100
Subject: [PATCH 207/301] Bump actions/stale from 6 to 7 (#2999)

* Bump actions/stale from 6 to 7

Bumps [actions/stale](https://github.com/actions/stale) from 6 to 7.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Only give necessary permissions to workflow

* readd spacing

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
---
 .github/workflows/stale.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 14c195a58333..04fa47539ab2 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -3,11 +3,15 @@ on:
   schedule:
     - cron: '30 1 * * *'
 
+permissions:
+  issues: write
+  pull-requests: write
+
 jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v7
         with:
           stale-issue-message: 'This issue is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 7 days.'
           stale-pr-message: 'This PR is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 14 days.'

From 9dacdd4c00a490f637c1689ba49fb7670bc7fc98 Mon Sep 17 00:00:00 2001
From: jc <jcwkgxc@nightorb.com>
Date: Mon, 2 Jan 2023 16:25:45 +0000
Subject: [PATCH 208/301] Translated using Weblate (Portuguese (Portugal))

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt_PT/
---
 static/locales/pt-PT.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/pt-PT.yaml b/static/locales/pt-PT.yaml
index a908773b3c86..f7f13795c5a1 100644
--- a/static/locales/pt-PT.yaml
+++ b/static/locales/pt-PT.yaml
@@ -323,6 +323,8 @@ Settings:
     Hide Upcoming Premieres: Ocultar Próximas estreias
     Hide Channels: Ocultar vídeos de canais
     Hide Channels Placeholder: Nome ou identificação do canal
+    Display Titles Without Excessive Capitalisation: Mostrar Títulos sem Capitalização
+      Excessiva
   Data Settings:
     Data Settings: Definições de dados
     Select Import Type: Escolher tipo de importação

From 360a24607bf9c456e84017d4f62e454d47433e75 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 2 Jan 2023 15:01:26 +0000
Subject: [PATCH 209/301] Translated using Weblate (Spanish)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/es/
---
 static/locales/es.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/es.yaml b/static/locales/es.yaml
index e6c3988b673d..f396c8b40f2e 100644
--- a/static/locales/es.yaml
+++ b/static/locales/es.yaml
@@ -390,6 +390,8 @@ Settings:
     Hide Upcoming Premieres: Ocultar los próximos estrenos
     Hide Channels: Ocultar los vídeos de los canales
     Hide Channels Placeholder: Nombre o ID del canal
+    Display Titles Without Excessive Capitalisation: Mostrar títulos sin demasiadas
+      mayúsculas
   The app needs to restart for changes to take effect. Restart and apply change?: ¿Quieres
     reiniciar FreeTube ahora para aplicar los cambios?
   Proxy Settings:

From 1a6b5f0ffdd7b7c4159c8f32c7e44d917721bcab Mon Sep 17 00:00:00 2001
From: jc <jcwkgxc@nightorb.com>
Date: Mon, 2 Jan 2023 16:25:09 +0000
Subject: [PATCH 210/301] Translated using Weblate (Portuguese)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt/
---
 static/locales/pt.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/pt.yaml b/static/locales/pt.yaml
index ac6e6ac5a8e1..07f9769dde9d 100644
--- a/static/locales/pt.yaml
+++ b/static/locales/pt.yaml
@@ -420,6 +420,8 @@ Settings:
     Hide Upcoming Premieres: Ocultar próximas estreias
     Hide Channels: Ocultar vídeos dos canais
     Hide Channels Placeholder: Nome ou ID do canal
+    Display Titles Without Excessive Capitalisation: Mostrar Títulos sem Capitalização
+      Excessiva
   External Player Settings:
     Custom External Player Arguments: Argumentos do reprodutor externo personalizado
     Custom External Player Executable: Executável de reprodutor externo personalizado

From 5f8be73d4374bbace2367a4d72e4e9966d996c77 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 2 Jan 2023 15:02:48 +0000
Subject: [PATCH 211/301] Translated using Weblate (Galician)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/gl/
---
 static/locales/gl.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/gl.yaml b/static/locales/gl.yaml
index aff1da984e4c..aef51bb4f97e 100644
--- a/static/locales/gl.yaml
+++ b/static/locales/gl.yaml
@@ -320,6 +320,8 @@ Settings:
     Hide Upcoming Premieres: Ocultalas próximas estreas
     Hide Channels: Ocultalos vídeos das canles
     Hide Channels Placeholder: Nome ou ID da canle
+    Display Titles Without Excessive Capitalisation: Amosalos títulos sen usar moitas
+      maiúsculas
   Data Settings:
     Data Settings: 'Axustes dos datos'
     Select Import Type: 'Escoller tipo de importación'

From d7d2045f8bea0e5624099bf91a71214359c788c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9A=D0=BE=D1=82=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B1=D0=B0=D0=B9?= <artemkotlubai@yandex.ru>
Date: Mon, 2 Jan 2023 21:51:26 +0000
Subject: [PATCH 212/301] Translated using Weblate (Russian)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 247fe0e6f9d4..7a48488cec74 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -391,6 +391,8 @@ Settings:
     Hide Upcoming Premieres: Скрыть предстоящие премьеры
     Hide Channels Placeholder: Название или идентификатор канала
     Hide Channels: Скрыть видео с каналов
+    Display Titles Without Excessive Capitalisation: Отображать заголовки без чрезмерного
+      использования заглавных букв
   The app needs to restart for changes to take effect. Restart and apply change?: Чтобы
     изменения вступили в силу, необходимо перезапустить приложение. Перезапустить
     и применить изменения?

From 0a1ee84004254aaf794ffb1e10c0c86ef9a7b3f3 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Mon, 2 Jan 2023 20:41:50 -0500
Subject: [PATCH 213/301] Fix workflow warnings (#3024)

* update actions

* update node12 actions

fix version

* update node12 actions
---
 .github/workflows/build.yml   | 4 ++--
 .github/workflows/release.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 077dad8147e4..f6a14f167837 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,7 +57,7 @@ jobs:
     - run: yarn run ci
     - run: yarn run lint
     - name: Get Version Number
-      uses: nyaayaya/package-version@v1
+      uses: jozsefsallai/node-package-version@v1.0.4
       with:
         path: 'package.json'
         follow-symlinks: false
@@ -84,7 +84,7 @@ jobs:
         # script: if ${{ env.IS_DEV }} then echo "::set-output name=VERSION_NUMBER::${{ env.VERSION_NUMBER_NIGHTLY }}" else echo "::set-output name=VERSION_NUMBER::${{ env.VERSION_NUMBER }}" fi
 
     - name: Update package.json version
-      uses: jossef/action-set-json-field@v2
+      uses: jossef/action-set-json-field@v2.1
       with:
         file: package.json
         field: version
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 000f9172a39b..a2b08ad6e3e3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -58,7 +58,7 @@ jobs:
     - run: yarn run lint
 
     - name: Get Version Number
-      uses: nyaayaya/package-version@v1
+      uses: jozsefsallai/node-package-version@v1.0.4
       with:
         path: 'package.json'
         follow-symlinks: false

From 8c181413ee92eb5eb1a47d2ee1e43d2114eea24b Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 3 Jan 2023 02:55:39 +0100
Subject: [PATCH 214/301] Use the new retrieve_player option in YouTube.js
 (#3022)

---
 package.json                      |  2 +-
 src/renderer/helpers/api/local.js | 34 ++++++++++---------------------
 yarn.lock                         |  8 ++++----
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 994bb6c6d3f6..b427cb1aad37 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
-    "youtubei.js": "^2.6.0",
+    "youtubei.js": "^2.7.0",
     "yt-channel-info": "^3.2.1",
     "yt-dash-manifest-generator": "1.1.0",
     "ytdl-core": "https://github.com/absidue/node-ytdl-core#fix-likes-extraction",
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index f4edfb4cb562..474988498c7e 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -1,4 +1,4 @@
-import { Innertube, Session } from 'youtubei.js'
+import { Innertube } from 'youtubei.js'
 import { join } from 'path'
 
 import { PlayerCache } from './PlayerCache'
@@ -18,31 +18,19 @@ import { extractNumberFromString, getUserDataPath } from '../utils'
  * @returns the Innertube instance
  */
 async function createInnertube(options = { withPlayer: false, location: undefined }) {
+  let cache
   if (options.withPlayer) {
     const userData = await getUserDataPath()
-
-    return await Innertube.create({
-      // use browser fetch
-      location: options.location,
-      fetch: (input, init) => fetch(input, init),
-      cache: new PlayerCache(join(userData, 'player_cache'))
-    })
-  } else {
-    // from https://github.com/LuanRT/YouTube.js/pull/240
-    const sessionData = await Session.getSessionData(undefined, options.location)
-
-    const session = new Session(
-      sessionData.context,
-      sessionData.api_key,
-      sessionData.api_version,
-      sessionData.account_index,
-      undefined, // player
-      undefined, // cookies
-      (input, init) => fetch(input, init) // use browser fetch
-    )
-
-    return new Innertube(session)
+    cache = new PlayerCache(join(userData, 'player_cache'))
   }
+
+  return await Innertube.create({
+    retrieve_player: !!options.withPlayer,
+    location: options.location,
+    // use browser fetch
+    fetch: (input, init) => fetch(input, init),
+    cache
+  })
 }
 
 let searchSuggestionsSession = null
diff --git a/yarn.lock b/yarn.lock
index 216257d92be6..852cbbe30b69 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8685,10 +8685,10 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-youtubei.js@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-2.6.0.tgz#7ba11f0d81b2e8d76a0993524b98ca7554d1090a"
-  integrity sha512-QnpOdcCqikI5qVTmMY7Orx/CglNVfsP+OGUgavodX20MtSRYUqjR/s/HYo1vWAol1hZT+PThEnIUrX/6U9IueA==
+youtubei.js@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-2.7.0.tgz#2b980f3e97c9b05097d3b387ff4f6a8d42a61e0d"
+  integrity sha512-npMhgWSru/tPdHvUUqgc0UZv9J7nn/o2V9cfcMS2WvnjhHW9vc9wR54QxyNxURC3uFKkk5WBouu+QjMn+bMtwg==
   dependencies:
     "@protobuf-ts/runtime" "^2.7.0"
     jintr "^0.3.1"

From bc44e27469064bb0d960ae4715b983cd6e462224 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 3 Jan 2023 02:27:01 +0000
Subject: [PATCH 215/301] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/zh_Hant/
---
 static/locales/zh-TW.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/zh-TW.yaml b/static/locales/zh-TW.yaml
index b8b9976e4d92..08bdcf8644b4 100644
--- a/static/locales/zh-TW.yaml
+++ b/static/locales/zh-TW.yaml
@@ -359,6 +359,7 @@ Settings:
     Hide Upcoming Premieres: 隱藏即將到來的首映
     Hide Channels Placeholder: 頻道名稱或 ID
     Hide Channels: 隱藏頻道中的影片
+    Display Titles Without Excessive Capitalisation: 顯示沒有過多大寫的標題
   The app needs to restart for changes to take effect. Restart and apply change?: 此變更需要重啟讓修改生效。重啟並且套用變更?
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: 取得網路資訊時發生錯誤。您的代理伺服器設定正確嗎？

From 43a25f873872a7281563d62f4f6f3ad3a3ace263 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Tue, 3 Jan 2023 13:19:41 -0500
Subject: [PATCH 216/301] update linters & add stylelint (#3023)

* update linters, add stylelint, switch from sass to scss

* remove unused babel-eslint module

* fix spacing in scss files

* dont use npm in script calls

* dont error for `:deep` selector in css
---
 .eslintrc.js                                  |  32 +-
 .stylelintignore                              |   7 +
 .stylelintrc.json                             |  34 +
 _scripts/webpack.renderer.config.js           |   8 +-
 _scripts/webpack.web.config.js                |   8 +-
 lefthook.yml                                  |   3 -
 package.json                                  |  31 +-
 src/main/ImageCache.js                        |   2 +-
 src/main/index.js                             |  12 +-
 .../components/data-settings/data-settings.js |  12 +-
 .../download-settings/download-settings.sass  |   2 -
 .../download-settings/download-settings.scss  |   3 +
 .../download-settings/download-settings.vue   |   2 +-
 .../ft-age-restricted/ft-age-restricted.sass  |  14 -
 .../ft-age-restricted/ft-age-restricted.scss  |  19 +
 .../ft-age-restricted/ft-age-restricted.vue   |   2 +-
 .../components/ft-auto-grid/ft-auto-grid.sass |  10 -
 .../components/ft-auto-grid/ft-auto-grid.scss |  13 +
 .../components/ft-auto-grid/ft-auto-grid.vue  |   2 +-
 .../ft-icon-button/ft-icon-button.sass        | 103 --
 .../ft-icon-button/ft-icon-button.scss        | 127 +++
 .../ft-icon-button/ft-icon-button.vue         |   2 +-
 .../ft-list-channel/ft-list-channel.sass      |   1 -
 .../ft-list-channel/ft-list-channel.scss      |   1 +
 .../ft-list-channel/ft-list-channel.vue       |   2 +-
 .../ft-list-playlist/ft-list-playlist.sass    |   1 -
 .../ft-list-playlist/ft-list-playlist.scss    |   1 +
 .../ft-list-playlist/ft-list-playlist.vue     |   2 +-
 .../ft-list-video/ft-list-video.sass          |   4 -
 .../ft-list-video/ft-list-video.scss          |   5 +
 .../ft-list-video/ft-list-video.vue           |   2 +-
 .../ft-settings-section.sass                  |  82 --
 .../ft-settings-section.scss                  | 116 +++
 .../ft-settings-section.vue                   |   2 +-
 .../ft-share-button/ft-share-button.sass      |  64 --
 .../ft-share-button/ft-share-button.scss      |  82 ++
 .../ft-share-button/ft-share-button.vue       |   2 +-
 .../ft-sponsor-block-category.js              |   2 +-
 .../ft-sponsor-block-category.sass            |   7 -
 .../ft-sponsor-block-category.scss            |  12 +
 .../ft-sponsor-block-category.vue             |   2 +-
 .../ft-timestamp-catcher.js                   |   2 +-
 .../ft-toggle-switch/ft-toggle-switch.sass    |  81 --
 .../ft-toggle-switch/ft-toggle-switch.scss    |  88 ++
 .../ft-toggle-switch/ft-toggle-switch.vue     |   2 +-
 .../general-settings/general-settings.sass    |   8 -
 .../general-settings/general-settings.scss    |   9 +
 .../general-settings/general-settings.vue     |   2 +-
 .../player-settings/player-settings.sass      |  12 -
 .../player-settings/player-settings.scss      |  19 +
 .../player-settings/player-settings.vue       |   2 +-
 .../playlist-info/playlist-info.sass          |  45 -
 .../playlist-info/playlist-info.scss          |  55 +
 .../playlist-info/playlist-info.vue           |   2 +-
 .../theme-settings/theme-settings.js          |   2 +-
 src/renderer/components/top-nav/top-nav.sass  | 166 ---
 src/renderer/components/top-nav/top-nav.scss  | 210 ++++
 src/renderer/components/top-nav/top-nav.vue   |   2 +-
 .../watch-video-description.js                |  36 +-
 .../watch-video-info/watch-video-info.js      |   2 +-
 .../watch-video-info/watch-video-info.sass    |  97 --
 .../watch-video-info/watch-video-info.scss    | 119 +++
 .../watch-video-info/watch-video-info.vue     |   2 +-
 src/renderer/helpers/accessibility.js         |   2 +-
 src/renderer/helpers/utils.js                 |  10 +-
 src/renderer/i18n/index.js                    |   2 +-
 src/renderer/sass-partials/_ft-list-item.sass | 225 ----
 src/renderer/scss-partials/_ft-list-item.scss | 292 ++++++
 src/renderer/store/modules/index.js           |   2 +-
 src/renderer/store/modules/utils.js           |   2 +-
 src/renderer/views/About/About.sass           |  50 -
 src/renderer/views/About/About.scss           |  62 ++
 src/renderer/views/About/About.vue            |   2 +-
 .../SubscribedChannels/SubscribedChannels.js  |   4 +-
 src/renderer/views/Watch/Watch.js             |  16 +-
 src/renderer/views/Watch/Watch.sass           | 109 --
 src/renderer/views/Watch/Watch.scss           | 149 +++
 src/renderer/views/Watch/Watch.vue            |   2 +-
 static/geolocations/bg/countries.json         |   2 -
 static/geolocations/uk/countries.json         |   2 +-
 yarn.lock                                     | 961 ++++++++++++++----
 81 files changed, 2309 insertions(+), 1386 deletions(-)
 create mode 100644 .stylelintignore
 create mode 100644 .stylelintrc.json
 delete mode 100644 src/renderer/components/download-settings/download-settings.sass
 create mode 100644 src/renderer/components/download-settings/download-settings.scss
 delete mode 100644 src/renderer/components/ft-age-restricted/ft-age-restricted.sass
 create mode 100644 src/renderer/components/ft-age-restricted/ft-age-restricted.scss
 delete mode 100644 src/renderer/components/ft-auto-grid/ft-auto-grid.sass
 create mode 100644 src/renderer/components/ft-auto-grid/ft-auto-grid.scss
 delete mode 100644 src/renderer/components/ft-icon-button/ft-icon-button.sass
 create mode 100644 src/renderer/components/ft-icon-button/ft-icon-button.scss
 delete mode 100644 src/renderer/components/ft-list-channel/ft-list-channel.sass
 create mode 100644 src/renderer/components/ft-list-channel/ft-list-channel.scss
 delete mode 100644 src/renderer/components/ft-list-playlist/ft-list-playlist.sass
 create mode 100644 src/renderer/components/ft-list-playlist/ft-list-playlist.scss
 delete mode 100644 src/renderer/components/ft-list-video/ft-list-video.sass
 create mode 100644 src/renderer/components/ft-list-video/ft-list-video.scss
 delete mode 100644 src/renderer/components/ft-settings-section/ft-settings-section.sass
 create mode 100644 src/renderer/components/ft-settings-section/ft-settings-section.scss
 delete mode 100644 src/renderer/components/ft-share-button/ft-share-button.sass
 create mode 100644 src/renderer/components/ft-share-button/ft-share-button.scss
 delete mode 100644 src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.sass
 create mode 100644 src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.scss
 delete mode 100644 src/renderer/components/ft-toggle-switch/ft-toggle-switch.sass
 create mode 100644 src/renderer/components/ft-toggle-switch/ft-toggle-switch.scss
 delete mode 100644 src/renderer/components/general-settings/general-settings.sass
 create mode 100644 src/renderer/components/general-settings/general-settings.scss
 delete mode 100644 src/renderer/components/player-settings/player-settings.sass
 create mode 100644 src/renderer/components/player-settings/player-settings.scss
 delete mode 100644 src/renderer/components/playlist-info/playlist-info.sass
 create mode 100644 src/renderer/components/playlist-info/playlist-info.scss
 delete mode 100644 src/renderer/components/top-nav/top-nav.sass
 create mode 100644 src/renderer/components/top-nav/top-nav.scss
 delete mode 100644 src/renderer/components/watch-video-info/watch-video-info.sass
 create mode 100644 src/renderer/components/watch-video-info/watch-video-info.scss
 delete mode 100644 src/renderer/sass-partials/_ft-list-item.sass
 create mode 100644 src/renderer/scss-partials/_ft-list-item.scss
 delete mode 100644 src/renderer/views/About/About.sass
 create mode 100644 src/renderer/views/About/About.scss
 delete mode 100644 src/renderer/views/Watch/Watch.sass
 create mode 100644 src/renderer/views/Watch/Watch.scss

diff --git a/.eslintrc.js b/.eslintrc.js
index e97ae69e6cda..510e38e06c8c 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -11,13 +11,24 @@ module.exports = {
   // https://eslint.org/docs/user-guide/configuring#specifying-parser
   parser: 'vue-eslint-parser',
 
-  // https://vuejs.github.io/eslint-plugin-vue/user-guide/#faq
+  // https://eslint.vuejs.org/user-guide/#faq
   parserOptions: {
-    parser: 'babel-eslint',
-    ecmaVersion: 2018,
+    parser: '@babel/eslint-parser',
+    ecmaVersion: 2022,
     sourceType: 'module'
   },
 
+  overrides: [
+    {
+      files: ['*.json'],
+      parser: 'jsonc-eslint-parser',
+      rules: {
+        'no-tabs': 'off',
+        'comma-spacing': 'off'
+      }
+    }
+  ],
+
   // https://eslint.org/docs/user-guide/configuring#extending-configuration-files
   // order matters: from least important to most important in terms of overriding
   // Prettier + Vue: https://medium.com/@gogl.alex/how-to-properly-set-up-eslint-with-prettier-for-vue-or-nuxt-in-vscode-e42532099a9c
@@ -25,12 +36,13 @@ module.exports = {
     'prettier',
     'eslint:recommended',
     'plugin:vue/recommended',
-    'standard'
+    'standard',
+    'plugin:jsonc/recommended-with-json',
     // 'plugin:vuejs-accessibility/recommended' // uncomment once issues are fixed
   ],
 
   // https://eslint.org/docs/user-guide/configuring#configuring-plugins
-  plugins: ['vue', 'vuejs-accessibility'],
+  plugins: ['vue', 'vuejs-accessibility', 'n', 'unicorn'],
 
   rules: {
     'space-before-function-paren': 'off',
@@ -39,6 +51,7 @@ module.exports = {
     'no-console': ['error', { allow: ['warn', 'error'] }],
     'no-unused-vars': 'warn',
     'no-undef': 'warn',
+    'object-shorthand': 'off',
     'vue/no-template-key': 'warn',
     'vue/no-useless-template-attributes': 'off',
     'vue/multi-word-component-names': 'off',
@@ -47,6 +60,13 @@ module.exports = {
       required: {
         some: ['nesting', 'id']
       }
-    }]
+    }],
+    'n/no-callback-literal': 'warn',
+    'n/no-path-concat': 'warn',
+    'unicorn/better-regex': 'error',
+    'unicorn/no-array-push-push': 'error',
+    'unicorn/prefer-keyboard-event-key': 'error',
+    'unicorn/prefer-regexp-test': 'error',
+    'unicorn/prefer-string-replace-all': 'error'
   }
 }
diff --git a/.stylelintignore b/.stylelintignore
new file mode 100644
index 000000000000..18256bd0f548
--- /dev/null
+++ b/.stylelintignore
@@ -0,0 +1,7 @@
+src/data/
+src/datastores/
+src/main/
+src/renderer/videoJS.css
+dist/
+static/
+node_modules/
diff --git a/.stylelintrc.json b/.stylelintrc.json
new file mode 100644
index 000000000000..ea45b8ebd083
--- /dev/null
+++ b/.stylelintrc.json
@@ -0,0 +1,34 @@
+{
+  "plugins": ["stylelint-high-performance-animation", "@double-great/stylelint-a11y"],
+  "extends": ["stylelint-config-standard", "stylelint-config-sass-guidelines"],
+  "overrides": [
+    {
+      "files": ["**/*.scss"],
+      "customSyntax": "postcss-scss",
+      "rules": {
+        "max-nesting-depth": null,
+        "selector-max-compound-selectors": null
+      }
+    },
+    {
+      "files": ["**/*.css"],
+      "rules": {
+        "a11y/media-prefers-reduced-motion": true,
+        "a11y/no-outline-none": true,
+        "a11y/selector-pseudo-class-focus": true,
+        "a11y/font-size-is-readable": true
+      }
+    }
+  ],
+  "rules": {
+    "selector-class-pattern": null,
+    "selector-id-pattern": null,
+    "plugin/no-low-performance-animation-properties": true,
+    "selector-pseudo-class-no-unknown": [
+      true,
+      {
+        "ignorePseudoClasses": ["deep"]
+      }
+    ]
+  }
+}
diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
index ecf1249adc2d..723661f8abf8 100644
--- a/_scripts/webpack.renderer.config.js
+++ b/_scripts/webpack.renderer.config.js
@@ -48,7 +48,7 @@ const config = {
         loader: 'vue-loader',
       },
       {
-        test: /\.s(c|a)ss$/,
+        test: /\.scss$/,
         use: [
           {
             loader: MiniCssExtractPlugin.loader,
@@ -62,11 +62,7 @@ const config = {
           {
             loader: 'sass-loader',
             options: {
-              // eslint-disable-next-line
-              implementation: require('sass'),
-              sassOptions: {
-                indentedSyntax: true
-              }
+              implementation: require('sass')
             }
           },
         ],
diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
index a18115e95f87..ac15675428fe 100644
--- a/_scripts/webpack.web.config.js
+++ b/_scripts/webpack.web.config.js
@@ -39,7 +39,7 @@ const config = {
         loader: 'vue-loader'
       },
       {
-        test: /\.s(c|a)ss$/,
+        test: /\.scss$/,
         use: [
           {
             loader: MiniCssExtractPlugin.loader,
@@ -53,11 +53,7 @@ const config = {
           {
             loader: 'sass-loader',
             options: {
-              // eslint-disable-next-line
-              implementation: require('sass'),
-              sassOptions: {
-                indentedSyntax: true
-              }
+              implementation: require('sass')
             }
           },
         ],
diff --git a/lefthook.yml b/lefthook.yml
index 7f6f4e3d6854..6a09c9530afc 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -1,4 +1,3 @@
-
 # Refer for explanation to following link:
 # https://github.com/evilmartians/lefthook/blob/master/docs/full_guide.md
 pre-commit:
@@ -12,8 +11,6 @@ pre-commit:
       skip:
         - rebase
 
-
-
 # EXAMPLE USAGE
 #
 # pre-push:
diff --git a/package.json b/package.json
index b427cb1aad37..8184e4c69dff 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,15 @@
     "dev": "run-s rebuild:electron dev-runner",
     "dev:web": "node _scripts/dev-runner.js --web",
     "dev-runner": "node _scripts/dev-runner.js",
+    "lint-all": "run-p lint lint-json lint-style",
     "lint-fix": "eslint --fix --ext .js,.vue ./",
     "lint": "eslint --ext .js,.vue ./",
+    "lint-json": "eslint --ext .json ./",
+    "lint-style": "run-p lint-style:scss lint-style:css",
+    "lint-style:scss": "stylelint \"**/*.scss\"",
+    "lint-style:css": "stylelint \"**/*.css\"",
+    "lint-style-fix:scss": "stylelint --fix \"**/*.scss\"",
+    "lint-style-fix:css": "stylelint --fix \"**/*.css\"",
     "pack": "run-p pack:main pack:renderer",
     "pack:main": "webpack --mode=production --node-env=production --config _scripts/webpack.main.config.js",
     "pack:renderer": "webpack --mode=production --node-env=production --config _scripts/webpack.renderer.config.js",
@@ -81,23 +88,25 @@
   },
   "devDependencies": {
     "@babel/core": "^7.20.7",
+    "@babel/eslint-parser": "^7.19.1",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/preset-env": "^7.20.2",
-    "babel-eslint": "^10.1.0",
+    "@double-great/stylelint-a11y": "^2.0.2",
     "babel-loader": "^9.1.0",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.3",
     "css-minimizer-webpack-plugin": "^4.2.2",
     "electron": "^22.0.0",
     "electron-builder": "^23.6.0",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-config-standard": "^16.0.3",
-    "eslint-plugin-import": "^2.24.2",
-    "eslint-plugin-node": "^11.1.0",
+    "eslint": "^8.31.0",
+    "eslint-config-prettier": "^8.6.0",
+    "eslint-config-standard": "^17.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jsonc": "^2.5.0",
+    "eslint-plugin-n": "^15.6.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint-plugin-standard": "^5.0.0",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-unicorn": "^45.0.2",
     "eslint-plugin-vue": "^9.8.0",
     "eslint-plugin-vuejs-accessibility": "^2.0.0",
     "html-webpack-plugin": "^5.3.2",
@@ -106,10 +115,16 @@
     "lefthook": "^1.2.4",
     "mini-css-extract-plugin": "^2.7.2",
     "npm-run-all": "^4.1.5",
+    "postcss": "^8.4.20",
+    "postcss-scss": "^4.0.6",
     "prettier": "^2.8.1",
     "rimraf": "^3.0.2",
     "sass": "^1.57.1",
     "sass-loader": "^13.2.0",
+    "stylelint": "^14.16.1",
+    "stylelint-config-sass-guidelines": "^9.0.1",
+    "stylelint-config-standard": "^29.0.0",
+    "stylelint-high-performance-animation": "^1.7.0",
     "tree-kill": "1.2.2",
     "vue-devtools": "^5.1.4",
     "vue-eslint-parser": "^9.1.0",
diff --git a/src/main/ImageCache.js b/src/main/ImageCache.js
index 4a635b7d92e9..8228f38dc63e 100644
--- a/src/main/ImageCache.js
+++ b/src/main/ImageCache.js
@@ -51,7 +51,7 @@ export class ImageCache {
  * @returns a timestamp in seconds
  */
 export function extractExpiryTimestamp(headers) {
-  const maxAgeRegex = /max-age=([0-9]+)/
+  const maxAgeRegex = /max-age=(\d+)/
 
   const cacheControl = headers['cache-control']
   if (cacheControl && maxAgeRegex.test(cacheControl)) {
diff --git a/src/main/index.js b/src/main/index.js
index c6ca1a703400..b911fef6f67a 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -283,7 +283,7 @@ function runApp() {
 
     session.defaultSession.webRequest.onBeforeSendHeaders(innertubeRequestFilter, ({ requestHeaders }, callback) => {
       requestHeaders.referer = 'https://www.youtube.com'
-      // eslint-disable-next-line node/no-callback-literal
+      // eslint-disable-next-line n/no-callback-literal
       callback({ requestHeaders })
     })
 
@@ -298,7 +298,7 @@ function runApp() {
         if (imageCache.has(url)) {
           const cached = imageCache.get(url)
 
-          // eslint-disable-next-line node/no-callback-literal
+          // eslint-disable-next-line n/no-callback-literal
           callback({
             mimeType: cached.mimeType,
             data: cached.data
@@ -336,7 +336,7 @@ function runApp() {
 
             imageCache.add(url, mimeType, data, expiryTimestamp)
 
-            // eslint-disable-next-line node/no-callback-literal
+            // eslint-disable-next-line n/no-callback-literal
             callback({
               mimeType,
               data: data
@@ -364,7 +364,7 @@ function runApp() {
               return value
             })
 
-            // eslint-disable-next-line node/no-callback-literal
+            // eslint-disable-next-line n/no-callback-literal
             callback({
               statusCode: response.statusCode ?? 400,
               mimeType: 'application/json',
@@ -385,12 +385,12 @@ function runApp() {
         // the requests made by the imagecache:// handler to fetch the image,
         // are allowed through, as their resourceType is 'other'
         if (details.resourceType === 'image') {
-          // eslint-disable-next-line node/no-callback-literal
+          // eslint-disable-next-line n/no-callback-literal
           callback({
             redirectURL: `imagecache://${encodeURIComponent(details.url)}`
           })
         } else {
-          // eslint-disable-next-line node/no-callback-literal
+          // eslint-disable-next-line n/no-callback-literal
           callback({})
         }
       })
diff --git a/src/renderer/components/data-settings/data-settings.js b/src/renderer/components/data-settings/data-settings.js
index ceac3eea40af..14b7ad982971 100644
--- a/src/renderer/components/data-settings/data-settings.js
+++ b/src/renderer/components/data-settings/data-settings.js
@@ -228,7 +228,7 @@ export default Vue.extend({
       let count = 0
 
       const ytsubs = youtubeSubscriptions.slice(1).map(yt => {
-        const splitCSVRegex = /(?:,|\n|^)("(?:(?:"")*[^"]*)*"|[^",\n]*|(?:\n|$))/g
+        const splitCSVRegex = /(?:,|\n|^)("(?:(?:"")*[^"]*)*"|[^\n",]*|(?:\n|$))/g
         return [...yt.matchAll(splitCSVRegex)].map(s => {
           let newVal = s[1]
           if (newVal.startsWith('"')) {
@@ -623,11 +623,11 @@ export default Vue.extend({
 
       this.profileList[0].subscriptions.forEach((channel) => {
         const escapedName = channel.name
-          .replace(/&/g, '&amp;')
-          .replace(/</g, '&lt;')
-          .replace(/>/g, '&gt;')
-          .replace(/"/g, '&quot;')
-          .replace(/'/g, '&apos;')
+          .replaceAll('&', '&amp;')
+          .replaceAll('<', '&lt;')
+          .replaceAll('>', '&gt;')
+          .replaceAll('"', '&quot;')
+          .replaceAll('\'', '&apos;')
 
         const channelOpmlString = `<outline text="${escapedName}" title="${escapedName}" type="rss" xmlUrl="https://www.youtube.com/feeds/videos.xml?channel_id=${channel.id}"/>`
         opmlData += channelOpmlString
diff --git a/src/renderer/components/download-settings/download-settings.sass b/src/renderer/components/download-settings/download-settings.sass
deleted file mode 100644
index 5d475ff8871e..000000000000
--- a/src/renderer/components/download-settings/download-settings.sass
+++ /dev/null
@@ -1,2 +0,0 @@
-.folderDisplay
-  width: 50vh
diff --git a/src/renderer/components/download-settings/download-settings.scss b/src/renderer/components/download-settings/download-settings.scss
new file mode 100644
index 000000000000..0c5ccdad0b5a
--- /dev/null
+++ b/src/renderer/components/download-settings/download-settings.scss
@@ -0,0 +1,3 @@
+.folderDisplay {
+  width: 50vh;
+}
diff --git a/src/renderer/components/download-settings/download-settings.vue b/src/renderer/components/download-settings/download-settings.vue
index 1620a2134e23..b4cd9dc1167e 100644
--- a/src/renderer/components/download-settings/download-settings.vue
+++ b/src/renderer/components/download-settings/download-settings.vue
@@ -44,4 +44,4 @@
 </template>
 
 <script src="./download-settings.js" />
-<style scoped lang="sass" src="./download-settings.sass" />
+<style scoped lang="scss" src="./download-settings.scss" />
diff --git a/src/renderer/components/ft-age-restricted/ft-age-restricted.sass b/src/renderer/components/ft-age-restricted/ft-age-restricted.sass
deleted file mode 100644
index 58d44107401f..000000000000
--- a/src/renderer/components/ft-age-restricted/ft-age-restricted.sass
+++ /dev/null
@@ -1,14 +0,0 @@
-.ft-age-restricted
-  color: var(--primary-text-color)
-  h2
-    width: 100%
-    text-align: center
-    background-color: var(--card-bg-color)
-    padding: 10px 0
-  .frown
-    width: 100%
-    text-align: center
-    background-color: var(--card-bg-color)
-    font-size: 10em
-    padding: 20px 0
-    height: 100%
diff --git a/src/renderer/components/ft-age-restricted/ft-age-restricted.scss b/src/renderer/components/ft-age-restricted/ft-age-restricted.scss
new file mode 100644
index 000000000000..b553283ea208
--- /dev/null
+++ b/src/renderer/components/ft-age-restricted/ft-age-restricted.scss
@@ -0,0 +1,19 @@
+.ft-age-restricted {
+  color: var(primary-text-color);
+
+  h2 {
+    background-color: var(card-bg-color);
+    padding: 10px 0;
+    text-align: center;
+    width: 100%;
+  }
+
+  .frown {
+    background-color: var(card-bg-color);
+    font-size: 10em;
+    height: 100%;
+    padding: 20px 0;
+    text-align: center;
+    width: 100%;
+  }
+}
diff --git a/src/renderer/components/ft-age-restricted/ft-age-restricted.vue b/src/renderer/components/ft-age-restricted/ft-age-restricted.vue
index abc2eac85c25..e3a5ca8174df 100644
--- a/src/renderer/components/ft-age-restricted/ft-age-restricted.vue
+++ b/src/renderer/components/ft-age-restricted/ft-age-restricted.vue
@@ -12,4 +12,4 @@
 </template>
 
 <script src="./ft-age-restricted.js" />
-<style scoped lang="sass" src="./ft-age-restricted.sass" />
+<style scoped lang="scss" src="./ft-age-restricted.scss" />
diff --git a/src/renderer/components/ft-auto-grid/ft-auto-grid.sass b/src/renderer/components/ft-auto-grid/ft-auto-grid.sass
deleted file mode 100644
index 7bbf3bfca341..000000000000
--- a/src/renderer/components/ft-auto-grid/ft-auto-grid.sass
+++ /dev/null
@@ -1,10 +0,0 @@
-.ft-auto-grid
-  &.grid
-    display: grid
-    grid-template-columns: repeat(auto-fill, minmax(262px, 1fr) )
-    justify-content: space-evenly
-    grid-gap: 8px
-
-  &.list
-    display: grid
-    grid-gap: 4px
diff --git a/src/renderer/components/ft-auto-grid/ft-auto-grid.scss b/src/renderer/components/ft-auto-grid/ft-auto-grid.scss
new file mode 100644
index 000000000000..6848c82d6a8f
--- /dev/null
+++ b/src/renderer/components/ft-auto-grid/ft-auto-grid.scss
@@ -0,0 +1,13 @@
+.ft-auto-grid {
+  &.grid {
+    display: grid;
+    grid-gap: 8px;
+    grid-template-columns: repeat(auto-fill, minmax(262px, 1fr));
+    justify-content: space-evenly;
+  }
+
+  &.list {
+    display: grid;
+    grid-gap: 4px;
+  }
+}
diff --git a/src/renderer/components/ft-auto-grid/ft-auto-grid.vue b/src/renderer/components/ft-auto-grid/ft-auto-grid.vue
index 14e2018698d8..1dd5abc057a0 100644
--- a/src/renderer/components/ft-auto-grid/ft-auto-grid.vue
+++ b/src/renderer/components/ft-auto-grid/ft-auto-grid.vue
@@ -11,4 +11,4 @@
 </template>
 
 <script src="./ft-auto-grid.js" />
-<style scoped lang="sass" src="./ft-auto-grid.sass" />
+<style scoped lang="scss" src="./ft-auto-grid.scss" />
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.sass b/src/renderer/components/ft-icon-button/ft-icon-button.sass
deleted file mode 100644
index ab32c450e1d1..000000000000
--- a/src/renderer/components/ft-icon-button/ft-icon-button.sass
+++ /dev/null
@@ -1,103 +0,0 @@
-.ftIconButton
-  display: flex
-  flex-flow: row wrap
-  justify-content: space-evenly
-  position: relative
-  user-select: none
-
-.iconButton
-  width: 1em
-  height: 1em
-  border-radius: 50%
-  cursor: pointer
-  transition: background 0.15s ease-out
-
-  &.shadow
-    box-shadow: 0 1px 2px rgba(0,0,0,.5)
-
-  &.base
-    background-color: var(--card-bg-color)
-    color: var(--primary-text-color)
-
-    &:hover
-      background-color: var(--side-nav-hover-color)
-
-    &:active
-      background-color: var(--side-nav-active-color)
-
-  &.base-no-default
-    &:hover
-      background-color: var(--side-nav-hover-color)
-
-    &:active
-      background-color: var(--side-nav-active-color)
-
-  &.primary
-    background-color: var(--primary-color)
-    color: var(--text-with-main-color)
-
-    &:hover
-      background-color: var(--primary-color-hover)
-
-    &:active
-      background-color: var(--primary-color-active)
-
-  &.secondary
-    background-color: var(--accent-color)
-    color: var(--text-with-accent-color)
-
-    &:hover
-      background-color: var(--accent-color-hover)
-
-    &:active
-      background-color: var(--accent-color-active)
-
-  &.favorite
-    color: var(--favorite-icon-color)
-
-.iconDropdown
-  display: inline
-  position: absolute
-  text-align: center
-  list-style-type: none
-  z-index: 3
-  margin-top: 45px
-  font-size: 12px
-  box-shadow: 0 1px 2px rgba(0,0,0,.5)
-  background-color: var(--side-nav-color)
-  color: var(--secondary-text-color)
-  user-select: none
-
-  &.left
-    right: calc(50% - 10px)
-
-  &.right
-    left: calc(50% - 10px)
-
-  .list
-    margin: 0
-    padding: 0
-    list-style-type: none
-
-  .listItem
-    padding: 8px 10px
-    margin: 0
-    white-space: nowrap
-    cursor: pointer
-    transition: background 0.2s ease-out
-
-    &:hover, &:focus
-      background-color: var(--side-nav-hover-color)
-      transition: background 0.2s ease-in
-
-    &:active
-      background-color: var(--side-nav-active-color)
-      transition: background 0.1s ease-in
-
-  .listItemDivider
-    width: 95%
-    margin: 1px auto
-    border-top: 1px solid var(--tertiary-text-color)
-    // Too "visible" with current color
-    opacity: 50%
-
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.scss b/src/renderer/components/ft-icon-button/ft-icon-button.scss
new file mode 100644
index 000000000000..0ee4f97fa761
--- /dev/null
+++ b/src/renderer/components/ft-icon-button/ft-icon-button.scss
@@ -0,0 +1,127 @@
+.ftIconButton {
+  display: flex;
+  flex-flow: row wrap;
+  justify-content: space-evenly;
+  position: relative;
+  user-select: none;
+}
+
+.iconButton {
+  border-radius: 50%;
+  cursor: pointer;
+  height: 1em;
+  transition: background 0.15s ease-out;
+  width: 1em;
+
+  &.shadow {
+    box-shadow: 0 1px 2px rgb(0 0 0 / 50%);
+  }
+
+  &.base {
+    background-color: var(card-bg-color);
+    color: var(primary-text-color);
+
+    &:hover {
+      background-color: var(side-nav-hover-color);
+    }
+
+    &:active {
+      background-color: var(side-nav-active-color);
+    }
+  }
+
+  &.base-no-default {
+    &:hover {
+      background-color: var(side-nav-hover-color);
+    }
+
+    &:active {
+      background-color: var(side-nav-active-color);
+    }
+  }
+
+  &.primary {
+    background-color: var(primary-color);
+    color: var(text-with-main-color);
+
+    &:hover {
+      background-color: var(primary-color-hover);
+    }
+
+    &:active {
+      background-color: var(primary-color-active);
+    }
+  }
+
+  &.secondary {
+    background-color: var(accent-color);
+    color: var(text-with-accent-color);
+
+    &:hover {
+      background-color: var(accent-color-hover);
+    }
+
+    &:active {
+      background-color: var(accent-color-active);
+    }
+  }
+
+  &.favorite {
+    color: var(favorite-icon-color);
+  }
+}
+
+.iconDropdown {
+  background-color: var(side-nav-color);
+  box-shadow: 0 1px 2px rgb(0 0 0 / 50%);
+  color: var(secondary-text-color);
+  display: inline;
+  font-size: 12px;
+  list-style-type: none;
+  margin-top: 45px;
+  position: absolute;
+  text-align: center;
+  user-select: none;
+  z-index: 3;
+
+  &.left {
+    right: calc(50% - 10px);
+  }
+
+  &.right {
+    left: calc(50% - 10px);
+  }
+
+  .list {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+  }
+
+  .listItem {
+    cursor: pointer;
+    margin: 0;
+    padding: 8px 10px;
+    transition: background 0.2s ease-out;
+    white-space: nowrap;
+
+    &:hover,
+    &:focus {
+      background-color: var(side-nav-hover-color);
+      transition: background 0.2s ease-in;
+    }
+
+    &:active {
+      background-color: var(side-nav-active-color);
+      transition: background 0.1s ease-in;
+    }
+  }
+
+  .listItemDivider {
+    border-top: 1px solid var(tertiary-text-color);
+    margin: 1px auto;
+    // Too "visible" with current color
+    opacity: 0.5;
+    width: 95%;
+  }
+}
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.vue b/src/renderer/components/ft-icon-button/ft-icon-button.vue
index 27f8c26e20d6..62dc7b985697 100644
--- a/src/renderer/components/ft-icon-button/ft-icon-button.vue
+++ b/src/renderer/components/ft-icon-button/ft-icon-button.vue
@@ -61,4 +61,4 @@
 </template>
 
 <script src="./ft-icon-button.js" />
-<style scoped lang="sass" src="./ft-icon-button.sass" />
+<style scoped lang="scss" src="./ft-icon-button.scss" />
diff --git a/src/renderer/components/ft-list-channel/ft-list-channel.sass b/src/renderer/components/ft-list-channel/ft-list-channel.sass
deleted file mode 100644
index cdebfe2e899a..000000000000
--- a/src/renderer/components/ft-list-channel/ft-list-channel.sass
+++ /dev/null
@@ -1 +0,0 @@
-@use "../../sass-partials/_ft-list-item"
diff --git a/src/renderer/components/ft-list-channel/ft-list-channel.scss b/src/renderer/components/ft-list-channel/ft-list-channel.scss
new file mode 100644
index 000000000000..af386ff4b911
--- /dev/null
+++ b/src/renderer/components/ft-list-channel/ft-list-channel.scss
@@ -0,0 +1 @@
+@use '../../scss-partials/_ft-list-item';
diff --git a/src/renderer/components/ft-list-channel/ft-list-channel.vue b/src/renderer/components/ft-list-channel/ft-list-channel.vue
index c9c5d08041a7..3d29d12e3c5c 100644
--- a/src/renderer/components/ft-list-channel/ft-list-channel.vue
+++ b/src/renderer/components/ft-list-channel/ft-list-channel.vue
@@ -48,4 +48,4 @@
 </template>
 
 <script src="./ft-list-channel.js" />
-<style scoped lang="sass" src="./ft-list-channel.sass" />
+<style scoped lang="scss" src="./ft-list-channel.scss" />
diff --git a/src/renderer/components/ft-list-playlist/ft-list-playlist.sass b/src/renderer/components/ft-list-playlist/ft-list-playlist.sass
deleted file mode 100644
index cdebfe2e899a..000000000000
--- a/src/renderer/components/ft-list-playlist/ft-list-playlist.sass
+++ /dev/null
@@ -1 +0,0 @@
-@use "../../sass-partials/_ft-list-item"
diff --git a/src/renderer/components/ft-list-playlist/ft-list-playlist.scss b/src/renderer/components/ft-list-playlist/ft-list-playlist.scss
new file mode 100644
index 000000000000..af386ff4b911
--- /dev/null
+++ b/src/renderer/components/ft-list-playlist/ft-list-playlist.scss
@@ -0,0 +1 @@
+@use '../../scss-partials/_ft-list-item';
diff --git a/src/renderer/components/ft-list-playlist/ft-list-playlist.vue b/src/renderer/components/ft-list-playlist/ft-list-playlist.vue
index e7f38432b67a..2294832832d9 100644
--- a/src/renderer/components/ft-list-playlist/ft-list-playlist.vue
+++ b/src/renderer/components/ft-list-playlist/ft-list-playlist.vue
@@ -52,4 +52,4 @@
 </template>
 
 <script src="./ft-list-playlist.js" />
-<style scoped lang="sass" src="./ft-list-playlist.sass" />
+<style scoped lang="scss" src="./ft-list-playlist.scss" />
diff --git a/src/renderer/components/ft-list-video/ft-list-video.sass b/src/renderer/components/ft-list-video/ft-list-video.sass
deleted file mode 100644
index 9fb776c4b54e..000000000000
--- a/src/renderer/components/ft-list-video/ft-list-video.sass
+++ /dev/null
@@ -1,4 +0,0 @@
-@use "../../sass-partials/_ft-list-item"
-
-.thumbnailLink:hover
-  outline: 3px solid var(--side-nav-hover-color)
diff --git a/src/renderer/components/ft-list-video/ft-list-video.scss b/src/renderer/components/ft-list-video/ft-list-video.scss
new file mode 100644
index 000000000000..8f6f167852af
--- /dev/null
+++ b/src/renderer/components/ft-list-video/ft-list-video.scss
@@ -0,0 +1,5 @@
+@use '../../scss-partials/_ft-list-item';
+
+.thumbnailLink:hover {
+  outline: 3px solid var(side-nav-hover-color);
+}
diff --git a/src/renderer/components/ft-list-video/ft-list-video.vue b/src/renderer/components/ft-list-video/ft-list-video.vue
index 87fb220e1ae3..78c8110d48af 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.vue
+++ b/src/renderer/components/ft-list-video/ft-list-video.vue
@@ -120,4 +120,4 @@
 </template>
 
 <script src="./ft-list-video.js" />
-<style scoped src="./ft-list-video.sass" lang="sass" />
+<style scoped src="./ft-list-video.scss" lang="scss" />
diff --git a/src/renderer/components/ft-settings-section/ft-settings-section.sass b/src/renderer/components/ft-settings-section/ft-settings-section.sass
deleted file mode 100644
index 78e4963c6160..000000000000
--- a/src/renderer/components/ft-settings-section/ft-settings-section.sass
+++ /dev/null
@@ -1,82 +0,0 @@
-.settingsSection
-  background-color: var(--card-bg-color)
-  width: 85%
-  margin: 0 auto
-  @media only screen and (max-width: 800px)
-    width: 100%
-
-  &[open]
-    padding-bottom: 15px
-
-  > div
-    width: 100%
-    padding: 0px 20px
-    box-sizing: border-box
-  > div:not(:last-child):not(.ft-flex-box)
-    @media only screen and (max-width: 800px)
-      margin-bottom: 20px
-
-.sectionLine
-  width: 100%
-  height: 2px
-  border: 0
-  margin-top: -1px
-  background-color: var(--primary-color)
-
-.sectionHeader
-  display: block
-  cursor: pointer
-  padding: 1px
-
-.sectionTitle
-  margin-left: 2%
-
-:deep(.switchGrid)
-  display: grid
-  grid-template-columns: auto auto
-  justify-content: space-evenly
-  align-items: center
-
-  @media only screen and (max-width: 680px)
-    grid-template-columns: auto
-
-:deep(.switchColumnGrid)
-  @extend :deep(.switchGrid)
-  align-items: start
-
-:deep(.switchColumn)
-  display: flex
-  flex-direction: column
-  justify-items: start
-
-:deep(.center)
-  text-align: center
-
-@media only screen and (max-width: 460px)
-  :deep(.settingsFlexStart460px)
-    justify-content: flex-start
-
-@media only screen and (max-width: 500px)
-  :deep(.settingsFlexStart500px)
-    justify-content: flex-start
-
-@media only screen and (max-width: 680px)
-  .settingsSection
-    > div
-      :deep(.text.bottom)
-        left: -85px
-    :deep(.switch-ctn.containsTooltip)
-      left: -10px
-      margin-right: 5px
-      padding: 0px 10px 0px 10px
-    :not(.select, .selectLabel)
-      > :deep(.tooltip)
-        display: inline-block
-        position: absolute
-        right: -25px
-        top: 12px
-    .settingsFlexStart460px :deep(.tooltip)
-      right: 0px
-      top: -2px
-    :deep(.switch-ctn)
-      margin: 10px 7px
diff --git a/src/renderer/components/ft-settings-section/ft-settings-section.scss b/src/renderer/components/ft-settings-section/ft-settings-section.scss
new file mode 100644
index 000000000000..60e91e1e3508
--- /dev/null
+++ b/src/renderer/components/ft-settings-section/ft-settings-section.scss
@@ -0,0 +1,116 @@
+.settingsSection {
+  background-color: var(card-bg-color);
+  margin: 0 auto;
+  width: 85%;
+
+  @media only screen and (max-width: 800px) {
+    width: 100%;
+  }
+
+  &[open] {
+    padding-bottom: 15px;
+  }
+
+  > div {
+    box-sizing: border-box;
+    padding: 0 20px;
+    width: 100%;
+  }
+
+  > div:not(:last-child, .ft-flex-box) {
+    @media only screen and (max-width: 800px) {
+      margin-bottom: 20px;
+    }
+  }
+}
+
+.sectionLine {
+  background-color: var(primary-color);
+  border: 0;
+  height: 2px;
+  margin-top: -1px;
+  width: 100%;
+}
+
+.sectionHeader {
+  cursor: pointer;
+  display: block;
+  padding: 1px;
+}
+
+.sectionTitle {
+  margin-left: 2%;
+}
+
+:deep(.switchGrid) {
+  align-items: center;
+  display: grid;
+  grid-template-columns: auto auto;
+  justify-content: space-evenly;
+
+  @media only screen and (max-width: 680px) {
+    grid-template-columns: auto;
+  }
+}
+
+:deep(.switchColumnGrid) {
+  @extend :deep(.switchGrid);
+
+  align-items: start;
+}
+
+:deep(.switchColumn) {
+  display: flex;
+  flex-direction: column;
+  justify-items: start;
+}
+
+:deep(.center) {
+  text-align: center;
+}
+
+@media only screen and (max-width: 460px) {
+  :deep(.settingsFlexStart460px) {
+    justify-content: flex-start;
+  }
+}
+
+@media only screen and (max-width: 500px) {
+  :deep(.settingsFlexStart500px) {
+    justify-content: flex-start;
+  }
+}
+
+@media only screen and (max-width: 680px) {
+  .settingsSection {
+    > div {
+      :deep(.text.bottom) {
+        left: -85px;
+      }
+    }
+
+    :deep(.switch-ctn.containsTooltip) {
+      left: -10px;
+      margin-right: 5px;
+      padding: 0 10px;
+    }
+
+    :not(.select, .selectLabel) {
+      > :deep(.tooltip) {
+        display: inline-block;
+        position: absolute;
+        right: -25px;
+        top: 12px;
+      }
+    }
+
+    .settingsFlexStart460px :deep(.tooltip) {
+      right: 0;
+      top: -2px;
+    }
+
+    :deep(.switch-ctn) {
+      margin: 10px 7px;
+    }
+  }
+}
diff --git a/src/renderer/components/ft-settings-section/ft-settings-section.vue b/src/renderer/components/ft-settings-section/ft-settings-section.vue
index 428ae0414494..fda6e472992e 100644
--- a/src/renderer/components/ft-settings-section/ft-settings-section.vue
+++ b/src/renderer/components/ft-settings-section/ft-settings-section.vue
@@ -11,4 +11,4 @@
 </template>
 
 <script src="./ft-settings-section.js" />
-<style scoped src="./ft-settings-section.sass" lang="sass" />
+<style scoped src="./ft-settings-section.scss" lang="scss" />
diff --git a/src/renderer/components/ft-share-button/ft-share-button.sass b/src/renderer/components/ft-share-button/ft-share-button.sass
deleted file mode 100644
index 1177db436c71..000000000000
--- a/src/renderer/components/ft-share-button/ft-share-button.sass
+++ /dev/null
@@ -1,64 +0,0 @@
-.shareLinks
-	display: grid
-	grid-template-rows: auto auto
-	grid-auto-flow: column
-	padding: 12px
-	width: max-content
-
-	.header
-		font-size: 18px
-		font-weight: bold
-		margin: 4px 0px 8px
-		color: var(--primary-text-color)
-
-	.buttons
-		display: flex
-		flex-direction: column
-
-		.action
-			padding: 6px
-
-	.divider
-		grid-row: span 3
-		margin: 0px 12px
-		width: 1px
-		background: var(--tertiary-text-color)
-
-	.youtubeLogo
-		height: 18px
-		width: auto
-
-		@at-root
-			.dark &, .system[data-system-theme*='dark'] &
-				filter: brightness(0.868)
-
-			.black &
-				filter: brightness(0.933)
-
-			/* no changes for the dracula theme */
-
-			.light &, .system[data-system-theme*='light'] &
-				filter: invert(0.87)
-
-	.invidious
-		display: flex
-		justify-content: center
-		letter-spacing: -0.4px
-
-		.invidiousLogo
-			display: inline-block
-			width: 20px
-			height: 20px
-			background-size: cover
-			margin-right: 2px
-
-			@at-root
-				.dark &,
-				.black &,
-				.dracula &,
-				.CatppuccinMocha &,
-				.system[data-system-theme*='dark'] &
-					background-image: url(../../assets/img/invidious-logo-dark.svg)
-
-				.light &, .system[data-system-theme*='light'] &
-					background-image: url(../../assets/img/invidious-logo-light.svg)
diff --git a/src/renderer/components/ft-share-button/ft-share-button.scss b/src/renderer/components/ft-share-button/ft-share-button.scss
new file mode 100644
index 000000000000..dde24b4e7fdd
--- /dev/null
+++ b/src/renderer/components/ft-share-button/ft-share-button.scss
@@ -0,0 +1,82 @@
+.shareLinks {
+  display: grid;
+  grid-auto-flow: column;
+  grid-template-rows: auto auto;
+  padding: 12px;
+  width: max-content;
+
+  .header {
+    color: var(primary-text-color);
+    font-size: 18px;
+    font-weight: bold;
+    margin: 4px 0 8px;
+  }
+
+  .buttons {
+    display: flex;
+    flex-direction: column;
+
+    .action {
+      padding: 6px;
+    }
+  }
+
+  .divider {
+    background: var(tertiary-text-color);
+    grid-row: span 3;
+    margin: 0 12px;
+    width: 1px;
+  }
+
+  .youtubeLogo {
+    height: 18px;
+    width: auto;
+
+    @at-root {
+      .dark &,
+      .system[data-system-theme*='dark'] & {
+        filter: brightness(0.868);
+      }
+
+      .black & {
+        filter: brightness(0.933);
+      }
+
+      /* no changes for the dracula theme */
+
+      .light &,
+      .system[data-system-theme*='light'] & {
+        filter: invert(0.87);
+      }
+    }
+  }
+
+  .invidious {
+    display: flex;
+    justify-content: center;
+    letter-spacing: -0.4px;
+
+    .invidiousLogo {
+      background-size: cover;
+      display: inline-block;
+      height: 20px;
+      margin-right: 2px;
+      width: 20px;
+
+      @at-root {
+        .dark &,
+        .black &,
+        .dracula &,
+        .CatppuccinMocha &,
+        .system[data-system-theme*='dark'] & {
+          background-image: url(../../assets/img/invidious-logo-dark.svg);
+        }
+
+        .light &,
+        .system[data-system-theme*='light'] & {
+          background-image: url(../../assets/img/invidious-logo-light.svg);
+        }
+      }
+    }
+  }
+}
diff --git a/src/renderer/components/ft-share-button/ft-share-button.vue b/src/renderer/components/ft-share-button/ft-share-button.vue
index 13d39bcd89c9..bd46ed13baa8 100644
--- a/src/renderer/components/ft-share-button/ft-share-button.vue
+++ b/src/renderer/components/ft-share-button/ft-share-button.vue
@@ -119,4 +119,4 @@
 </template>
 
 <script src="./ft-share-button.js" />
-<style scoped lang="sass" src="./ft-share-button.sass" />
+<style scoped lang="scss" src="./ft-share-button.scss" />
diff --git a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
index 9ce8ff6f51db..59d51cefa4f9 100644
--- a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
+++ b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
@@ -34,7 +34,7 @@ export default Vue.extend({
     colorNames: function () {
       return this.colorValues.map(colorVal => {
         // add spaces before capital letters
-        const colorName = colorVal.replace(/([A-Z])/g, ' $1').trim()
+        const colorName = colorVal.replaceAll(/([A-Z])/g, ' $1').trim()
         return this.$t(`Settings.Theme Settings.Main Color Theme.${colorName}`)
       })
     },
diff --git a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.sass b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.sass
deleted file mode 100644
index 5eab71ed9cdd..000000000000
--- a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.sass
+++ /dev/null
@@ -1,7 +0,0 @@
-.sponsorBlockCategory
-    margin-top: 30px
-    padding: 0 10px
-    @media only screen and (max-width: 680px)
-        width: 100%
-    .sponsorTitle
-        font-size: x-large
diff --git a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.scss b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.scss
new file mode 100644
index 000000000000..9fff4e5cc826
--- /dev/null
+++ b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.scss
@@ -0,0 +1,12 @@
+.sponsorBlockCategory {
+  margin-top: 30px;
+  padding: 0 10px;
+
+  @media only screen and (max-width: 680px) {
+    width: 100%;
+  }
+
+  .sponsorTitle {
+    font-size: x-large;
+  }
+}
diff --git a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue
index 80d63d1ea7f9..a0cd6d758a52 100644
--- a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue
+++ b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue
@@ -20,4 +20,4 @@
   </div>
 </template>
 <script src="./ft-sponsor-block-category.js" />
-<style scoped lang="sass" src="./ft-sponsor-block-category.sass" />
+<style scoped lang="scss" src="./ft-sponsor-block-category.scss" />
diff --git a/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js b/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js
index df41cce35cfb..b093092d43ef 100644
--- a/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js
+++ b/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js
@@ -20,7 +20,7 @@ export default Vue.extend({
       }
     },
     detectTimestamps: function (input) {
-      return input.replace(/(\d+(:\d+)+)/g, '<a href="#" onclick="this.dispatchEvent(new CustomEvent(\'timestamp-clicked\',{bubbles:true, detail:\'$1\'}))">$1</a>')
+      return input.replaceAll(/(\d+(:\d+)+)/g, '<a href="#" onclick="this.dispatchEvent(new CustomEvent(\'timestamp-clicked\',{bubbles:true, detail:\'$1\'}))">$1</a>')
     }
   }
 })
diff --git a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.sass b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.sass
deleted file mode 100644
index d33e7f66258a..000000000000
--- a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.sass
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Thanks to Guus Lieben for the Material Design Switch */
-
-.switch-ctn
-  margin: 20px 16px
-  position: relative
-
-  &.compact
-    margin: 0
-
-.disabled
-  .switch-label
-    cursor: not-allowed
-
-  .switch-label-text
-    opacity: 0.4
-
-.switch-input
-  -moz-appearance: none
-  -webkit-appearance: none
-  appearance: none
-  height: 20px
-  left: -3px
-  position: absolute
-  top: calc(50% - 3px)
-  -ms-transform: translate(0, (-50%))
-  -webkit-transform: translate(0, -50%)
-  transform: translate(0, -50%)
-  width: 34px
-
-.switch-label
-  position: relative
-  display: inline-block
-  cursor: pointer
-  font-weight: 500
-  text-align: left
-  padding: 12px 0 12px 44px
-
-  &:before, &:after
-    content: ""
-    position: absolute
-    margin: 0
-    outline: 0
-    top: 50%
-    -ms-transform: translate(0, -50%)
-    -webkit-transform: translate(0, -50%)
-    transform: translate(0, -50%)
-    -webkit-transition: all 0.3s ease
-    transition: all 0.3s ease
-
-  &:before
-    left: 1px
-    width: 34px
-    height: 14px
-    background-color: #9E9E9E
-    border-radius: 8px
-
-    .switch-input:checked + &
-      background-color: var(--accent-color-light)
-
-    .switch-input:disabled + &
-      background-color: #9E9E9E
-
-  &:after
-    left: 0
-    width: 20px
-    height: 20px
-    background-color: #FAFAFA
-    border-radius: 50%
-    box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.14), 0 2px 2px 0 rgba(0, 0, 0, 0.098), 0 1px 5px 0 rgba(0, 0, 0, 0.084)
-
-    .switch-input:checked + &
-      background-color: var(--accent-color)
-      -ms-transform: translate(80%, -50%)
-      -webkit-transform: translate(80%, -50%)
-      transform: translate(80%, -50%)
-
-    .switch-input:disabled + &
-      background-color: #BDBDBD
-  
-  @media (max-width: 680px)
-    max-width: 250px 
diff --git a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.scss b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.scss
new file mode 100644
index 000000000000..cf9aace811f2
--- /dev/null
+++ b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.scss
@@ -0,0 +1,88 @@
+/* Thanks to Guus Lieben for the Material Design Switch */
+
+.switch-ctn {
+  margin: 20px 16px;
+  position: relative;
+
+  &.compact {
+    margin: 0;
+  }
+}
+
+.switch-input {
+  appearance: none;
+  height: 20px;
+  left: -3px;
+  position: absolute;
+  top: calc(50% - 3px);
+  transform: translate(0, -50%);
+  width: 34px;
+}
+
+.switch-label {
+  cursor: pointer;
+  display: inline-block;
+  font-weight: 500;
+  padding: 12px 0 12px 44px;
+  position: relative;
+  text-align: left;
+
+  &::before,
+  &::after {
+    content: '';
+    margin: 0;
+    outline: 0;
+    position: absolute;
+    top: 50%;
+    transform: translate(0, -50%);
+    transition: all 0.3s ease;
+  }
+
+  &::before {
+    background-color: #9e9e9e;
+    border-radius: 8px;
+    height: 14px;
+    left: 1px;
+    width: 34px;
+
+    .switch-input:checked + & {
+      background-color: var(accent-color-light);
+    }
+
+    .switch-input:disabled + & {
+      background-color: #9e9e9e;
+    }
+  }
+
+  &::after {
+    background-color: #fafafa;
+    border-radius: 50%;
+    box-shadow: 0 3px 1px -2px rgb(0 0 0 / 14%), 0 2px 2px 0 rgb(0 0 0 / 9.8%), 0 1px 5px 0 rgb(0 0 0 / 8.4%);
+    height: 20px;
+    left: 0;
+    width: 20px;
+
+    .switch-input:checked + & {
+      background-color: var(accent-color);
+      transform: translate(80%, -50%);
+    }
+
+    .switch-input:disabled + & {
+      background-color: #bdbdbd;
+    }
+  }
+
+  @media (max-width: 680px) {
+    max-width: 250px;
+  }
+}
+
+.disabled {
+  .switch-label {
+    cursor: not-allowed;
+  }
+
+  .switch-label-text {
+    opacity: 0.4;
+  }
+}
diff --git a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.vue b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.vue
index 8b13add4055e..c57aa4ab054f 100644
--- a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.vue
+++ b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.vue
@@ -35,4 +35,4 @@
 </template>
 
 <script src="./ft-toggle-switch.js" />
-<style scoped lang="sass" src="./ft-toggle-switch.sass" />
+<style scoped lang="scss" src="./ft-toggle-switch.scss" />
diff --git a/src/renderer/components/general-settings/general-settings.sass b/src/renderer/components/general-settings/general-settings.sass
deleted file mode 100644
index 1a6a14af774b..000000000000
--- a/src/renderer/components/general-settings/general-settings.sass
+++ /dev/null
@@ -1,8 +0,0 @@
-.select
-  min-width: 240px
-  width: auto
-
-// https://vue-loader.vuejs.org/guide/scoped-css.html#deep-selectors
-.select:deep(.select-text)
-  min-width: 240px
-  width: auto
diff --git a/src/renderer/components/general-settings/general-settings.scss b/src/renderer/components/general-settings/general-settings.scss
new file mode 100644
index 000000000000..5e979b7c67f9
--- /dev/null
+++ b/src/renderer/components/general-settings/general-settings.scss
@@ -0,0 +1,9 @@
+.select {
+  min-width: 240px;
+  width: auto;
+}
+// https://vue-loader.vuejs.org/guide/scoped-css.html#deep-selectors
+.select:deep(.select-text) {
+  min-width: 240px;
+  width: auto;
+}
diff --git a/src/renderer/components/general-settings/general-settings.vue b/src/renderer/components/general-settings/general-settings.vue
index 82f25f6b554c..156428274728 100644
--- a/src/renderer/components/general-settings/general-settings.vue
+++ b/src/renderer/components/general-settings/general-settings.vue
@@ -141,4 +141,4 @@
 </template>
 
 <script src="./general-settings.js" />
-<style scoped lang="sass" src="./general-settings.sass" />
+<style scoped lang="scss" src="./general-settings.scss" />
diff --git a/src/renderer/components/player-settings/player-settings.sass b/src/renderer/components/player-settings/player-settings.sass
deleted file mode 100644
index 7d6b9af53417..000000000000
--- a/src/renderer/components/player-settings/player-settings.sass
+++ /dev/null
@@ -1,12 +0,0 @@
-.screenshotFolderContainer
-  width: 95%
-  margin: 0 auto
-  align-items: center
-  column-gap: 1rem
-
-  .screenshotFolderLabel, .screenshotFolderButton, .screenshotFilenamePatternTitle
-    flex-grow: 0
-
-  .screenshotFolderPath, .screenshotFilenamePatternInput, .screenshotFilenamePatternExample
-    flex-grow: 1
-    margin-top: 10px
diff --git a/src/renderer/components/player-settings/player-settings.scss b/src/renderer/components/player-settings/player-settings.scss
new file mode 100644
index 000000000000..52fa08e2fe9b
--- /dev/null
+++ b/src/renderer/components/player-settings/player-settings.scss
@@ -0,0 +1,19 @@
+.screenshotFolderContainer {
+  align-items: center;
+  column-gap: 1rem;
+  margin: 0 auto;
+  width: 95%;
+
+  .screenshotFolderLabel,
+  .screenshotFolderButton,
+  .screenshotFilenamePatternTitle {
+    flex-grow: 0;
+  }
+
+  .screenshotFolderPath,
+  .screenshotFilenamePatternInput,
+  .screenshotFilenamePatternExample {
+    flex-grow: 1;
+    margin-top: 10px;
+  }
+}
diff --git a/src/renderer/components/player-settings/player-settings.vue b/src/renderer/components/player-settings/player-settings.vue
index 43fd0cbb3489..1797f461076b 100644
--- a/src/renderer/components/player-settings/player-settings.vue
+++ b/src/renderer/components/player-settings/player-settings.vue
@@ -246,4 +246,4 @@
 </template>
 
 <script src="./player-settings.js" />
-<style scoped lang="sass" src="./player-settings.sass" />
+<style scoped lang="scss" src="./player-settings.scss" />
diff --git a/src/renderer/components/playlist-info/playlist-info.sass b/src/renderer/components/playlist-info/playlist-info.sass
deleted file mode 100644
index bb382ccc9035..000000000000
--- a/src/renderer/components/playlist-info/playlist-info.sass
+++ /dev/null
@@ -1,45 +0,0 @@
-.playListThumbnail
-  width: 100%
-
-.playlistThumbnail img
-  width: 100%
-  cursor: pointer
-
-  @media only screen and (max-width: 800px)
-    display: none
-
-.playlistStats
-  font-size: 15px
-
-.playlistStats p
-  color: var(--secondary-text-color)
-  margin: 0
-
-.playlistTitle
-  margin-bottom: 0.1em
-
-.playlistDescription
-  max-height: 20vh
-  overflow-y: auto
-  white-space: break-spaces
-
-  @media only screen and (max-width: 500px)
-    max-height: 10vh
-
-.playlistChannel
-  display: flex
-  align-items: center
-  gap: 8px
-  height: 40px
-  text-decoration: none
-  color: inherit
-
-.channelThumbnail
-  width: 40px
-  float: left
-  border-radius: 200px 200px 200px 200px
-  -webkit-border-radius: 200px 200px 200px 200px
-
-.channelName
-  margin: 0
-  font-size: 15px
diff --git a/src/renderer/components/playlist-info/playlist-info.scss b/src/renderer/components/playlist-info/playlist-info.scss
new file mode 100644
index 000000000000..2adcb9511c7e
--- /dev/null
+++ b/src/renderer/components/playlist-info/playlist-info.scss
@@ -0,0 +1,55 @@
+.playListThumbnail {
+  width: 100%;
+}
+
+.playlistThumbnail img {
+  cursor: pointer;
+  width: 100%;
+
+  @media only screen and (max-width: 800px) {
+    display: none;
+  }
+}
+
+.playlistStats {
+  font-size: 15px;
+}
+
+.playlistStats p {
+  color: var(secondary-text-color);
+  margin: 0;
+}
+
+.playlistTitle {
+  margin-bottom: 0.1em;
+}
+
+.playlistDescription {
+  max-height: 20vh;
+  overflow-y: auto;
+  white-space: break-spaces;
+
+  @media only screen and (max-width: 500px) {
+    max-height: 10vh;
+  }
+}
+
+.playlistChannel {
+  align-items: center;
+  color: inherit;
+  display: flex;
+  gap: 8px;
+  height: 40px;
+  text-decoration: none;
+}
+
+.channelThumbnail {
+  border-radius: 200px;
+  float: left;
+  width: 40px;
+}
+
+.channelName {
+  font-size: 15px;
+  margin: 0;
+}
diff --git a/src/renderer/components/playlist-info/playlist-info.vue b/src/renderer/components/playlist-info/playlist-info.vue
index dfb3e9846965..242d44070d9b 100644
--- a/src/renderer/components/playlist-info/playlist-info.vue
+++ b/src/renderer/components/playlist-info/playlist-info.vue
@@ -66,4 +66,4 @@
 </template>
 
 <script src="./playlist-info.js" />
-<style scoped lang="sass" src="./playlist-info.sass" />
+<style scoped lang="scss" src="./playlist-info.scss" />
diff --git a/src/renderer/components/theme-settings/theme-settings.js b/src/renderer/components/theme-settings/theme-settings.js
index ea01b57b4e42..b8bc2e16169e 100644
--- a/src/renderer/components/theme-settings/theme-settings.js
+++ b/src/renderer/components/theme-settings/theme-settings.js
@@ -109,7 +109,7 @@ export default Vue.extend({
     colorNames: function () {
       return this.colorValues.map(colorVal => {
         // add spaces before capital letters
-        const colorName = colorVal.replace(/([A-Z])/g, ' $1').trim()
+        const colorName = colorVal.replaceAll(/([A-Z])/g, ' $1').trim()
         return this.$t(`Settings.Theme Settings.Main Color Theme.${colorName}`)
       })
     },
diff --git a/src/renderer/components/top-nav/top-nav.sass b/src/renderer/components/top-nav/top-nav.sass
deleted file mode 100644
index 3d50ae679371..000000000000
--- a/src/renderer/components/top-nav/top-nav.sass
+++ /dev/null
@@ -1,166 +0,0 @@
-@mixin top-nav-is-colored
-  @at-root
-    .topNavBarColor &, .topNavBarColor#{&}
-      @content
-
-.topNav
-  position: sticky
-  z-index: 4
-  left: 0
-  right: 0
-  top: 0
-  height: 60px
-  width: 100%
-  line-height: 60px
-  background-color: var(--card-bg-color)
-  -webkit-box-shadow: 0px 2px 1px 0px var(--primary-shadow-color)
-  display: flex
-  align-items: center
-  align-content: center
-
-  @media only screen and (min-width: 961px)
-    display: grid
-    grid-template-columns: 1fr 440px 1fr
-
-  @include top-nav-is-colored
-    background-color: var(--primary-color)
-
-  @media only screen and (max-width: 680px)
-    position: fixed
-
-.menuIcon // the hamburger button
-  @media only screen and (max-width: 680px)
-    display: none
-
-.navIcon // all icons in the top navigation
-  font-size: 20px
-  padding: 10px
-  cursor: pointer
-  color: var(--primary-text-color)
-  border-radius: 50%
-  transition: background 0.2s ease-out
-  width: 1em
-  height: 1em
-
-  &.fa-arrow-left, &.fa-arrow-right
-    color: gray
-    opacity: 0.5
-    pointer-events: none
-    user-select: none
-
-  @include top-nav-is-colored
-    color: var(--text-with-main-color)
-
-    &:hover
-      background-color: var(--primary-color-hover)
-
-  &:hover
-    background-color: var(--side-nav-hover-color)
-    transition: background 0.2s ease-in
-
-  &:active
-    background-color: var(--tertiary-text-color)
-    transition: background 0.2s ease-in
-
-    @include top-nav-is-colored
-      background-color: var(--primary-color-active)
-
-.navFilterIcon // Filter icon
-  $effect-distance: 10px
-
-  margin-left: $effect-distance
-
-  &.filterChanged // When filter value changed from default
-    box-shadow: 0 0 $effect-distance var(--primary-color)
-
-    @include top-nav-is-colored
-      box-shadow: 0 0 $effect-distance var(--text-with-main-color)
-
-.side // parts of the top nav either side of the search bar
-  display: flex
-  gap: 3px
-  margin: 0 6px
-  align-items: center
-
-  &.profiles
-    justify-content: flex-end
-
-  .navSearchIcon
-    @media only screen and (min-width: 681px)
-      display: none
-
-  .navNewWindowIcon
-    @media only screen and (max-width: 680px)
-      display: none
-
-  .logo // parts that make up the logo
-    display: flex
-    align-items: center
-    padding: 0px 25px 0px 10px
-    cursor: pointer
-
-    &:active
-      background-color: var(--tertiary-text-color)
-      transition: background 0.2s ease-in
-      @include top-nav-is-colored
-        background-color: var(--primary-color-active)
-    .logoIcon
-      background-image: var(--logo-icon)
-      background-repeat: no-repeat
-      background-position: right top
-      background-size: 25px
-      width: 25px
-      height: 25px
-
-      @include top-nav-is-colored
-        background-image: var(--logo-icon-bar-color)
-
-    .logoText
-      margin-left: 5px
-      position: relative
-      top: -3px
-      background-image: var(--logo-text)
-      background-repeat: no-repeat
-      background-position: right top
-      background-size: 100px
-      width: 100px
-      height: 40px
-
-      @media only screen and (max-width: 680px)
-        display: none
-
-      @include top-nav-is-colored
-        background-image: var(--logo-text-bar-color)
-
-.middle // the middle part of the top nav which contains the search bar
-  max-width: 440px
-  flex: 1
-
-  .searchContainer
-    display: flex
-    align-items: center
-
-    @media only screen and (max-width: 680px)
-      position: fixed
-      left: 0
-      right: 0
-      top: 60px
-      background-color: var(--side-nav-color)
-
-      @include top-nav-is-colored
-        background-color: var(--primary-color-hover)
-
-    .searchInput
-      flex: 1
-
-  .searchFilters
-    position: absolute
-    left: 0
-    right: 0
-    margin: 10px 20px 20px 220px
-    transition: margin 150ms ease-in-out
-
-    @media only screen and (max-width: 680px)
-      left: 0
-      right: 0
-      margin: 95px 10px 0px
diff --git a/src/renderer/components/top-nav/top-nav.scss b/src/renderer/components/top-nav/top-nav.scss
new file mode 100644
index 000000000000..d8ccdc28e870
--- /dev/null
+++ b/src/renderer/components/top-nav/top-nav.scss
@@ -0,0 +1,210 @@
+@mixin top-nav-is-colored {
+  @at-root {
+    .topNavBarColor &,
+    .topNavBarColor#{&} {
+      @content;
+    }
+  }
+}
+
+.topNav {
+  align-content: center;
+  align-items: center;
+  background-color: var(card-bg-color);
+  box-shadow: 0 2px 1px 0 var(primary-shadow-color);
+  display: flex;
+  height: 60px;
+  left: 0;
+  line-height: 60px;
+  position: sticky;
+  right: 0;
+  top: 0;
+  width: 100%;
+  z-index: 4;
+
+  @media only screen and (min-width: 961px) {
+    display: grid;
+    grid-template-columns: 1fr 440px 1fr;
+  }
+
+  @include top-nav-is-colored {
+    background-color: var(primary-color);
+  }
+
+  @media only screen and (max-width: 680px) {
+    position: fixed;
+  }
+}
+
+.menuIcon {
+  @media only screen and (max-width: 680px) {
+    display: none;
+  }
+}
+
+.navIcon {
+  border-radius: 50%;
+  color: var(primary-text-color);
+  cursor: pointer;
+  font-size: 20px;
+  height: 1em;
+  padding: 10px;
+  transition: background 0.2s ease-out;
+  width: 1em;
+
+  @include top-nav-is-colored {
+    color: var(text-with-main-color);
+
+    &:hover {
+      background-color: var(primary-color-hover);
+    }
+  }
+
+  &.fa-arrow-left,
+  &.fa-arrow-right {
+    color: gray;
+    opacity: 0.5;
+    pointer-events: none;
+    user-select: none;
+  }
+
+  &:hover {
+    background-color: var(side-nav-hover-color);
+    transition: background 0.2s ease-in;
+  }
+
+  &:active {
+    background-color: var(tertiary-text-color);
+    transition: background 0.2s ease-in;
+
+    @include top-nav-is-colored {
+      background-color: var(primary-color-active);
+    }
+  }
+}
+
+.navFilterIcon {
+  $effect-distance: 10px;
+
+  margin-left: $effect-distance;
+
+  &.filterChanged {
+    box-shadow: 0 0 $effect-distance var(primary-color);
+
+    @include top-nav-is-colored {
+      box-shadow: 0 0 $effect-distance var(text-with-main-color);
+    }
+  }
+}
+
+.side {
+  align-items: center;
+  display: flex;
+  gap: 3px;
+  margin: 0 6px;
+
+  &.profiles {
+    justify-content: flex-end;
+  }
+
+  .navSearchIcon {
+    @media only screen and (min-width: 681px) {
+      display: none;
+    }
+  }
+
+  .navNewWindowIcon {
+    @media only screen and (max-width: 680px) {
+      display: none;
+    }
+  }
+
+  .logo {
+    align-items: center;
+    cursor: pointer;
+    display: flex;
+    padding: 0 25px 0 10px;
+
+    &:active {
+      background-color: var(tertiary-text-color);
+      transition: background 0.2s ease-in;
+
+      @include top-nav-is-colored {
+        background-color: var(primary-color-active);
+      }
+    }
+
+    .logoIcon {
+      background-image: var(logo-icon);
+      background-position: right top;
+      background-repeat: no-repeat;
+      background-size: 25px;
+      height: 25px;
+      width: 25px;
+
+      @include top-nav-is-colored {
+        background-image: var(logo-icon-bar-color);
+      }
+    }
+
+    .logoText {
+      background-image: var(logo-text);
+      background-position: right top;
+      background-repeat: no-repeat;
+      background-size: 100px;
+      height: 40px;
+      margin-left: 5px;
+      position: relative;
+      top: -3px;
+      width: 100px;
+
+      @media only screen and (max-width: 680px) {
+        display: none;
+      }
+
+      @include top-nav-is-colored {
+        background-image: var(logo-text-bar-color);
+      }
+    }
+  }
+}
+
+.middle {
+  flex: 1;
+  max-width: 440px;
+
+  .searchContainer {
+    align-items: center;
+    display: flex;
+
+    @media only screen and (max-width: 680px) {
+      background-color: var(side-nav-color);
+      left: 0;
+      position: fixed;
+      right: 0;
+      top: 60px;
+
+      @include top-nav-is-colored {
+        background-color: var(primary-color-hover);
+      }
+    }
+
+    .searchInput {
+      flex: 1;
+    }
+  }
+
+  .searchFilters {
+    left: 0;
+    margin: 10px 20px 20px 220px;
+    position: absolute;
+    right: 0;
+    transition: margin 150ms ease-in-out;
+
+    @media only screen and (max-width: 680px) {
+      left: 0;
+      margin: 95px 10px 0;
+      right: 0;
+    }
+  }
+}
diff --git a/src/renderer/components/top-nav/top-nav.vue b/src/renderer/components/top-nav/top-nav.vue
index 8aaa2161a6ac..a29820537da7 100644
--- a/src/renderer/components/top-nav/top-nav.vue
+++ b/src/renderer/components/top-nav/top-nav.vue
@@ -108,4 +108,4 @@
 </template>
 
 <script src="./top-nav.js" />
-<style scoped lang="sass" src="./top-nav.sass" />
+<style scoped lang="scss" src="./top-nav.scss" />
diff --git a/src/renderer/components/watch-video-description/watch-video-description.js b/src/renderer/components/watch-video-description/watch-video-description.js
index 3d79c1bc49ca..eb370e175413 100644
--- a/src/renderer/components/watch-video-description/watch-video-description.js
+++ b/src/renderer/components/watch-video-description/watch-video-description.js
@@ -53,25 +53,25 @@ export default Vue.extend({
       this.$emit('timestamp-event', timestamp)
     },
     parseDescriptionHtml: function (descriptionText) {
-      descriptionText = descriptionText.replace(/target="_blank"/g, '')
-      descriptionText = descriptionText.replace(/\/redirect.+?(?=q=)/g, '')
-      descriptionText = descriptionText.replace(/q=/g, '')
-      descriptionText = descriptionText.replace(/rel="nofollow\snoopener"/g, '')
-      descriptionText = descriptionText.replace(/class=.+?(?=")./g, '')
-      descriptionText = descriptionText.replace(/id=.+?(?=")./g, '')
-      descriptionText = descriptionText.replace(/data-target-new-window=.+?(?=")./g, '')
-      descriptionText = descriptionText.replace(/data-url=.+?(?=")./g, '')
-      descriptionText = descriptionText.replace(/data-sessionlink=.+?(?=")./g, '')
-      descriptionText = descriptionText.replace(/&amp;/g, '&')
-      descriptionText = descriptionText.replace(/%3A/g, ':')
-      descriptionText = descriptionText.replace(/%2F/g, '/')
-      descriptionText = descriptionText.replace(/&v.+?(?=")/g, '')
-      descriptionText = descriptionText.replace(/&redirect-token.+?(?=")/g, '')
-      descriptionText = descriptionText.replace(/&redir_token.+?(?=")/g, '')
-      descriptionText = descriptionText.replace(/href="\//g, 'href="https://www.youtube.com/')
+      descriptionText = descriptionText.replaceAll('target="_blank"', '')
+      descriptionText = descriptionText.replaceAll(/\/redirect.+?(?=q=)/g, '')
+      descriptionText = descriptionText.replaceAll('q=', '')
+      descriptionText = descriptionText.replaceAll(/rel="nofollow\snoopener"/g, '')
+      descriptionText = descriptionText.replaceAll(/class=.+?(?=")./g, '')
+      descriptionText = descriptionText.replaceAll(/id=.+?(?=")./g, '')
+      descriptionText = descriptionText.replaceAll(/data-target-new-window=.+?(?=")./g, '')
+      descriptionText = descriptionText.replaceAll(/data-url=.+?(?=")./g, '')
+      descriptionText = descriptionText.replaceAll(/data-sessionlink=.+?(?=")./g, '')
+      descriptionText = descriptionText.replaceAll('&amp;', '&')
+      descriptionText = descriptionText.replaceAll('%3A', ':')
+      descriptionText = descriptionText.replaceAll('%2F', '/')
+      descriptionText = descriptionText.replaceAll(/&v.+?(?=")/g, '')
+      descriptionText = descriptionText.replaceAll(/&redirect-token.+?(?=")/g, '')
+      descriptionText = descriptionText.replaceAll(/&redir_token.+?(?=")/g, '')
+      descriptionText = descriptionText.replaceAll('href="/', 'href="https://www.youtube.com/')
       // TODO: Implement hashtag support
-      descriptionText = descriptionText.replace(/href="\/hashtag\//g, 'href="freetube://')
-      descriptionText = descriptionText.replace(/yt\.www\.watch\.player\.seekTo/g, 'changeDuration')
+      descriptionText = descriptionText.replaceAll('href="/hashtag/', 'href="freetube://')
+      descriptionText = descriptionText.replaceAll('yt.www.watch.player.seekTo', 'changeDuration')
 
       return descriptionText
     }
diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js
index 9026038130f9..58e68db6eaef 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.js
+++ b/src/renderer/components/watch-video-info/watch-video-info.js
@@ -264,7 +264,7 @@ export default Vue.extend({
       const locale = this.currentLocale.replace('_', '-')
       const localeDateString = new Intl.DateTimeFormat([locale, 'en'], { dateStyle: 'medium' }).format(date)
       // replace spaces with no break spaces to make the date act as a single entity while wrapping
-      return `${localeDateString}`.replace(/ /g, '\u00A0')
+      return `${localeDateString}`.replaceAll(' ', '\u00A0')
     },
 
     publishedString() {
diff --git a/src/renderer/components/watch-video-info/watch-video-info.sass b/src/renderer/components/watch-video-info/watch-video-info.sass
deleted file mode 100644
index 9e8c109698a5..000000000000
--- a/src/renderer/components/watch-video-info/watch-video-info.sass
+++ /dev/null
@@ -1,97 +0,0 @@
-.watchVideoInfo
-  display: grid
-  grid-template-columns: auto minmax(min-content, 1fr)
-  column-gap: 15px
-  padding: 16px
-
-  @media screen and (max-width: 680px)
-    grid-template-columns: auto
-
-.videoTitle
-  font-size: 22px
-  margin: 0 0 24px
-  word-break: break-word
-  display: block
-  margin-block-end: 1em
-  margin-inline-start: 0px
-  margin-inline-end: 0px
-  font-weight: normal
-
-.channelInformation
-  .profileRow
-    display: flex
-
-  .channelThumbnail
-    border-radius: 50%
-    margin-right: 10px
-    cursor: pointer
-    width: 56px
-
-  .channelName
-    margin-left: 6px
-    cursor: pointer
-    position: relative
-    top: -2px
-    display: block
-    color: inherit
-    text-decoration: inherit
-
-  .subscribeButton
-    margin-top: 6px
-    margin-left: 6px
-    padding: 6px
-    font-size: 14px
-
-.viewCount, .datePublished
-  color: var(--secondary-text-color)
-  text-align: right
-  font-size: 15px
-
-  @media screen and (max-width: 680px)
-    text-align: left
-
-.viewCount
-  margin: 18px 0px 0px
-
-.datePublished
-  margin: 4px 0px 0px
-
-  @media screen and (max-width: 680px)
-    margin-top: 16px
-
-.likeSection
-  margin-top: 4px
-  font-size: 16px
-  color: var(--tertiary-text-color)
-  display: flex
-  flex-direction: column
-  margin-left: auto
-  text-align: right
-  max-width: 210px
-
-  @media screen and (max-width: 680px)
-    margin-left: 0
-    text-align: left
-
-  .likeBar
-    height: 8px
-    border-radius: 4px
-    margin-bottom: 4px
-
-  .likeCount
-    margin-right: 0px
-
-.videoOptions
-  margin-top: 16px
-  display: flex
-  justify-content: flex-end
-
-  .option:not(:first-child)
-    margin-left: 4px
-
-  @media screen and (max-width: 680px)
-    justify-content: flex-start
-
-    :deep(.iconDropdown)
-      left: calc(50% - 20px)
-      right: auto
diff --git a/src/renderer/components/watch-video-info/watch-video-info.scss b/src/renderer/components/watch-video-info/watch-video-info.scss
new file mode 100644
index 000000000000..67f2070e5943
--- /dev/null
+++ b/src/renderer/components/watch-video-info/watch-video-info.scss
@@ -0,0 +1,119 @@
+.watchVideoInfo {
+  column-gap: 15px;
+  display: grid;
+  grid-template-columns: auto minmax(min-content, 1fr);
+  padding: 16px;
+
+  @media screen and (max-width: 680px) {
+    grid-template-columns: auto;
+  }
+}
+
+.videoTitle {
+  display: block;
+  font-size: 22px;
+  font-weight: normal;
+  margin: 0 0 24px;
+  margin-block-end: 1em;
+  margin-inline-end: 0;
+  margin-inline-start: 0;
+  word-break: break-word;
+}
+
+.channelInformation {
+  .profileRow {
+    display: flex;
+  }
+
+  .channelThumbnail {
+    border-radius: 50%;
+    cursor: pointer;
+    margin-right: 10px;
+    width: 56px;
+  }
+
+  .channelName {
+    color: inherit;
+    cursor: pointer;
+    display: block;
+    margin-left: 6px;
+    position: relative;
+    text-decoration: inherit;
+    top: -2px;
+  }
+
+  .subscribeButton {
+    font-size: 14px;
+    margin-left: 6px;
+    margin-top: 6px;
+    padding: 6px;
+  }
+}
+
+.viewCount,
+.datePublished {
+  color: var(secondary-text-color);
+  font-size: 15px;
+  text-align: right;
+
+  @media screen and (max-width: 680px) {
+    text-align: left;
+  }
+}
+
+.viewCount {
+  margin: 18px 0 0;
+}
+
+.datePublished {
+  margin: 4px 0 0;
+
+  @media screen and (max-width: 680px) {
+    margin-top: 16px;
+  }
+}
+
+.likeSection {
+  color: var(tertiary-text-color);
+  display: flex;
+  flex-direction: column;
+  font-size: 16px;
+  margin-left: auto;
+  margin-top: 4px;
+  max-width: 210px;
+  text-align: right;
+
+  @media screen and (max-width: 680px) {
+    margin-left: 0;
+    text-align: left;
+  }
+
+  .likeBar {
+    border-radius: 4px;
+    height: 8px;
+    margin-bottom: 4px;
+  }
+
+  .likeCount {
+    margin-right: 0;
+  }
+}
+
+.videoOptions {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 16px;
+
+  .option:not(:first-child) {
+    margin-left: 4px;
+  }
+
+  @media screen and (max-width: 680px) {
+    justify-content: flex-start;
+
+    :deep(.iconDropdown) {
+      left: calc(50% - 20px);
+      right: auto;
+    }
+  }
+}
diff --git a/src/renderer/components/watch-video-info/watch-video-info.vue b/src/renderer/components/watch-video-info/watch-video-info.vue
index b0872c6a3cf7..3363551af568 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.vue
+++ b/src/renderer/components/watch-video-info/watch-video-info.vue
@@ -130,4 +130,4 @@
 </template>
 
 <script src="./watch-video-info.js" />
-<style scoped src="./watch-video-info.sass" lang="sass" />
+<style scoped src="./watch-video-info.scss" lang="scss" />
diff --git a/src/renderer/helpers/accessibility.js b/src/renderer/helpers/accessibility.js
index 2ff2432bef20..53ab6f4af62e 100644
--- a/src/renderer/helpers/accessibility.js
+++ b/src/renderer/helpers/accessibility.js
@@ -40,5 +40,5 @@ export function handleDropdownKeyboardEvent(event, target, afterElement) {
 }
 
 export function sanitizeForHtmlId(attribute) {
-  return attribute.replace(/\s+/g, '')
+  return attribute.replaceAll(/\s+/g, '')
 }
diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index 4491f2e468a2..6c9e6dfbfeb2 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -361,7 +361,7 @@ export function createWebURL(path) {
 
 // strip html tags but keep <br>, <b>, </b> <s>, </s>, <i>, </i>
 export function stripHTML(value) {
-  return value.replace(/(<(?!br|\/?(?:b|s|i)>)([^>]+)>)/ig, '')
+  return value.replaceAll(/(<(?!br|\/?[bis]>)([^>]+)>)/gi, '')
 }
 
 /**
@@ -519,14 +519,14 @@ export function getVideoParamsFromUrl(url) {
     },
     // youtu.be
     function () {
-      if (urlObject.host === 'youtu.be' && urlObject.pathname.match(/^\/[A-Za-z0-9_-]+$/)) {
+      if (urlObject.host === 'youtu.be' && /^\/[\w-]+$/.test(urlObject.pathname)) {
         extractParams(urlObject.pathname.slice(1))
         return paramsObject
       }
     },
     // youtube.com/embed
     function () {
-      if (urlObject.pathname.match(/^\/embed\/[A-Za-z0-9_-]+$/)) {
+      if (/^\/embed\/[\w-]+$/.test(urlObject.pathname)) {
         const urlTail = urlObject.pathname.replace('/embed/', '')
         if (urlTail === 'videoseries') {
           paramsObject.playlistId = urlObject.searchParams.get('list')
@@ -538,14 +538,14 @@ export function getVideoParamsFromUrl(url) {
     },
     // youtube.com/shorts
     function () {
-      if (urlObject.pathname.match(/^\/shorts\/[A-Za-z0-9_-]+$/)) {
+      if (/^\/shorts\/[\w-]+$/.test(urlObject.pathname)) {
         extractParams(urlObject.pathname.replace('/shorts/', ''))
         return paramsObject
       }
     },
     // cloudtube
     function () {
-      if (urlObject.host.match(/^cadence\.(gq|moe)$/) && urlObject.pathname.match(/^\/cloudtube\/video\/[A-Za-z0-9_-]+$/)) {
+      if (/^cadence\.(gq|moe)$/.test(urlObject.host) && /^\/cloudtube\/video\/[\w-]+$/.test(urlObject.pathname)) {
         extractParams(urlObject.pathname.slice('/cloudtube/video/'.length))
         return paramsObject
       }
diff --git a/src/renderer/i18n/index.js b/src/renderer/i18n/index.js
index 56c17705d041..076859297cfa 100644
--- a/src/renderer/i18n/index.js
+++ b/src/renderer/i18n/index.js
@@ -27,7 +27,7 @@ class CustomVueI18n extends VueI18n {
       // locales are only compressed in our production Electron builds
       try {
         // decompress brotli compressed json file and then load it
-        // eslint-disable-next-line node/no-path-concat
+        // eslint-disable-next-line n/no-path-concat
         const compressed = await readFile(`${__dirname}/static/locales/${locale}.json.br`)
         const decompressed = await brotliDecompressAsync(compressed)
         const data = JSON.parse(decompressed.toString())
diff --git a/src/renderer/sass-partials/_ft-list-item.sass b/src/renderer/sass-partials/_ft-list-item.sass
deleted file mode 100644
index ab30ca36cb35..000000000000
--- a/src/renderer/sass-partials/_ft-list-item.sass
+++ /dev/null
@@ -1,225 +0,0 @@
-$thumbnail-overlay-opacity: 0.85
-$watched-transition-duration: 0.5s
-
-@mixin is-result
-  @at-root
-    .result#{&}
-      @content
-
-@mixin is-watch-playlist-item
-  @at-root
-    .watchPlaylistItem#{&}
-      @content
-
-@mixin is-recommendation
-  @at-root
-    .recommendation#{&}
-      @content
-
-@mixin is-sidebar-item
-  @at-root
-    .watchPlaylistItem#{&}, .recommendation#{&}
-      @content
-
-@mixin low-contrast-when-watched($col)
-  color: $col
-
-  @at-root
-    .watched &, .watched#{&}
-      color: var(--tertiary-text-color)
-      transition-duration: $watched-transition-duration
-
-    .watched:hover &, .watched:hover#{&}
-      color: $col
-      transition-duration: $watched-transition-duration
-
-.ft-list-item
-  padding: 6px
-
-  &.watched
-    background-color: var(--bg-color)
-    @include low-contrast-when-watched(var(--primary-text-color))
-
-    .thumbnailImage
-      opacity: 0.3
-      transition-duration: $watched-transition-duration
-
-    &:hover .thumbnailImage
-      opacity: 1
-      transition-duration: $watched-transition-duration
-
-  .videoThumbnail
-    position: relative
-
-    .thumbnailLink
-      display: flex
-
-    .thumbnailImage
-
-      @include is-sidebar-item
-        height: 75px
-
-      @include is-recommendation
-        width: 163px
-        height: auto
-
-    .videoWatched
-      position: absolute
-      top:0
-      padding: 2px
-      opacity: $thumbnail-overlay-opacity
-      color: var(--primary-text-color)
-      background-color: var(--bg-color)
-      pointer-events: none
-
-    .videoDuration
-      position: absolute
-      bottom: 4px
-      right: 4px
-      padding: 3px 4px
-      line-height: 1.2
-      font-size: 15px
-      border-radius: 5px
-      margin: 0
-      opacity: $thumbnail-overlay-opacity
-      color: var(--primary-text-color)
-      background-color: var(--card-bg-color)
-      pointer-events: none
-
-      &.live
-        background-color: #f22
-        color: #fff
-
-      @include is-watch-playlist-item
-        font-size: 12px
-
-    .externalPlayerIcon
-      position: absolute
-      bottom: 4px
-      left: 4px
-      font-size: 17px
-      opacity: $thumbnail-overlay-opacity
-
-    .favoritesIcon
-      position: absolute
-      top: 3px
-      right: 3px
-      font-size: 17px
-      opacity: $thumbnail-overlay-opacity
-
-    .watchedProgressBar
-      height: 2px
-      position: absolute
-      bottom: 0px
-      background-color: var(--primary-color)
-      z-index: 2
-      max-width: 100%
-
-    .videoCountContainer
-      position: absolute
-      right: 0
-      top: 0
-      bottom: 0
-      width: 60px
-      font-size: 20px
-
-      .background, .inner
-        position: absolute
-        top: 0
-        bottom: 0
-        left: 0
-        right: 0
-
-      .background
-        background-color: var(--bg-color)
-        opacity: 0.9
-
-      .inner
-        display: flex
-        flex-direction: column
-        justify-content: center
-        align-items: center
-        color: var(--primary-text-color)
-
-  .channelThumbnail
-    display: flex
-    justify-content: center
-
-    .channelImage
-      height: 130px
-      border-radius: 50%
-
-  .info
-    flex: 1
-    position: relative
-
-    .optionsButton
-      float: right // ohhhh man, float was finally the right choice for something
-
-    .externalPlayerButton
-      float: right
-
-    .title
-      font-size: 20px
-      @include low-contrast-when-watched(var(--primary-text-color))
-      text-decoration: none
-      word-wrap: break-word
-      word-break: break-word
-
-      @include is-sidebar-item
-        font-size: 15px
-
-    .infoLine
-      margin-top: 5px
-      font-size: 14px
-
-      @include is-sidebar-item
-        font-size: 12px
-
-      &
-        @include low-contrast-when-watched(var(--secondary-text-color))
-
-      .channelName
-        @include low-contrast-when-watched(var(--secondary-text-color))
-
-    .description
-      font-size: 14px
-      max-height: 50px
-      overflow-y: hidden
-      @include low-contrast-when-watched(var(--secondary-text-color))
-
-  &.list
-    display: flex
-    align-items: flex-start
-
-    .videoThumbnail, .channelThumbnail
-      margin-right: 20px
-
-    .channelThumbnail
-      width: 231px
-
-    @include is-sidebar-item
-      .videoThumbnail
-        margin-right: 10px
-
-  &.grid
-    display: flex
-    flex-direction: column
-    min-height: 230px
-    padding-bottom: 20px
-
-    .videoThumbnail, .channelThumbnail
-      margin-bottom: 12px
-
-      .thumbnailImage
-        width: 100%
-
-    .title
-      font-size: 18px
-
-    .infoLine
-      margin-top: 8px
-      font-size: 13px
-
-.videoWatched, .live
-  text-transform: uppercase
diff --git a/src/renderer/scss-partials/_ft-list-item.scss b/src/renderer/scss-partials/_ft-list-item.scss
new file mode 100644
index 000000000000..806fdea65f0b
--- /dev/null
+++ b/src/renderer/scss-partials/_ft-list-item.scss
@@ -0,0 +1,292 @@
+$thumbnail-overlay-opacity: 0.85;
+$watched-transition-duration: 0.5s;
+
+@mixin is-result {
+  @at-root {
+    .result#{&} {
+      @content;
+    }
+  }
+}
+
+@mixin is-watch-playlist-item {
+  @at-root {
+    .watchPlaylistItem#{&} {
+      @content;
+    }
+  }
+}
+
+@mixin is-recommendation {
+  @at-root {
+    .recommendation#{&} {
+      @content;
+    }
+  }
+}
+
+@mixin is-sidebar-item {
+  @at-root {
+    .watchPlaylistItem#{&},
+    .recommendation#{&} {
+      @content;
+    }
+  }
+}
+
+@mixin low-contrast-when-watched($col) {
+  color: $col;
+
+  @at-root {
+    .watched &,
+    .watched#{&} {
+      color: var(tertiary-text-color);
+      transition-duration: $watched-transition-duration;
+    }
+    .watched:hover &,
+    .watched:hover#{&} {
+      color: $col;
+      transition-duration: $watched-transition-duration;
+    }
+  }
+}
+
+.ft-list-item {
+  padding: 6px;
+
+  &.watched {
+    @include low-contrast-when-watched(var(primary-text-color));
+
+    background-color: var(bg-color);
+
+    .thumbnailImage {
+      opacity: 0.3;
+      transition-duration: $watched-transition-duration;
+    }
+
+    &:hover .thumbnailImage {
+      opacity: 1;
+      transition-duration: $watched-transition-duration;
+    }
+  }
+
+  .videoThumbnail {
+    position: relative;
+
+    .thumbnailLink {
+      display: flex;
+    }
+
+    .thumbnailImage {
+      @include is-sidebar-item {
+        height: 75px;
+      }
+
+      @include is-recommendation {
+        height: auto;
+        width: 163px;
+      }
+    }
+
+    .videoWatched {
+      background-color: var(bg-color);
+      color: var(primary-text-color);
+      opacity: $thumbnail-overlay-opacity;
+      padding: 2px;
+      pointer-events: none;
+      position: absolute;
+      top: 0;
+    }
+
+    .videoDuration {
+      background-color: var(card-bg-color);
+      border-radius: 5px;
+      bottom: 4px;
+      color: var(primary-text-color);
+      font-size: 15px;
+      line-height: 1.2;
+      margin: 0;
+      opacity: $thumbnail-overlay-opacity;
+      padding: 3px 4px;
+      pointer-events: none;
+      position: absolute;
+      right: 4px;
+
+      @include is-watch-playlist-item {
+        font-size: 12px;
+      }
+
+      &.live {
+        background-color: #f22;
+        color: #fff;
+      }
+    }
+
+    .externalPlayerIcon {
+      bottom: 4px;
+      font-size: 17px;
+      left: 4px;
+      opacity: $thumbnail-overlay-opacity;
+      position: absolute;
+    }
+
+    .favoritesIcon {
+      font-size: 17px;
+      opacity: $thumbnail-overlay-opacity;
+      position: absolute;
+      right: 3px;
+      top: 3px;
+    }
+
+    .watchedProgressBar {
+      background-color: var(primary-color);
+      bottom: 0;
+      height: 2px;
+      max-width: 100%;
+      position: absolute;
+      z-index: 2;
+    }
+
+    .videoCountContainer {
+      bottom: 0;
+      font-size: 20px;
+      position: absolute;
+      right: 0;
+      top: 0;
+      width: 60px;
+
+      .background,
+      .inner {
+        bottom: 0;
+        left: 0;
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .background {
+        background-color: var(bg-color);
+        opacity: 0.9;
+      }
+
+      .inner {
+        align-items: center;
+        color: var(primary-text-color);
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+      }
+    }
+  }
+
+  .channelThumbnail {
+    display: flex;
+    justify-content: center;
+
+    .channelImage {
+      border-radius: 50%;
+      height: 130px;
+    }
+  }
+
+  .info {
+    flex: 1;
+    position: relative;
+
+    .optionsButton {
+      float: right; // ohhhh man, float was finally the right choice for something;
+    }
+
+    .externalPlayerButton {
+      float: right;
+    }
+
+    .title {
+      @include low-contrast-when-watched(var(primary-text-color));
+
+      font-size: 20px;
+      text-decoration: none;
+      word-break: break-word;
+      word-wrap: break-word;
+
+      @include is-sidebar-item {
+        font-size: 15px;
+      }
+    }
+
+    .infoLine {
+      font-size: 14px;
+      margin-top: 5px;
+
+      @include is-sidebar-item {
+        font-size: 12px;
+      }
+
+      & {
+        @include low-contrast-when-watched(var(secondary-text-color));
+      }
+
+      .channelName {
+        @include low-contrast-when-watched(var(secondary-text-color));
+      }
+    }
+
+    .description {
+      @include low-contrast-when-watched(var(secondary-text-color));
+
+      font-size: 14px;
+      max-height: 50px;
+      overflow-y: hidden;
+    }
+  }
+
+  &.list {
+    align-items: flex-start;
+    display: flex;
+
+    @include is-sidebar-item {
+      .videoThumbnail {
+        margin-right: 10px;
+      }
+    }
+
+    .videoThumbnail,
+    .channelThumbnail {
+      margin-right: 20px;
+    }
+
+    .channelThumbnail {
+      width: 231px;
+    }
+  }
+
+  &.grid {
+    display: flex;
+    flex-direction: column;
+    min-height: 230px;
+    padding-bottom: 20px;
+
+    .videoThumbnail,
+    .channelThumbnail {
+      margin-bottom: 12px;
+
+      .thumbnailImage {
+        width: 100%;
+      }
+    }
+
+    .title {
+      font-size: 18px;
+    }
+
+    .infoLine {
+      font-size: 13px;
+      margin-top: 8px;
+    }
+  }
+}
+
+.videoWatched,
+.live {
+  text-transform: uppercase;
+}
diff --git a/src/renderer/store/modules/index.js b/src/renderer/store/modules/index.js
index 428c6be2e719..33063f6f3990 100644
--- a/src/renderer/store/modules/index.js
+++ b/src/renderer/store/modules/index.js
@@ -8,7 +8,7 @@ const modules = {}
 
 files.keys().forEach(key => {
   if (key === './index.js') return
-  modules[key.replace(/(\.\/|\.js)/g, '')] = files(key).default
+  modules[key.replaceAll(/(\.\/|\.js)/g, '')] = files(key).default
 })
 
 export default modules
diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index 357416b3039e..fd2fafc00b2b 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -314,7 +314,7 @@ const actions = {
     const typePatterns = new Map([
       ['playlist', /^(\/playlist\/?|\/embed(\/?videoseries)?)$/],
       ['search', /^\/results\/?$/],
-      ['hashtag', /^\/hashtag\/([^/?&#]+)$/],
+      ['hashtag', /^\/hashtag\/([^#&/?]+)$/],
       ['channel', channelPattern]
     ])
 
diff --git a/src/renderer/views/About/About.sass b/src/renderer/views/About/About.sass
deleted file mode 100644
index d7c1c5e0e2ce..000000000000
--- a/src/renderer/views/About/About.sass
+++ /dev/null
@@ -1,50 +0,0 @@
-.card
-  width: 85%
-  margin: 0 auto
-  margin-bottom: 60px
-
-  @media only screen and (max-width: 680px)
-    width: 90%
-
-.brand
-  text-align: center
-
-.logo
-  width: 500px
-  max-width: 100%
-
-.version
-  font-size: 2em
-
-.about-chunks
-  max-width: 860px
-  margin: 80px auto
-  display: grid
-  grid-template-columns: 1fr 1fr
-  grid-gap: 16px
-
-  @media only screen and (max-width: 650px)
-    grid-template-columns: 1fr
-
-.chunk
-  background-color: var(--bg-color)
-  margin: 0
-  padding: 18px
-  border-radius: 8px
-  display: grid
-  grid-template: "icon title" auto "icon content" 1fr / auto 1fr
-  justify-content: start
-  align-items: start
-  grid-gap: 6px 14px
-  word-break: break-word
-  box-shadow: 0px 1px 4px -1px rgba(0, 0, 0, 0.5)
-
-  @each $area in icon title content
-    .#{$area}
-      grid-area: $area
-
-  .icon
-    font-size: 24px
-
-  .title
-    margin: 0
diff --git a/src/renderer/views/About/About.scss b/src/renderer/views/About/About.scss
new file mode 100644
index 000000000000..b2499795d39e
--- /dev/null
+++ b/src/renderer/views/About/About.scss
@@ -0,0 +1,62 @@
+.card {
+  margin: 0 auto;
+  margin-bottom: 60px;
+  width: 85%;
+
+  @media only screen and (max-width: 680px) {
+    width: 90%;
+  }
+}
+
+.brand {
+  text-align: center;
+}
+
+.logo {
+  max-width: 100%;
+  width: 500px;
+}
+
+.version {
+  font-size: 2em;
+}
+
+.about-chunks {
+  display: grid;
+  grid-gap: 16px;
+  grid-template-columns: 1fr 1fr;
+  margin: 80px auto;
+  max-width: 860px;
+
+  @media only screen and (max-width: 650px) {
+    grid-template-columns: 1fr;
+  }
+}
+
+.chunk {
+  align-items: start;
+  background-color: var(bg-color);
+  border-radius: 8px;
+  box-shadow: 0 1px 4px -1px rgb(0 0 0 / 50%);
+  display: grid;
+  grid-gap: 6px 14px;
+  grid-template: 'icon title' auto 'icon content' 1fr / auto 1fr;
+  justify-content: start;
+  margin: 0;
+  padding: 18px;
+  word-break: break-word;
+
+  @each $area in icon title content {
+    .#{$area} {
+      grid-area: $area;
+    }
+  }
+
+  .icon {
+    font-size: 24px;
+  }
+
+  .title {
+    margin: 0;
+  }
+}
diff --git a/src/renderer/views/About/About.vue b/src/renderer/views/About/About.vue
index 2facd59670b2..4c7ba06731c0 100644
--- a/src/renderer/views/About/About.vue
+++ b/src/renderer/views/About/About.vue
@@ -37,4 +37,4 @@
 </template>
 
 <script src="./About.js" />
-<style scoped src="./About.sass" lang="sass" />
+<style scoped src="./About.scss" lang="scss" />
diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.js b/src/renderer/views/SubscribedChannels/SubscribedChannels.js
index b3f142c6f37c..8a4a66c79f4d 100644
--- a/src/renderer/views/SubscribedChannels/SubscribedChannels.js
+++ b/src/renderer/views/SubscribedChannels/SubscribedChannels.js
@@ -23,7 +23,7 @@ export default Vue.extend({
       subscribedChannels: [],
       filteredChannels: [],
       re: {
-        url: /(.+=\w{1})\d+(.+)/,
+        url: /(.+=\w)\d+(.+)/,
         ivToIv: /^.+(ggpht.+)/,
         ivToYt: /^.+ggpht\/(.+)/,
         ytToIv: /^.+ggpht\.com\/(.+)/
@@ -115,7 +115,7 @@ export default Vue.extend({
         return
       }
 
-      const escapedQuery = this.query.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+      const escapedQuery = this.query.replaceAll(/[$()*+.?[\\\]^{|}]/g, '\\$&')
       const re = new RegExp(escapedQuery, 'i')
       this.filteredChannels = this.subscribedChannels.filter(channel => {
         return re.test(channel.name)
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 09cf28686a98..08fc581fded0 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -260,9 +260,9 @@ export default Vue.extend({
             let skipIndex
             errorScreen.subreason.runs.forEach((message, index) => {
               if (index !== skipIndex) {
-                if (message.text.match(/<a.*>/)) {
+                if (/<a.*>/.test(message.text)) {
                   skipIndex = index + 1
-                } else if (!message.text.match(/<\/a>/)) {
+                } else if (!/<\/a>/.test(message.text)) {
                   if (typeof subReason === 'undefined') {
                     subReason = message.text
                   } else {
@@ -719,7 +719,7 @@ export default Vue.extend({
             // MM:SS - Text
             // HH:MM:SS - HH:MM:SS - Text // end timestamp is ignored, separator is one of '-', '–', '—'
             // HH:MM - HH:MM - Text // end timestamp is ignored
-            const chapterMatches = result.description.matchAll(/^(?<timestamp>((?<hours>[0-9]+):)?(?<minutes>[0-9]+):(?<seconds>[0-9]+))(\s*[-–—]\s*(?:[0-9]+:)?[0-9]+:[0-9]+)?\s+([-–•—]\s*)?(?<title>.+)$/gm)
+            const chapterMatches = result.description.matchAll(/^(?<timestamp>((?<hours>\d+):)?(?<minutes>\d+):(?<seconds>\d+))(\s*[–—-]\s*(?:\d+:){1,2}\d+)?\s+([–—•-]\s*)?(?<title>.+)$/gm)
 
             for (const { groups } of chapterMatches) {
               let start = 60 * Number(groups.minutes) + Number(groups.seconds)
@@ -860,7 +860,7 @@ export default Vue.extend({
     },
 
     processDescriptionPart(part, fallbackDescription) {
-      const timestampRegex = /^([0-9]+:)?[0-9]+:[0-9]+$/
+      const timestampRegex = /^(\d+:)?\d+:\d+$/
 
       if (typeof part.navigationEndpoint === 'undefined' || part.navigationEndpoint === null || part.text.startsWith('#')) {
         return part.text
@@ -1314,7 +1314,7 @@ export default Vue.extend({
         /* eslint-disable-next-line */
         const [width, height, count, sWidth, sHeight, interval, _, sigh] = storyboard.split('#')
         storyboardArray.push({
-          url: baseUrl.replace('$L', i + 1).replace('$N', 'M0').replace(/<\/?sub>/g, '') + '&sigh=' + sigh,
+          url: baseUrl.replace('$L', i + 1).replace('$N', 'M0').replaceAll(/<\/?sub>/g, '') + '&sigh=' + sigh,
           width: Number(width), // Width of one sub image
           height: Number(height), // Height of one sub image
           sWidth: Number(sWidth), // Number of images vertically  (if full)
@@ -1412,7 +1412,7 @@ export default Vue.extend({
             // The character '#' needs to be percent-encoded in a (data) URI
             // because it signals an identifier, which means anything after it
             // is automatically removed when the URI is used as a source
-            let vtt = text.replace(/#/g, '%23')
+            let vtt = text.replaceAll('#', '%23')
 
             // A lot of videos have messed up caption positions that need to be removed
             // This can be either because this format isn't really used by YouTube
@@ -1424,9 +1424,9 @@ export default Vue.extend({
             // In addition, all aligns seem to be fixed to "start" when they do pop up in normal captions
             // If it's prominent enough that people start to notice, it can be removed then
             if (caption.kind === 'asr') {
-              vtt = vtt.replace(/ align:start| position:\d{1,3}%/g, '')
+              vtt = vtt.replaceAll(/ align:start| position:\d{1,3}%/g, '')
             } else {
-              vtt = vtt.replace(/ position:\d{1,3}%/g, '')
+              vtt = vtt.replaceAll(/ position:\d{1,3}%/g, '')
             }
 
             caption.baseUrl = `data:${caption.type};${caption.charset},${vtt}`
diff --git a/src/renderer/views/Watch/Watch.sass b/src/renderer/views/Watch/Watch.sass
deleted file mode 100644
index 70915cd56a76..000000000000
--- a/src/renderer/views/Watch/Watch.sass
+++ /dev/null
@@ -1,109 +0,0 @@
-=dual-column-template
-  grid-template: "video video sidebar" 0fr "info info sidebar" auto "info info sidebar" 1fr / 1fr 1fr 1fr
-
-=theatre-mode-template
-  grid-template: "video video video" auto "info info sidebar" auto "info info sidebar" auto / 1fr 1fr 1fr
-
-=single-column-template
-  grid-template: "video" auto "info" auto "sidebar" auto / auto
-.ageRestricted 
-  max-width: calc(80vh * 1.78)
-  display: inline-block
-  +single-column-template
-  @media only screen and (min-width: 901px)
-    width: 300%
-
-.videoLayout
-  display: grid
-  align-items: start
-  +dual-column-template
-
-  @media only screen and (max-width: 1350px)
-    +theatre-mode-template
-
-  @media only screen and (min-width: 901px)
-    &.useTheatreMode
-      +theatre-mode-template
-
-  @media only screen and (max-width: 900px)
-    +single-column-template
-
-  &.isLoading, &.noSidebar
-    +single-column-template
-
-  .videoArea
-    grid-area: video
-
-    .videoAreaMargin
-      margin: 0 0 16px
-
-    .videoPlayer
-      grid-column: 1
-      max-width: calc(80vh * 1.78)
-      margin: 0 auto
-      position: relative
-
-      .upcomingThumbnail
-        width: 100%
-
-      .premiereDate
-        color: #FFFFFF
-        background-color: rgba(0, 0, 0, 0.8)
-        height: 60px
-        border-radius: 5px
-        position: absolute
-        bottom: 12px
-        left: 12px
-        display: flex
-        align-items: center
-        padding: 0 12px
-
-        .premiereIcon
-          float: left
-          font-size: 25px
-          margin: 0 12px
-
-        .premiereText
-          min-width: 200px
-          margin: 0 12px
-
-          .premiereTextTimestamp
-              font-size: 0.85em
-              font-weight: bold
-
-  .watchVideo
-    margin: 0 0 16px
-    grid-column: 1
-
-  .infoArea
-    grid-area: info
-    position: relative
-
-  @media only screen and (min-width: 901px)
-    .infoArea
-      scroll-margin-top: 76px
-
-    .infoAreaSticky
-      position: sticky
-      top: 76px
-
-  .sidebarArea
-    grid-area: sidebar
-
-    @media only screen and (min-width: 901px)
-      min-width: 380px
-
-    @at-root .noSidebar#{&}
-      grid-area: auto
-
-  .watchVideoPlaylist, .watchVideoSidebar, .theatrePlaylist
-    margin: 0 8px 16px
-
-  .watchVideoSidebar, .watchVideoPlaylist
-    height: 500px
-
-  .watchVideoRecommendations, .theatreRecommendations
-    margin: 0 0 16px
-
-    @media only screen and (min-width: 901px)
-      margin: 0 8px 16px
diff --git a/src/renderer/views/Watch/Watch.scss b/src/renderer/views/Watch/Watch.scss
new file mode 100644
index 000000000000..39948490e3a3
--- /dev/null
+++ b/src/renderer/views/Watch/Watch.scss
@@ -0,0 +1,149 @@
+@mixin dual-column-template {
+  grid-template: 'video video sidebar' 0fr 'info info sidebar' auto 'info info sidebar' 1fr / 1fr 1fr 1fr;
+}
+
+@mixin theatre-mode-template {
+  grid-template: 'video video video' auto 'info info sidebar' auto 'info info sidebar' auto / 1fr 1fr 1fr;
+}
+
+@mixin single-column-template {
+  grid-template: 'video' auto 'info' auto 'sidebar' auto / auto;
+}
+
+.ageRestricted {
+  @include single-column-template;
+
+  display: inline-block;
+  max-width: calc(80vh * 1.78);
+
+  @media only screen and (min-width: 901px) {
+    width: 300%;
+  }
+}
+
+.videoLayout {
+  @include dual-column-template;
+
+  align-items: start;
+  display: grid;
+
+  &.isLoading,
+  &.noSidebar {
+    @include single-column-template;
+  }
+
+  .videoArea {
+    grid-area: video;
+
+    .videoAreaMargin {
+      margin: 0 0 16px;
+    }
+
+    .videoPlayer {
+      grid-column: 1;
+      margin: 0 auto;
+      max-width: calc(80vh * 1.78);
+      position: relative;
+
+      .upcomingThumbnail {
+        width: 100%;
+      }
+
+      .premiereDate {
+        align-items: center;
+        background-color: rgb(0 0 0 / 80%);
+        border-radius: 5px;
+        bottom: 12px;
+        color: #fff;
+        display: flex;
+        height: 60px;
+        left: 12px;
+        padding: 0 12px;
+        position: absolute;
+
+        .premiereIcon {
+          float: left;
+          font-size: 25px;
+          margin: 0 12px;
+        }
+
+        .premiereText {
+          margin: 0 12px;
+          min-width: 200px;
+
+          .premiereTextTimestamp {
+            font-size: 0.85em;
+            font-weight: bold;
+          }
+        }
+      }
+    }
+  }
+
+  .watchVideo {
+    grid-column: 1;
+    margin: 0 0 16px;
+  }
+
+  .infoArea {
+    grid-area: info;
+    position: relative;
+  }
+
+  .sidebarArea {
+    grid-area: sidebar;
+
+    @media only screen and (min-width: 901px) {
+      min-width: 380px;
+    }
+
+    @at-root .noSidebar#{&} {
+      grid-area: auto;
+    }
+  }
+
+  .watchVideoPlaylist,
+  .watchVideoSidebar,
+  .theatrePlaylist {
+    margin: 0 8px 16px;
+  }
+
+  .watchVideoSidebar,
+  .watchVideoPlaylist {
+    height: 500px;
+  }
+
+  .watchVideoRecommendations,
+  .theatreRecommendations {
+    margin: 0 0 16px;
+
+    @media only screen and (min-width: 901px) {
+      margin: 0 8px 16px;
+    }
+  }
+
+  @media only screen and (max-width: 1350px) {
+    @include theatre-mode-template;
+  }
+
+  @media only screen and (min-width: 901px) {
+    &.useTheatreMode {
+      @include theatre-mode-template;
+    }
+  }
+
+  @media only screen and (max-width: 900px) {
+    @include single-column-template;
+  }
+
+  @media only screen and (min-width: 901px) {
+    .infoArea {
+      scroll-margin-top: 76px;
+    }
+
+    .infoAreaSticky {
+      position: sticky;
+      top: 76px;
+    }
+  }
+}
diff --git a/src/renderer/views/Watch/Watch.vue b/src/renderer/views/Watch/Watch.vue
index 8b4d5c384aeb..879a1db26607 100644
--- a/src/renderer/views/Watch/Watch.vue
+++ b/src/renderer/views/Watch/Watch.vue
@@ -185,4 +185,4 @@
 </template>
 
 <script src="./Watch.js" />
-<style scoped src="./Watch.sass" lang="sass" />
+<style scoped src="./Watch.scss" lang="scss" />
diff --git a/static/geolocations/bg/countries.json b/static/geolocations/bg/countries.json
index 112be4ff3dd5..202559836973 100644
--- a/static/geolocations/bg/countries.json
+++ b/static/geolocations/bg/countries.json
@@ -193,5 +193,3 @@
 {"id":894,"name":"Замбия","alpha2":"zm","alpha3":"zmb"},
 {"id":716,"name":"Зимбабве","alpha2":"zw","alpha3":"zwe"},
 {"id":158,"name":"Тайван","alpha2":"tw","alpha3":"twn"}]
-
-
diff --git a/static/geolocations/uk/countries.json b/static/geolocations/uk/countries.json
index a8b8c2c0b58b..6fda6fd386f9 100644
--- a/static/geolocations/uk/countries.json
+++ b/static/geolocations/uk/countries.json
@@ -191,4 +191,4 @@
 {"id":752,"name":"Швеція","alpha2":"se","alpha3":"swe"},
 {"id":144,"name":"Шрі-Ланка","alpha2":"lk","alpha3":"lka"},
 {"id":388,"name":"Ямайка","alpha2":"jm","alpha3":"jam"},
-{"id":392,"name":"Японія","alpha2":"jp","alpha3":"jpn"}]
\ No newline at end of file
+{"id":392,"name":"Японія","alpha2":"jp","alpha3":"jpn"}]
diff --git a/yarn.lock b/yarn.lock
index 852cbbe30b69..983d2b80c0d9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15,13 +15,6 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
@@ -60,6 +53,15 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
+"@babel/eslint-parser@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz#4f68f6b0825489e00a24b41b6a1ae35414ecd2f4"
+  integrity sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==
+  dependencies:
+    "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
+    eslint-visitor-keys "^2.1.0"
+    semver "^6.3.0"
+
 "@babel/generator@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a"
@@ -269,11 +271,6 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
   integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
-
 "@babel/helper-validator-identifier@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
@@ -308,15 +305,6 @@
     "@babel/traverse" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/highlight@^7.10.4":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3"
-  integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
 "@babel/highlight@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
@@ -326,7 +314,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.18.4", "@babel/parser@^7.20.7", "@babel/parser@^7.7.0":
+"@babel/parser@^7.18.4", "@babel/parser@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
   integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==
@@ -939,7 +927,7 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.7", "@babel/traverse@^7.7.0":
+"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.7":
   version "7.20.10"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.10.tgz#2bf98239597fcec12f842756f186a9dde6d09230"
   integrity sha512-oSf1juCgymrSez8NI4A2sr4+uB/mFd9MXplYGPEBnfAuWmmyeVcHa6xLPiaRBcXkcb/28bgxmQLTVwFKE1yfsg==
@@ -955,7 +943,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.4.4":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
   integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
@@ -964,6 +952,11 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@csstools/selector-specificity@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz#1bfafe4b7ed0f3e4105837e056e0a89b108ebe36"
+  integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==
+
 "@develar/schema-utils@~2.6.5":
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6"
@@ -977,6 +970,13 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
+"@double-great/stylelint-a11y@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@double-great/stylelint-a11y/-/stylelint-a11y-2.0.2.tgz#370a2f6d2e8f552ca741759a0b9c153a3a260e4c"
+  integrity sha512-RYxXkDdOQgIv1UYnc0xst3xaRgtCpYSJu6fIQgc05OwPfvqVyFThfHAt6zYBFYQL67uLYFKi/aQZJpe/6FueIw==
+  dependencies:
+    postcss "^8.4.19"
+
 "@electron/get@^2.0.0":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e"
@@ -1005,19 +1005,26 @@
     minimatch "^3.0.4"
     plist "^3.0.4"
 
-"@eslint/eslintrc@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
-  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+"@eslint-community/eslint-utils@^4.1.2":
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.1.2.tgz#14ca568ddaa291dd19a4a54498badc18c6cfab78"
+  integrity sha512-7qELuQWWjVDdVsFQ5+beUl+KPczrEDA7S3zM4QUd/bJl7oXgsmpXaEVqrRTnOBqenOV4rWf2kVZk2Ot085zPWA==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint/eslintrc@^1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e"
+  integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==
   dependencies:
     ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
-    globals "^13.9.0"
-    ignore "^4.0.6"
+    debug "^4.3.2"
+    espree "^9.4.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
     import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
 "@fortawesome/fontawesome-common-types@6.2.1":
@@ -1066,16 +1073,21 @@
   dependencies:
     axios "^0.27.2"
 
-"@humanwhocodes/config-array@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
-  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+"@humanwhocodes/config-array@^0.11.8":
+  version "0.11.8"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
+  integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.0"
+    "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
-    minimatch "^3.0.4"
+    minimatch "^3.0.5"
 
-"@humanwhocodes/object-schema@^1.2.0":
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
@@ -1174,6 +1186,13 @@
     lodash "^4.17.15"
     tmp-promise "^3.0.2"
 
+"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
+  version "5.1.1-v1"
+  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
+  integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
+  dependencies:
+    eslint-scope "5.1.1"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -1187,7 +1206,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -1414,6 +1433,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
+"@types/minimist@^1.2.0":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
+  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
+
 "@types/ms@*":
   version "0.7.31"
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
@@ -1429,6 +1453,16 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.45.tgz#155b13a33c665ef2b136f7f245fa525da419e810"
   integrity sha512-3rKg/L5x0rofKuuUt5zlXzOnKyIHXmIu5R8A0TuNDMF2062/AOIDBciFIjToLEJ/9F9DzkHNot+BpNsMI1OLdQ==
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
+  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
+
+"@types/parse-json@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+
 "@types/plist@^3.0.1":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01"
@@ -1748,7 +1782,7 @@ acorn-import-assertions@^1.7.6:
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
   integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
 
-acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:
+acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
@@ -1767,7 +1801,7 @@ acorn-walk@^7.0.0:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn@^7.0.0, acorn@^7.4.0:
+acorn@^7.0.0:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
@@ -1833,11 +1867,6 @@ ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
 ansi-html-community@^0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
@@ -1907,13 +1936,6 @@ app-builder-lib@23.6.0:
     tar "^6.1.11"
     temp-file "^3.4.0"
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -1947,6 +1969,11 @@ array-includes@^3.1.4:
     get-intrinsic "^1.1.1"
     is-string "^1.0.7"
 
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
 array.prototype.flat@^1.2.5:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b"
@@ -1957,6 +1984,11 @@ array.prototype.flat@^1.2.5:
     es-abstract "^1.19.2"
     es-shim-unscopables "^1.0.0"
 
+arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
+
 asar@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473"
@@ -2070,18 +2102,6 @@ axios@^1.1.2:
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
-babel-eslint@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
-  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
-    eslint-visitor-keys "^1.0.0"
-    resolve "^1.12.0"
-
 babel-loader@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.0.tgz#839e9ae88aea930864ef9ec0f356dfca96ecf238"
@@ -2119,6 +2139,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+balanced-match@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9"
+  integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
+
 base64-js@^1.0.2, base64-js@^1.3.1, base64-js@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -2472,11 +2497,23 @@ builder-util@23.6.0:
     stat-mode "^1.0.0"
     temp-file "^3.4.0"
 
+builtin-modules@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
+  integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
+
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==
 
+builtins@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
+  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
+  dependencies:
+    semver "^7.0.0"
+
 busboy@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
@@ -2538,6 +2575,20 @@ camel-case@^4.1.2:
     pascal-case "^3.1.2"
     tslib "^2.0.3"
 
+camelcase-keys@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
+  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
+  dependencies:
+    camelcase "^5.3.1"
+    map-obj "^4.0.0"
+    quick-lru "^4.0.1"
+
+camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
 caniuse-api@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
@@ -2615,6 +2666,11 @@ ci-info@^3.2.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.1.tgz#58331f6f472a25fe3a50a351ae3052936c2c7f32"
   integrity sha512-SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg==
 
+ci-info@^3.6.1:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f"
+  integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -2635,6 +2691,13 @@ clean-css@^5.2.2:
   dependencies:
     source-map "~0.6.0"
 
+clean-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clean-regexp/-/clean-regexp-1.0.0.tgz#8df7c7aae51fd36874e8f8d05b9180bc11a3fed7"
+  integrity sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
 cli-truncate@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
@@ -2692,7 +2755,7 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colord@^2.9.1:
+colord@^2.9.1, colord@^2.9.3:
   version "2.9.3"
   resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
   integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
@@ -2886,6 +2949,17 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
+cosmiconfig@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
+  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
+
 crc@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
@@ -2966,6 +3040,11 @@ css-declaration-sorter@^6.3.0:
   resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz#be5e1d71b7a992433fb1c542c7a1b835e45682ec"
   integrity sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==
 
+css-functions-list@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.1.0.tgz#cf5b09f835ad91a00e5959bcfc627cd498e1321b"
+  integrity sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==
+
 css-loader@^6.7.3:
   version "6.7.3"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.3.tgz#1e8799f3ccc5874fdd55461af51137fcc5befbcd"
@@ -3117,7 +3196,7 @@ debug@2.6.9, debug@^2.6.8, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -3131,6 +3210,19 @@ debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+decamelize-keys@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
+  integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==
+  dependencies:
+    decamelize "^1.1.0"
+    map-obj "^1.0.0"
+
+decamelize@^1.1.0, decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
+
 decompress-response@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
@@ -3576,13 +3668,6 @@ enhanced-resolve@^5.10.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
-  dependencies:
-    ansi-colors "^4.1.1"
-
 entities@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
@@ -3734,15 +3819,15 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-prettier@^8.3.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
-  integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
+eslint-config-prettier@^8.6.0:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz#dec1d29ab728f4fa63061774e1672ac4e363d207"
+  integrity sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==
 
-eslint-config-standard@^16.0.3:
-  version "16.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516"
-  integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg==
+eslint-config-standard@^17.0.0:
+  version "17.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz#fd5b6cf1dcf6ba8d29f200c461de2e19069888cf"
+  integrity sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==
 
 eslint-import-resolver-node@^0.3.6:
   version "0.3.6"
@@ -3760,15 +3845,15 @@ eslint-module-utils@^2.7.3:
     debug "^3.2.7"
     find-up "^2.1.0"
 
-eslint-plugin-es@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz#75a7cdfdccddc0589934aeeb384175f221c57893"
-  integrity sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==
+eslint-plugin-es@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz#f0822f0c18a535a97c3e714e89f88586a7641ec9"
+  integrity sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==
   dependencies:
     eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
-eslint-plugin-import@^2.24.2:
+eslint-plugin-import@^2.26.0:
   version "2.26.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
   integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
@@ -3787,17 +3872,28 @@ eslint-plugin-import@^2.24.2:
     resolve "^1.22.0"
     tsconfig-paths "^3.14.1"
 
-eslint-plugin-node@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d"
-  integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==
+eslint-plugin-jsonc@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.5.0.tgz#b0daea12f0927a3bba99557902ce6e0b48c37b4b"
+  integrity sha512-G257khwkrOQ5MJpSzz4yQh5K12W4xFZRcHmVlhVFWh2GCLDX+JwHnmkQoUoFDbOieSPBMsPFZDTJScwrXiWlIg==
   dependencies:
-    eslint-plugin-es "^3.0.0"
-    eslint-utils "^2.0.0"
+    eslint-utils "^3.0.0"
+    jsonc-eslint-parser "^2.0.4"
+    natural-compare "^1.4.0"
+
+eslint-plugin-n@^15.6.0:
+  version "15.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-15.6.0.tgz#cfb1d2e2e427d620eb9008f8b3b5a40de0c84120"
+  integrity sha512-Hd/F7wz4Mj44Jp0H6Jtty13NcE69GNTY0rVlgTIj1XBnGGVI6UTdDrpE6vqu3AHo07bygq/N+7OH/lgz1emUJw==
+  dependencies:
+    builtins "^5.0.1"
+    eslint-plugin-es "^4.1.0"
+    eslint-utils "^3.0.0"
     ignore "^5.1.1"
-    minimatch "^3.0.4"
-    resolve "^1.10.1"
-    semver "^6.1.0"
+    is-core-module "^2.11.0"
+    minimatch "^3.1.2"
+    resolve "^1.22.1"
+    semver "^7.3.8"
 
 eslint-plugin-prettier@^4.2.1:
   version "4.2.1"
@@ -3806,15 +3902,32 @@ eslint-plugin-prettier@^4.2.1:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-promise@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.2.0.tgz#a596acc32981627eb36d9d75f9666ac1a4564971"
-  integrity sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==
+eslint-plugin-promise@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz#269a3e2772f62875661220631bd4dafcb4083816"
+  integrity sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==
 
-eslint-plugin-standard@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-5.0.0.tgz#c43f6925d669f177db46f095ea30be95476b1ee4"
-  integrity sha512-eSIXPc9wBM4BrniMzJRBm2uoVuXz2EPa+NXPk2+itrVt+r5SbKFERx/IgrK/HmfjddyKVz2f+j+7gBRvu19xLg==
+eslint-plugin-unicorn@^45.0.2:
+  version "45.0.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-45.0.2.tgz#d6ba704793a6909fe5dfe013900d2b05b715284c"
+  integrity sha512-Y0WUDXRyGDMcKLiwgL3zSMpHrXI00xmdyixEGIg90gHnj0PcHY4moNv3Ppje/kDivdAy5vUeUr7z211ImPv2gw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@eslint-community/eslint-utils" "^4.1.2"
+    ci-info "^3.6.1"
+    clean-regexp "^1.0.0"
+    esquery "^1.4.0"
+    indent-string "^4.0.0"
+    is-builtin-module "^3.2.0"
+    jsesc "^3.0.2"
+    lodash "^4.17.21"
+    pluralize "^8.0.0"
+    read-pkg-up "^7.0.1"
+    regexp-tree "^0.1.24"
+    regjsparser "^0.9.1"
+    safe-regex "^2.1.1"
+    semver "^7.3.8"
+    strip-indent "^3.0.0"
 
 eslint-plugin-vue@^9.8.0:
   version "9.8.0"
@@ -3838,7 +3951,7 @@ eslint-plugin-vuejs-accessibility@^2.0.0:
     emoji-regex "^10.0.0"
     vue-eslint-parser "^9.0.1"
 
-eslint-scope@5.1.1, eslint-scope@^5.1.1:
+eslint-scope@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -3854,7 +3967,7 @@ eslint-scope@^7.1.1:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-utils@^2.0.0, eslint-utils@^2.1.0:
+eslint-utils@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
   integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
@@ -3868,75 +3981,74 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+eslint-visitor-keys@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
-eslint-visitor-keys@^2.0.0:
+eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.3.0:
+eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@^7.32.0:
-  version "7.32.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
-  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
+eslint@^8.31.0:
+  version "8.31.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.31.0.tgz#75028e77cbcff102a9feae1d718135931532d524"
+  integrity sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==
   dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.3"
-    "@humanwhocodes/config-array" "^0.5.0"
+    "@eslint/eslintrc" "^1.4.1"
+    "@humanwhocodes/config-array" "^0.11.8"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
-    debug "^4.0.1"
+    debug "^4.3.2"
     doctrine "^3.0.0"
-    enquirer "^2.3.5"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
+    eslint-scope "^7.1.1"
+    eslint-utils "^3.0.0"
+    eslint-visitor-keys "^3.3.0"
+    espree "^9.4.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.1.2"
-    globals "^13.6.0"
-    ignore "^4.0.6"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    grapheme-splitter "^1.0.4"
+    ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
+    is-path-inside "^3.0.3"
+    js-sdsl "^4.1.4"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
+    regexpp "^3.2.0"
+    strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
-    table "^6.0.9"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^9.0.0, espree@^9.4.0:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd"
+  integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==
   dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
+    acorn "^8.8.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.3.0"
 
 espree@^9.3.1:
   version "9.4.0"
@@ -3947,11 +4059,6 @@ espree@^9.3.1:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
 esquery@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
@@ -4118,6 +4225,17 @@ fast-glob@^3.2.11:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
+fast-glob@^3.2.12, fast-glob@^3.2.9:
+  version "3.2.12"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -4138,6 +4256,11 @@ fastest-levenshtein@^1.0.12:
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
   integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
 
+fastest-levenshtein@^1.0.16:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
+  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
+
 fastq@^1.6.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
@@ -4209,7 +4332,7 @@ find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-find-up@^4.0.0:
+find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -4217,6 +4340,14 @@ find-up@^4.0.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -4350,11 +4481,6 @@ function.prototype.name@^1.1.5:
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
 functions-have-names@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
@@ -4427,7 +4553,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1:
+glob-parent@^6.0.1, glob-parent@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -4475,6 +4601,22 @@ global-agent@^3.0.0:
     semver "^7.3.2"
     serialize-error "^7.0.1"
 
+global-modules@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
+  dependencies:
+    global-prefix "^3.0.0"
+
+global-prefix@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
+  integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
+  dependencies:
+    ini "^1.3.5"
+    kind-of "^6.0.2"
+    which "^1.3.1"
+
 global@^4.3.1, global@^4.3.2, global@^4.4.0, global@~4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
@@ -4488,10 +4630,10 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.15.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac"
-  integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==
+globals@^13.19.0:
+  version "13.19.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz#7a42de8e6ad4f7242fbcca27ea5b23aca367b5c8"
+  integrity sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==
   dependencies:
     type-fest "^0.20.2"
 
@@ -4502,6 +4644,18 @@ globalthis@^1.0.1:
   dependencies:
     define-properties "^1.1.3"
 
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
+    slash "^3.0.0"
+
 globby@^13.1.1:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.2.tgz#29047105582427ab6eca4f905200667b056da515"
@@ -4513,6 +4667,11 @@ globby@^13.1.1:
     merge2 "^1.4.1"
     slash "^4.0.0"
 
+globjoin@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
+  integrity sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==
+
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -4547,6 +4706,11 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4,
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
   integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
 
+grapheme-splitter@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
 handle-thing@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
@@ -4565,6 +4729,11 @@ har-validator@~5.1.3:
     ajv "^6.12.3"
     har-schema "^2.0.0"
 
+hard-rejection@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
+  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
+
 has-bigints@^1.0.1, has-bigints@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
@@ -4647,7 +4816,7 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
-hosted-git-info@^4.1.0:
+hosted-git-info@^4.0.1, hosted-git-info@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
   integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
@@ -4692,6 +4861,11 @@ html-minifier-terser@^6.0.2:
     relateurl "^0.2.7"
     terser "^5.10.0"
 
+html-tags@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961"
+  integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==
+
 html-webpack-plugin@^5.3.2:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50"
@@ -4860,16 +5034,16 @@ ieee754@^1.1.13, ieee754@^1.1.4:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
 ignore@^5.1.1, ignore@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
+ignore@^5.2.1:
+  version "5.2.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
+  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
@@ -4888,6 +5062,11 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+import-lazy@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
+  integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
+
 import-local@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
@@ -4901,6 +5080,11 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
 individual@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/individual/-/individual-2.0.0.tgz#833b097dad23294e76117a98fb38e0d9ad61bb97"
@@ -4929,6 +5113,11 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
+ini@^1.3.5:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
 inline-source-map@~0.6.0:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5"
@@ -5021,6 +5210,13 @@ is-buffer@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
+is-builtin-module@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.0.tgz#bb0310dfe881f144ca83f30100ceb10cf58835e0"
+  integrity sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw==
+  dependencies:
+    builtin-modules "^3.3.0"
+
 is-callable@^1.1.3, is-callable@^1.2.6:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
@@ -5038,6 +5234,13 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
+is-core-module@^2.11.0, is-core-module@^2.5.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
+  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+  dependencies:
+    has "^1.0.3"
+
 is-core-module@^2.8.1:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
@@ -5115,7 +5318,12 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-plain-obj@^1.0.0:
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
+is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
@@ -5132,6 +5340,11 @@ is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -5310,19 +5523,16 @@ jintr@^0.3.1:
   dependencies:
     acorn "^8.8.0"
 
+js-sdsl@^4.1.4:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0"
+  integrity sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 js-yaml@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
@@ -5340,6 +5550,11 @@ jsesc@^2.5.1:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
+jsesc@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e"
+  integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==
+
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
@@ -5362,7 +5577,7 @@ json-parse-better-errors@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@^2.3.1:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -5404,6 +5619,16 @@ json5@^2.2.0, json5@^2.2.1:
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
 
+jsonc-eslint-parser@^2.0.4:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/jsonc-eslint-parser/-/jsonc-eslint-parser-2.1.0.tgz#4c126b530aa583d85308d0b3041ff81ce402bbb2"
+  integrity sha512-qCRJWlbP2v6HbmKW7R3lFbeiVWHo+oMJ0j+MizwvauqnCV/EvtAeEeuCgoc/ErtsuoKgYB8U4Ih8AxJbXoE6/g==
+  dependencies:
+    acorn "^8.5.0"
+    eslint-visitor-keys "^3.0.0"
+    espree "^9.0.0"
+    semver "^7.3.5"
+
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -5447,7 +5672,7 @@ keyv@^4.0.0:
   dependencies:
     json-buffer "3.0.1"
 
-kind-of@^6.0.2:
+kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -5457,6 +5682,11 @@ klona@^2.0.4:
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
   integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
 
+known-css-properties@^0.26.0:
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.26.0.tgz#008295115abddc045a9f4ed7e2a84dc8b3a77649"
+  integrity sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==
+
 labeled-stream-splicer@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz#42a41a16abcd46fd046306cf4f2c3576fffb1c21"
@@ -5544,6 +5774,11 @@ lilconfig@^2.0.3:
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4"
   integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==
 
+lines-and-columns@^1.1.6:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
+
 linkedom@^0.14.12:
   version "0.14.19"
   resolved "https://registry.yarnpkg.com/linkedom/-/linkedom-0.14.19.tgz#a8e9b91af26d5c631b5b3d21614cef1db8a56fb7"
@@ -5601,6 +5836,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -5702,6 +5944,16 @@ make-dir@^3.0.2:
   dependencies:
     semver "^6.0.0"
 
+map-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
+
+map-obj@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
+  integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
+
 marked@^4.2.5:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.5.tgz#979813dfc1252cc123a79b71b095759a32f42a5d"
@@ -5714,6 +5966,11 @@ matcher@^3.0.0:
   dependencies:
     escape-string-regexp "^4.0.0"
 
+mathml-tag-names@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
+  integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
+
 md5.js@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -5745,6 +6002,24 @@ memorystream@^0.3.1:
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
   integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
 
+meow@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
+  integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
+  dependencies:
+    "@types/minimist" "^1.2.0"
+    camelcase-keys "^6.2.2"
+    decamelize "^1.2.0"
+    decamelize-keys "^1.1.0"
+    hard-rejection "^2.1.0"
+    minimist-options "4.1.0"
+    normalize-package-data "^3.0.0"
+    read-pkg-up "^7.0.1"
+    redent "^3.0.0"
+    trim-newlines "^3.0.0"
+    type-fest "^0.18.0"
+    yargs-parser "^20.2.3"
+
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -5772,7 +6047,7 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^4.0.2, micromatch@^4.0.4:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -5832,6 +6107,11 @@ min-document@^2.19.0:
   dependencies:
     dom-walk "^0.1.0"
 
+min-indent@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
+
 mini-css-extract-plugin@^2.7.2:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz#e049d3ea7d3e4e773aad585c6cb329ce0c7b72d7"
@@ -5871,7 +6151,7 @@ minimatch@3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -5885,6 +6165,15 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimist-options@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
+  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
+  dependencies:
+    arrify "^1.0.1"
+    is-plain-obj "^1.1.0"
+    kind-of "^6.0.3"
+
 minimist@^1.1.0, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
@@ -6042,7 +6331,7 @@ node-releases@^2.0.6:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
   integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
-normalize-package-data@^2.3.2:
+normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -6052,6 +6341,16 @@ normalize-package-data@^2.3.2:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
+normalize-package-data@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
+  dependencies:
+    hosted-git-info "^4.0.1"
+    is-core-module "^2.5.0"
+    semver "^7.3.4"
+    validate-npm-package-license "^3.0.1"
+
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
@@ -6229,6 +6528,13 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -6243,6 +6549,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-retry@^4.5.0:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
@@ -6307,6 +6620,16 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse-json@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -6445,6 +6768,11 @@ plist@^3.0.1, plist@^3.0.4:
     base64-js "^1.5.1"
     xmlbuilder "^9.0.7"
 
+pluralize@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
+  integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==
+
 postcss-calc@^8.2.3:
   version "8.2.4"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5"
@@ -6491,6 +6819,11 @@ postcss-discard-overridden@^5.1.0:
   resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e"
   integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
 
+postcss-media-query-parser@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
+  integrity sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==
+
 postcss-merge-longhand@^5.1.6:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.6.tgz#f378a8a7e55766b7b644f48e5d8c789ed7ed51ce"
@@ -6655,6 +6988,29 @@ postcss-reduce-transforms@^5.1.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
+postcss-resolve-nested-selector@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
+  integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==
+
+postcss-safe-parser@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1"
+  integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==
+
+postcss-scss@^4.0.2, postcss-scss@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.6.tgz#5d62a574b950a6ae12f2aa89b60d63d9e4432bfd"
+  integrity sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==
+
+postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.6:
+  version "6.0.11"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
+  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
 postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
   version "6.0.10"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
@@ -6663,6 +7019,11 @@ postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
+postcss-sorting@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-7.0.1.tgz#923b5268451cf2d93ebf8835e17a6537757049a5"
+  integrity sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==
+
 postcss-svgo@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d"
@@ -6691,7 +7052,7 @@ postcss@^7.0.36:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.4.14, postcss@^8.4.17, postcss@^8.4.19:
+postcss@^8.3.11, postcss@^8.4.14, postcss@^8.4.17, postcss@^8.4.19, postcss@^8.4.20:
   version "8.4.20"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.20.tgz#64c52f509644cecad8567e949f4081d98349dc56"
   integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==
@@ -6735,7 +7096,7 @@ process@^0.11.10, process@~0.11.0:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
 
-progress@^2.0.0, progress@^2.0.3:
+progress@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -6832,6 +7193,11 @@ queue-microtask@^1.2.2:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
+quick-lru@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
+  integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
+
 quick-lru@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
@@ -6885,6 +7251,15 @@ read-only-stream@^2.0.0:
   dependencies:
     readable-stream "^2.0.2"
 
+read-pkg-up@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
+  dependencies:
+    find-up "^4.1.0"
+    read-pkg "^5.2.0"
+    type-fest "^0.8.1"
+
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -6894,6 +7269,16 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
+read-pkg@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
+
 readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
@@ -6930,6 +7315,14 @@ rechoir@^0.8.0:
   dependencies:
     resolve "^1.20.0"
 
+redent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
+  integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
+  dependencies:
+    indent-string "^4.0.0"
+    strip-indent "^3.0.0"
+
 regenerate-unicode-properties@^10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56"
@@ -6961,6 +7354,11 @@ regenerator-transform@^0.15.0:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
+regexp-tree@^0.1.24, regexp-tree@~0.1.1:
+  version "0.1.24"
+  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.24.tgz#3d6fa238450a4d66e5bc9c4c14bb720e2196829d"
+  integrity sha512-s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw==
+
 regexp.prototype.flags@^1.4.1, regexp.prototype.flags@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
@@ -6970,7 +7368,7 @@ regexp.prototype.flags@^1.4.1, regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
-regexpp@^3.0.0, regexpp@^3.1.0:
+regexpp@^3.0.0, regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
@@ -7102,7 +7500,7 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.1.4, resolve@^1.17.0, resolve@^1.4.0:
+resolve@^1.1.4, resolve@^1.17.0, resolve@^1.22.1, resolve@^1.4.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -7111,7 +7509,7 @@ resolve@^1.1.4, resolve@^1.17.0, resolve@^1.4.0:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0:
+resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -7204,6 +7602,13 @@ safe-regex-test@^1.0.0:
     get-intrinsic "^1.1.3"
     is-regex "^1.1.4"
 
+safe-regex@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-2.1.1.tgz#f7128f00d056e2fe5c11e81a1324dd974aadced2"
+  integrity sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==
+  dependencies:
+    regexp-tree "~0.1.1"
+
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -7279,12 +7684,12 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.3.8:
+semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.3.8:
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
   integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
@@ -7422,7 +7827,7 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.3:
+signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -7439,6 +7844,11 @@ simple-update-notifier@^1.0.7:
   dependencies:
     semver "~7.0.0"
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 slash@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
@@ -7584,11 +7994,6 @@ sprintf-js@^1.1.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
 sshpk@^1.7.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
@@ -7730,11 +8135,23 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
+strip-indent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
+  dependencies:
+    min-indent "^1.0.0"
+
 strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+style-search@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
+  integrity sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==
+
 stylehacks@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520"
@@ -7743,6 +8160,97 @@ stylehacks@^5.1.0:
     browserslist "^4.16.6"
     postcss-selector-parser "^6.0.4"
 
+stylelint-config-recommended@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz#1c9e07536a8cd875405f8ecef7314916d94e7e40"
+  integrity sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ==
+
+stylelint-config-sass-guidelines@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/stylelint-config-sass-guidelines/-/stylelint-config-sass-guidelines-9.0.1.tgz#3114ce780f2085ba9ea5da2b7d97a1e85e968fa7"
+  integrity sha512-N06PsVsrgKijQ3YT5hqKA7x3NUkgELTRI1cbWMqcYiCGG6MjzvNk6Cb5YYA1PrvrksBV76BvY9P9bAswojVMqA==
+  dependencies:
+    postcss-scss "^4.0.2"
+    stylelint-order "^5.0.0"
+    stylelint-scss "^4.0.0"
+
+stylelint-config-standard@^29.0.0:
+  version "29.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-29.0.0.tgz#4cc0e0f05512a39bb8b8e97853247d3a95d66fa2"
+  integrity sha512-uy8tZLbfq6ZrXy4JKu3W+7lYLgRQBxYTUUB88vPgQ+ZzAxdrvcaSUW9hOMNLYBnwH+9Kkj19M2DHdZ4gKwI7tg==
+  dependencies:
+    stylelint-config-recommended "^9.0.0"
+
+stylelint-high-performance-animation@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/stylelint-high-performance-animation/-/stylelint-high-performance-animation-1.7.0.tgz#c4b7da56e002d33c24328d6173f05e05f8efb0fe"
+  integrity sha512-Gq3tiCAhHU0WZBVwiCYKk+Kdkf1EeHyzDruRvDL9EhqrkpKxkktIzqmX+RM+Jn7s1sN9iAnoYIXPa0Py6d7j/Q==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+stylelint-order@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-5.0.0.tgz#abd20f6b85ac640774cbe40e70d3fe9c6fdf4400"
+  integrity sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==
+  dependencies:
+    postcss "^8.3.11"
+    postcss-sorting "^7.0.1"
+
+stylelint-scss@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.3.0.tgz#638800faf823db11fff60d537c81051fe74c90fa"
+  integrity sha512-GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ==
+  dependencies:
+    lodash "^4.17.21"
+    postcss-media-query-parser "^0.2.3"
+    postcss-resolve-nested-selector "^0.1.1"
+    postcss-selector-parser "^6.0.6"
+    postcss-value-parser "^4.1.0"
+
+stylelint@^14.16.1:
+  version "14.16.1"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.16.1.tgz#b911063530619a1bbe44c2b875fd8181ebdc742d"
+  integrity sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==
+  dependencies:
+    "@csstools/selector-specificity" "^2.0.2"
+    balanced-match "^2.0.0"
+    colord "^2.9.3"
+    cosmiconfig "^7.1.0"
+    css-functions-list "^3.1.0"
+    debug "^4.3.4"
+    fast-glob "^3.2.12"
+    fastest-levenshtein "^1.0.16"
+    file-entry-cache "^6.0.1"
+    global-modules "^2.0.0"
+    globby "^11.1.0"
+    globjoin "^0.1.4"
+    html-tags "^3.2.0"
+    ignore "^5.2.1"
+    import-lazy "^4.0.0"
+    imurmurhash "^0.1.4"
+    is-plain-object "^5.0.0"
+    known-css-properties "^0.26.0"
+    mathml-tag-names "^2.1.3"
+    meow "^9.0.0"
+    micromatch "^4.0.5"
+    normalize-path "^3.0.0"
+    picocolors "^1.0.0"
+    postcss "^8.4.19"
+    postcss-media-query-parser "^0.2.3"
+    postcss-resolve-nested-selector "^0.1.1"
+    postcss-safe-parser "^6.0.0"
+    postcss-selector-parser "^6.0.11"
+    postcss-value-parser "^4.2.0"
+    resolve-from "^5.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    style-search "^0.1.0"
+    supports-hyperlinks "^2.3.0"
+    svg-tags "^1.0.0"
+    table "^6.8.1"
+    v8-compile-cache "^2.3.0"
+    write-file-atomic "^4.0.2"
+
 subarg@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
@@ -7764,7 +8272,7 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.1.0:
+supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
@@ -7778,11 +8286,24 @@ supports-color@^8.0.0:
   dependencies:
     has-flag "^4.0.0"
 
+supports-hyperlinks@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
+  integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
+  dependencies:
+    has-flag "^4.0.0"
+    supports-color "^7.0.0"
+
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
+svg-tags@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
+  integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==
+
 svgo@^2.7.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24"
@@ -7803,10 +8324,10 @@ syntax-error@^1.1.1:
   dependencies:
     acorn-node "^1.2.0"
 
-table@^6.0.9:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca"
-  integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==
+table@^6.8.1:
+  version "6.8.1"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf"
+  integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==
   dependencies:
     ajv "^8.0.1"
     lodash.truncate "^4.4.2"
@@ -7934,6 +8455,11 @@ tree-kill@1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
+trim-newlines@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
+  integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
+
 truncate-utf8-bytes@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
@@ -7990,11 +8516,26 @@ type-fest@^0.13.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
   integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
 
+type-fest@^0.18.0:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
+  integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
+
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
 type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -8187,7 +8728,7 @@ uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache@^2.0.3:
+v8-compile-cache@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
@@ -8564,7 +9105,7 @@ which-typed-array@^1.1.8:
     has-tostringtag "^1.0.0"
     is-typed-array "^1.1.10"
 
-which@^1.2.9:
+which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -8602,6 +9143,14 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
+write-file-atomic@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
+  dependencies:
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.7"
+
 ws@^8.4.2:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz#e5e9f1d9e7ff88083d0c0dd8281ea662a42c9c23"
@@ -8654,11 +9203,16 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.2:
+yaml@^1.10.0, yaml@^1.10.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
+yargs-parser@^20.2.3:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
 yargs-parser@^21.0.0:
   version "21.0.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
@@ -8685,6 +9239,11 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
 youtubei.js@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-2.7.0.tgz#2b980f3e97c9b05097d3b387ff4f6a8d42a61e0d"

From 0d0d64d957be5548a6b6465dd2dd5ccf5eb6a9a9 Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Wed, 4 Jan 2023 02:20:16 +0800
Subject: [PATCH 217/301] ! Fix Ctrl/Cmd + C unable to copy text when viewing
 video (#3027)

---
 src/renderer/components/ft-video-player/ft-video-player.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
index 8a229b0335c4..e16e9ddac801 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -1822,6 +1822,11 @@ export default Vue.extend({
         return
       }
 
+      // allow copying text
+      if ((event.ctrlKey || event.metaKey) && event.key.lowercase() === 'c') {
+        return
+      }
+
       if (this.player !== null) {
         switch (event.key) {
           case ' ':

From fed27197dae6339e303b36c5c1cb9a3bfc8ec88d Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Wed, 4 Jan 2023 02:20:26 +0800
Subject: [PATCH 218/301] Add support for lefthook local config for setting up
 option `rc` (#2961)

* ^ Update lefthook to 1.2.6

* + Add support for lefthook local config for setting up option `rc`

https://github.com/evilmartians/lefthook/blob/master/docs/configuration.md#rc
---
 .gitignore                 |  3 ++
 lefthook-local.yml.example |  7 +++
 package.json               |  2 +-
 yarn.lock                  | 88 +++++++++++++++++++-------------------
 4 files changed, 55 insertions(+), 45 deletions(-)
 create mode 100644 lefthook-local.yml.example

diff --git a/.gitignore b/.gitignore
index 79dfea94c23f..2dbcd0748b75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,6 @@ __coverage__
 csak-timelog.json
 .idea/
 debug/
+
+# Lefthook
+lefthook-local.yml
diff --git a/lefthook-local.yml.example b/lefthook-local.yml.example
new file mode 100644
index 000000000000..db5a35b2f9a9
--- /dev/null
+++ b/lefthook-local.yml.example
@@ -0,0 +1,7 @@
+# See following doc for details
+# https://github.com/evilmartians/lefthook/blob/master/docs/configuration.md#rc
+
+# You can choose whatever name/path you want for `~/.lefthookrc`.
+# You can share it between projects where you use lefthook.
+# Make sure the path is absolute.
+rc: ~/.lefthookrc
diff --git a/package.json b/package.json
index 8184e4c69dff..6c1f837615f6 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,7 @@
     "html-webpack-plugin": "^5.3.2",
     "js-yaml": "^4.1.0",
     "json-minimizer-webpack-plugin": "^4.0.0",
-    "lefthook": "^1.2.4",
+    "lefthook": "^1.2.6",
     "mini-css-extract-plugin": "^2.7.2",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.20",
diff --git a/yarn.lock b/yarn.lock
index 983d2b80c0d9..83ec644e6be9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5700,59 +5700,59 @@ lazy-val@^1.0.4, lazy-val@^1.0.5:
   resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d"
   integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==
 
-lefthook-darwin-arm64@1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.2.4.tgz#78684f8d46f35604ca1a5300de78f424ea12ce68"
-  integrity sha512-c3pzGWT6YuStgH0BWzlOpghJSiQTDvoXbjOmlolBKbN46KSLwclbVbeSpp2vfAtuQvGP1RIo02aMYngsVjX5DA==
+lefthook-darwin-arm64@1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.2.6.tgz#31f7c41e3028b9edf9a909ae2b4f903a5fff706b"
+  integrity sha512-RlSzms0h859l74Nlz8oj7ZKXUysO998WhpqABX0uKdsK6QOuDjAMFmwvGx2MzcO7z8SGSlqkgqay4nFULGtvhw==
 
-lefthook-darwin-x64@1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lefthook-darwin-x64/-/lefthook-darwin-x64-1.2.4.tgz#364c48f812cad5ffc161aee54293610b26cffd28"
-  integrity sha512-7HrmSd9GR3pe2bKq0She2pvdGLjaB2KKlREDqbREfe+vWrC+WqzeV/xUncKk+8mz6BCHyPq0XfuZqsztluXN5w==
+lefthook-darwin-x64@1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/lefthook-darwin-x64/-/lefthook-darwin-x64-1.2.6.tgz#98bbb033c183a1bad7a7ddb38a84531274561364"
+  integrity sha512-9aWcuaM69ypAJCpNbF2CyDXwwi8EwQj/vqrPrLh0Nis5kheyRuBAgNSVslEE99ZGGZViNPWPx9hARsWK0ZxQAQ==
 
-lefthook-freebsd-arm64@1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.2.4.tgz#72d33877bbb25150fb4f06d0eb341bde922e9840"
-  integrity sha512-VkUoz3xrW70XJ82y3vAz1vfZOdUCe/8z4W2h3YMIBaR/Ovrt9PwtWHtSWEM5LrTBkgi1BbIP7hZtu7HbMw/siQ==
+lefthook-freebsd-arm64@1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.2.6.tgz#c5654d3da6df38819d01753a93d2c3aa10b039c7"
+  integrity sha512-PaY/OreTfNrSQBTl7GuggAKFT0U5p9re0ryjDJMWlkGD3UZfRosnyg5ZRH3HOjBchx2iXDrAeJBfg7a45sIc+A==
 
-lefthook-freebsd-x64@1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.2.4.tgz#1886f0045d60f13939cb184612201002c48533b2"
-  integrity sha512-e/ycIWt9WB3T/8KGy1aXY16AbVRGYXI4kw7jDp+GT5Lqile609mA9HCPubm4uPQK5PEtvYTB8R3c19LCDGqyeQ==
+lefthook-freebsd-x64@1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.2.6.tgz#3221e11c17dfe8f22dad56cc8bc373ecbceeaa6c"
+  integrity sha512-Ex5ehsPmXThN2eyckHeB6AbKCmxgV2wl27U5p16NH3bzJyXpWPlq6Sg1j2wkx1xLYIrMFwxgy9JVuR4EzOB96w==
 
-lefthook-linux-arm64@1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lefthook-linux-arm64/-/lefthook-linux-arm64-1.2.4.tgz#d2281f0436c263267517b7e63a41353f74161e8c"
-  integrity sha512-GDpfnt71Tx3+H14RcZr294of+ZTSANZ8v7dp86fATc2odZnvRCi31mGb2b0SjWGTvnsD9fnXcdvhOPsG2/+qIA==
+lefthook-linux-arm64@1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/lefthook-linux-arm64/-/lefthook-linux-arm64-1.2.6.tgz#f097663b37b5d3d87bc7ce15e70982d2d08a0c35"
+  integrity sha512-CUdw7PIi14LVHmPUDeNHQAcExpcuXrUP6GfnWyf2uQ/5nFSrDwtF0tSCEAtgJgm8Wh38dt5Qyyaxoz4WoGGvZA==
 
-lefthook-linux-x64@1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lefthook-linux-x64/-/lefthook-linux-x64-1.2.4.tgz#292cf3040fbeb1ec40168dd772ceddcc9d4166b9"
-  integrity sha512-wNVsG0oOZVYqK5RIYZgY7aYPCoVaWkx4SGpTQiPrgiVeXRm2AgY/+U7Pv6Nim9KZppQXemNjaA83dA0DvOOufg==
+lefthook-linux-x64@1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/lefthook-linux-x64/-/lefthook-linux-x64-1.2.6.tgz#ecbcda500d41a746265d84f615017fe447bc0658"
+  integrity sha512-UXyn2qLKfUQgHipoTYnvHWNagOMOdqyj0oqpIbEuE98/+7AR9OrQF6t7mpL+KDA4IRO8Ba6CcS1nYNxpBKN8kw==
 
-lefthook-windows-arm64@1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lefthook-windows-arm64/-/lefthook-windows-arm64-1.2.4.tgz#4c0688a4aec29d18845a17ea4ca9e5718265c699"
-  integrity sha512-t2xdxZQdbEYSlAaCwxJVphwmz1XQI9guGVkTfZEEbBswzNvDAUBr+w2l/ySDvA8fLrIyQI3D2czMQSslhAXqAQ==
+lefthook-windows-arm64@1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/lefthook-windows-arm64/-/lefthook-windows-arm64-1.2.6.tgz#466d7691c71888b8e1ba6347210788e3f6243878"
+  integrity sha512-gAwVbWdSKixxsixnMxfCqYXZ0NNW5sP87evmTvY6hezsYRFqjEgKsxCB1kf/epjlkZPQcN1s81uOYQLy4WKe1g==
 
-lefthook-windows-x64@1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lefthook-windows-x64/-/lefthook-windows-x64-1.2.4.tgz#30602ccf377edc512fcde0e1dd09d9cb8628f417"
-  integrity sha512-0K2UeSEAdMXDNHF8FSjGS/ZlAhfMDQ8lHSkBnGXF+68W7Uo62X27yDAJHKAMDjmQKh45V7NuDaVj8dq+m0mnwQ==
+lefthook-windows-x64@1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/lefthook-windows-x64/-/lefthook-windows-x64-1.2.6.tgz#85a019ec04355345c8a6941ad4eb497130642860"
+  integrity sha512-F0JCXgTBfyfCQ7HegVvGVsijWXd2J7LA4iY5fsBNV4stPRMXHnr8RGUbxViprmKudUjcuog1xuGjqNWja8rfNA==
 
-lefthook@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lefthook/-/lefthook-1.2.4.tgz#ef3ba657210cbc3d048b2fc5efc267fd0ef99180"
-  integrity sha512-DQOqqub4WmRFDsiTBye5GWy2TIsGdtJmkOrkK3zYBmUWoD7nuHodtMI4+JgrDgHCC1crB8LV/pMSaQOo2dsOHA==
+lefthook@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/lefthook/-/lefthook-1.2.6.tgz#9739a83cd21d89329339c73ad347002e0e86d550"
+  integrity sha512-vv3w6gDmFXID89wvrOGMHKbE47UmUVQN0aG4u2UMHGZ0rB8at7glMFnpuWT9361DciBz3lEFGYD4MK5APLoH2Q==
   optionalDependencies:
-    lefthook-darwin-arm64 "1.2.4"
-    lefthook-darwin-x64 "1.2.4"
-    lefthook-freebsd-arm64 "1.2.4"
-    lefthook-freebsd-x64 "1.2.4"
-    lefthook-linux-arm64 "1.2.4"
-    lefthook-linux-x64 "1.2.4"
-    lefthook-windows-arm64 "1.2.4"
-    lefthook-windows-x64 "1.2.4"
+    lefthook-darwin-arm64 "1.2.6"
+    lefthook-darwin-x64 "1.2.6"
+    lefthook-freebsd-arm64 "1.2.6"
+    lefthook-freebsd-x64 "1.2.6"
+    lefthook-linux-arm64 "1.2.6"
+    lefthook-linux-x64 "1.2.6"
+    lefthook-windows-arm64 "1.2.6"
+    lefthook-windows-x64 "1.2.6"
 
 levn@^0.4.1:
   version "0.4.1"

From 68d4915dea558851a4fbbdcd5ef1dc9b3e77d624 Mon Sep 17 00:00:00 2001
From: The Cats <philosoph@snopyta.org>
Date: Tue, 3 Jan 2023 17:28:39 +0000
Subject: [PATCH 219/301] Translated using Weblate (French)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/fr/
---
 static/locales/fr-FR.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/fr-FR.yaml b/static/locales/fr-FR.yaml
index 213c225bfcd1..4d4c6c7d6892 100644
--- a/static/locales/fr-FR.yaml
+++ b/static/locales/fr-FR.yaml
@@ -409,6 +409,8 @@ Settings:
     Hide Upcoming Premieres: Cacher les avant-premières à venir
     Hide Channels: Masquer les vidéos des chaînes
     Hide Channels Placeholder: Nom ou identifiant de la chaîne
+    Display Titles Without Excessive Capitalisation: Afficher les titres sans majuscules
+      excessives
   The app needs to restart for changes to take effect. Restart and apply change?: L'application
     doit être redémarrée pour que les changements prennent effet. Redémarrer et appliquer
     les changements ?

From 1d8a43e882fbb960f9dc2d87e7b9a855ba23398c Mon Sep 17 00:00:00 2001
From: The Cats <philosoph@snopyta.org>
Date: Tue, 3 Jan 2023 17:20:28 +0000
Subject: [PATCH 220/301] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt_BR/
---
 static/locales/pt-BR.yaml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/static/locales/pt-BR.yaml b/static/locales/pt-BR.yaml
index ba3f02d035c2..2a53ea0f3eaa 100644
--- a/static/locales/pt-BR.yaml
+++ b/static/locales/pt-BR.yaml
@@ -266,6 +266,7 @@ Settings:
         do vídeo 3 dígitos. %i ID do vídeo. Você também pode usar "\" ou "/" para
         criar subpastas.
     Enter Fullscreen on Display Rotate: Entrar em tela cheia ao girar a tela
+    Skip by Scrolling Over Video Player: Pular rolando o tocador de vídeo
   Subscription Settings:
     Subscription Settings: 'Configurações de inscrições'
     Hide Videos on Watch: 'Esconder vídeos após assisti-los'
@@ -393,6 +394,10 @@ Settings:
     Hide Live Streams: Ocultar transmissões ao vivo
     Hide Chapters: Ocultar capítulos
     Hide Upcoming Premieres: Ocultar as Próximas Estréias
+    Hide Channels Placeholder: Nome ou ID do Canal
+    Display Titles Without Excessive Capitalisation: Mostrar Títulos sem Capitalização
+      Excessiva
+    Hide Channels: Ocultar Vídeos dos Canais
   The app needs to restart for changes to take effect. Restart and apply change?: O
     aplicativo necessita reiniciar para as mudanças fazerem efeito. Reiniciar e aplicar
     mudança?
@@ -453,6 +458,16 @@ Settings:
       enquanto ativadas. Fazer backups é altamente recomendado. Use por sua conta
       e risco!
     Replace HTTP Cache: Repor Cache HTTP
+  Password Settings:
+    Password Settings: Configurações de senha
+    Set Password: Definir Senha
+    Remove Password: Remover senha
+    Set Password To Prevent Access: Defina uma senha para impedir o acesso às configurações
+  Password Dialog:
+    Unlock: Desbloquear
+    Password Incorrect: Senha Incorreta
+    Password: Senha
+    Enter Password To Unlock: Digite a senha para desbloquear as configurações
 About:
   #On About page
   About: 'Sobre'
@@ -680,6 +695,8 @@ Video:
     Dropped / Total Frames: Quadros perdidos / Total de quadros
   Premieres in: Estréias em
   Premieres: Estreia
+  Scroll to Bottom: Rolar para o final
+  Show Super Chat Comment: Mostrar Comentários do Super Chat
 Videos:
   #& Sort By
   Sort By:
@@ -759,6 +776,8 @@ Comments:
   And others: e outros
   From {channelName}: de {channelName}
   Member: Membro
+  Hearted: Coração
+  View {replyCount} replies: Exibir {replyCount} respostas
 Up Next: 'Próximo'
 
 # Toast Messages
@@ -860,6 +879,8 @@ Tooltips:
       a tecla Control (tecla Command no Mac) e clique com o botão esquerdo do mouse
       para retornar rapidamente à taxa de reprodução padrão (1x a menos que tenha
       sido alterada nas configurações).
+    Skip by Scrolling Over Video Player: Use a roda de rolagem para pular o vídeo,
+      estilo MPV.
   General Settings:
     Region for Trending: A região de tendências lhe permite de escolher quais vídeos
       de tendências do país você quer exibir. Nem todos os países exibidos são realmente
@@ -897,6 +918,10 @@ Tooltips:
   Experimental Settings:
     Replace HTTP Cache: Desabilita o cache HTTP baseado em disco do Electron e habilita
       um cache de imagem em memória personalizado. Levará ao aumento do uso de RAM.
+  Distraction Free Settings:
+    Hide Channels: Digite um nome ou ID de canal para ocultar todos os vídeos, listas
+      de reprodução e o próprio canal dos resultados da busca ou nas tendências. O
+      nome do canal digitado deve coincidir exatamente, observando maiúsculas e minúsculas.
 More: Mais
 Playing Next Video Interval: Reproduzindo o próximo vídeo imediatamente. Clique para
   cancelar. | Reproduzindo o próximo vídeo em {nextVideoInterval} segundo(s). Clique
@@ -949,3 +974,4 @@ Chapters:
   'Chapters list hidden, current chapter: {chapterName}': 'Lista oculta de capítulos,
     capítulo atual: {chapterName}'
   Chapters: Capítulos
+Ok: Ok

From 28ca02729f2ae66e6d583d048d7500014e65c03f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Jan 2023 22:13:59 +0100
Subject: [PATCH 221/301] Bump json5 from 1.0.1 to 1.0.2 (#3029)

Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 83ec644e6be9..da45a7e79ff1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5608,9 +5608,9 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
@@ -6174,12 +6174,7 @@ minimist-options@4.1.0:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@^1.1.0, minimist@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
-
-minimist@^1.2.0:
+minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==

From 4e2da8e48386c78d9c3b5041f0c4bbc309be8d03 Mon Sep 17 00:00:00 2001
From: Milo Ivir <mail@milotype.de>
Date: Tue, 3 Jan 2023 22:46:00 +0000
Subject: [PATCH 222/301] Translated using Weblate (Croatian)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/hr/
---
 static/locales/hr.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/hr.yaml b/static/locales/hr.yaml
index 57e78ffc11eb..538ae2d4fcd4 100644
--- a/static/locales/hr.yaml
+++ b/static/locales/hr.yaml
@@ -390,6 +390,8 @@ Settings:
     Hide Upcoming Premieres: Sakrij nadolazeće premijere
     Hide Channels: Sakrij videa iz kanala
     Hide Channels Placeholder: Ime kanala ili ID
+    Display Titles Without Excessive Capitalisation: Prikaži naslove bez pretjeranog
+      korištenja velikih slova
   The app needs to restart for changes to take effect. Restart and apply change?: Promjene
     će se primijeniti nakon ponovnog pokeretanja programa. Ponovo pokrenuti program?
   Proxy Settings:

From 57ca0fc82e9176262ff25cba58c3bc7064532e25 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Wed, 4 Jan 2023 10:35:04 +0100
Subject: [PATCH 223/301] Fix CSS variables (#3030)

---
 .../ft-age-restricted/ft-age-restricted.scss  |  6 +--
 .../ft-icon-button/ft-icon-button.scss        | 40 +++++++++----------
 .../ft-list-video/ft-list-video.scss          |  2 +-
 .../ft-settings-section.scss                  |  4 +-
 .../ft-share-button/ft-share-button.scss      |  4 +-
 .../ft-toggle-switch/ft-toggle-switch.scss    |  4 +-
 .../playlist-info/playlist-info.scss          |  2 +-
 src/renderer/components/top-nav/top-nav.scss  | 38 +++++++++---------
 .../watch-video-info/watch-video-info.scss    |  4 +-
 src/renderer/scss-partials/_ft-list-item.scss | 28 ++++++-------
 src/renderer/views/About/About.scss           |  2 +-
 11 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/src/renderer/components/ft-age-restricted/ft-age-restricted.scss b/src/renderer/components/ft-age-restricted/ft-age-restricted.scss
index b553283ea208..a30ab65b880b 100644
--- a/src/renderer/components/ft-age-restricted/ft-age-restricted.scss
+++ b/src/renderer/components/ft-age-restricted/ft-age-restricted.scss
@@ -1,15 +1,15 @@
 .ft-age-restricted {
-  color: var(primary-text-color);
+  color: var(--primary-text-color);
 
   h2 {
-    background-color: var(card-bg-color);
+    background-color: var(--card-bg-color);
     padding: 10px 0;
     text-align: center;
     width: 100%;
   }
 
   .frown {
-    background-color: var(card-bg-color);
+    background-color: var(--card-bg-color);
     font-size: 10em;
     height: 100%;
     padding: 20px 0;
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.scss b/src/renderer/components/ft-icon-button/ft-icon-button.scss
index 0ee4f97fa761..ce73f8a22fea 100644
--- a/src/renderer/components/ft-icon-button/ft-icon-button.scss
+++ b/src/renderer/components/ft-icon-button/ft-icon-button.scss
@@ -18,63 +18,63 @@
   }
 
   &.base {
-    background-color: var(card-bg-color);
-    color: var(primary-text-color);
+    background-color: var(--card-bg-color);
+    color: var(--primary-text-color);
 
     &:hover {
-      background-color: var(side-nav-hover-color);
+      background-color: var(--side-nav-hover-color);
     }
 
     &:active {
-      background-color: var(side-nav-active-color);
+      background-color: var(--side-nav-active-color);
     }
   }
 
   &.base-no-default {
     &:hover {
-      background-color: var(side-nav-hover-color);
+      background-color: var(--side-nav-hover-color);
     }
 
     &:active {
-      background-color: var(side-nav-active-color);
+      background-color: var(--side-nav-active-color);
     }
   }
 
   &.primary {
-    background-color: var(primary-color);
-    color: var(text-with-main-color);
+    background-color: var(--primary-color);
+    color: var(--text-with-main-color);
 
     &:hover {
-      background-color: var(primary-color-hover);
+      background-color: var(--primary-color-hover);
     }
 
     &:active {
-      background-color: var(primary-color-active);
+      background-color: var(--primary-color-active);
     }
   }
 
   &.secondary {
-    background-color: var(accent-color);
-    color: var(text-with-accent-color);
+    background-color: var(--accent-color);
+    color: var(--text-with-accent-color);
 
     &:hover {
-      background-color: var(accent-color-hover);
+      background-color: var(--accent-color-hover);
     }
 
     &:active {
-      background-color: var(accent-color-active);
+      background-color: var(--accent-color-active);
     }
   }
 
   &.favorite {
-    color: var(favorite-icon-color);
+    color: var(--favorite-icon-color);
   }
 }
 
 .iconDropdown {
-  background-color: var(side-nav-color);
+  background-color: var(--side-nav-color);
   box-shadow: 0 1px 2px rgb(0 0 0 / 50%);
-  color: var(secondary-text-color);
+  color: var(--secondary-text-color);
   display: inline;
   font-size: 12px;
   list-style-type: none;
@@ -107,18 +107,18 @@
 
     &:hover,
     &:focus {
-      background-color: var(side-nav-hover-color);
+      background-color: var(--side-nav-hover-color);
       transition: background 0.2s ease-in;
     }
 
     &:active {
-      background-color: var(side-nav-active-color);
+      background-color: var(--side-nav-active-color);
       transition: background 0.1s ease-in;
     }
   }
 
   .listItemDivider {
-    border-top: 1px solid var(tertiary-text-color);
+    border-top: 1px solid var(--tertiary-text-color);
     margin: 1px auto;
     // Too "visible" with current color
     opacity: 0.5;
diff --git a/src/renderer/components/ft-list-video/ft-list-video.scss b/src/renderer/components/ft-list-video/ft-list-video.scss
index 8f6f167852af..9969e06fc852 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.scss
+++ b/src/renderer/components/ft-list-video/ft-list-video.scss
@@ -1,5 +1,5 @@
 @use '../../scss-partials/_ft-list-item';
 
 .thumbnailLink:hover {
-  outline: 3px solid var(side-nav-hover-color);
+  outline: 3px solid var(--side-nav-hover-color);
 }
diff --git a/src/renderer/components/ft-settings-section/ft-settings-section.scss b/src/renderer/components/ft-settings-section/ft-settings-section.scss
index 60e91e1e3508..72be54b11545 100644
--- a/src/renderer/components/ft-settings-section/ft-settings-section.scss
+++ b/src/renderer/components/ft-settings-section/ft-settings-section.scss
@@ -1,5 +1,5 @@
 .settingsSection {
-  background-color: var(card-bg-color);
+  background-color: var(--card-bg-color);
   margin: 0 auto;
   width: 85%;
 
@@ -25,7 +25,7 @@
 }
 
 .sectionLine {
-  background-color: var(primary-color);
+  background-color: var(--primary-color);
   border: 0;
   height: 2px;
   margin-top: -1px;
diff --git a/src/renderer/components/ft-share-button/ft-share-button.scss b/src/renderer/components/ft-share-button/ft-share-button.scss
index dde24b4e7fdd..03e54f4d3b58 100644
--- a/src/renderer/components/ft-share-button/ft-share-button.scss
+++ b/src/renderer/components/ft-share-button/ft-share-button.scss
@@ -6,7 +6,7 @@
   width: max-content;
 
   .header {
-    color: var(primary-text-color);
+    color: var(--primary-text-color);
     font-size: 18px;
     font-weight: bold;
     margin: 4px 0 8px;
@@ -22,7 +22,7 @@
   }
 
   .divider {
-    background: var(tertiary-text-color);
+    background: var(--tertiary-text-color);
     grid-row: span 3;
     margin: 0 12px;
     width: 1px;
diff --git a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.scss b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.scss
index cf9aace811f2..d116fcf7450e 100644
--- a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.scss
+++ b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.scss
@@ -46,7 +46,7 @@
     width: 34px;
 
     .switch-input:checked + & {
-      background-color: var(accent-color-light);
+      background-color: var(--accent-color-light);
     }
 
     .switch-input:disabled + & {
@@ -63,7 +63,7 @@
     width: 20px;
 
     .switch-input:checked + & {
-      background-color: var(accent-color);
+      background-color: var(--accent-color);
       transform: translate(80%, -50%);
     }
 
diff --git a/src/renderer/components/playlist-info/playlist-info.scss b/src/renderer/components/playlist-info/playlist-info.scss
index 2adcb9511c7e..afc836fc3584 100644
--- a/src/renderer/components/playlist-info/playlist-info.scss
+++ b/src/renderer/components/playlist-info/playlist-info.scss
@@ -16,7 +16,7 @@
 }
 
 .playlistStats p {
-  color: var(secondary-text-color);
+  color: var(--secondary-text-color);
   margin: 0;
 }
 
diff --git a/src/renderer/components/top-nav/top-nav.scss b/src/renderer/components/top-nav/top-nav.scss
index d8ccdc28e870..a734b381669d 100644
--- a/src/renderer/components/top-nav/top-nav.scss
+++ b/src/renderer/components/top-nav/top-nav.scss
@@ -10,8 +10,8 @@
 .topNav {
   align-content: center;
   align-items: center;
-  background-color: var(card-bg-color);
-  box-shadow: 0 2px 1px 0 var(primary-shadow-color);
+  background-color: var(--card-bg-color);
+  box-shadow: 0 2px 1px 0 var(--primary-shadow-color);
   display: flex;
   height: 60px;
   left: 0;
@@ -28,7 +28,7 @@
   }
 
   @include top-nav-is-colored {
-    background-color: var(primary-color);
+    background-color: var(--primary-color);
   }
 
   @media only screen and (max-width: 680px) {
@@ -44,7 +44,7 @@
 
 .navIcon {
   border-radius: 50%;
-  color: var(primary-text-color);
+  color: var(--primary-text-color);
   cursor: pointer;
   font-size: 20px;
   height: 1em;
@@ -53,10 +53,10 @@
   width: 1em;
 
   @include top-nav-is-colored {
-    color: var(text-with-main-color);
+    color: var(--text-with-main-color);
 
     &:hover {
-      background-color: var(primary-color-hover);
+      background-color: var(--primary-color-hover);
     }
   }
 
@@ -69,16 +69,16 @@
   }
 
   &:hover {
-    background-color: var(side-nav-hover-color);
+    background-color: var(--side-nav-hover-color);
     transition: background 0.2s ease-in;
   }
 
   &:active {
-    background-color: var(tertiary-text-color);
+    background-color: var(--tertiary-text-color);
     transition: background 0.2s ease-in;
 
     @include top-nav-is-colored {
-      background-color: var(primary-color-active);
+      background-color: var(--primary-color-active);
     }
   }
 }
@@ -89,10 +89,10 @@
   margin-left: $effect-distance;
 
   &.filterChanged {
-    box-shadow: 0 0 $effect-distance var(primary-color);
+    box-shadow: 0 0 $effect-distance var(--primary-color);
 
     @include top-nav-is-colored {
-      box-shadow: 0 0 $effect-distance var(text-with-main-color);
+      box-shadow: 0 0 $effect-distance var(--text-with-main-color);
     }
   }
 }
@@ -126,16 +126,16 @@
     padding: 0 25px 0 10px;
 
     &:active {
-      background-color: var(tertiary-text-color);
+      background-color: var(--tertiary-text-color);
       transition: background 0.2s ease-in;
 
       @include top-nav-is-colored {
-        background-color: var(primary-color-active);
+        background-color: var(--primary-color-active);
       }
     }
 
     .logoIcon {
-      background-image: var(logo-icon);
+      background-image: var(--logo-icon);
       background-position: right top;
       background-repeat: no-repeat;
       background-size: 25px;
@@ -143,12 +143,12 @@
       width: 25px;
 
       @include top-nav-is-colored {
-        background-image: var(logo-icon-bar-color);
+        background-image: var(--logo-icon-bar-color);
       }
     }
 
     .logoText {
-      background-image: var(logo-text);
+      background-image: var(--logo-text);
       background-position: right top;
       background-repeat: no-repeat;
       background-size: 100px;
@@ -163,7 +163,7 @@
       }
 
       @include top-nav-is-colored {
-        background-image: var(logo-text-bar-color);
+        background-image: var(--logo-text-bar-color);
       }
     }
   }
@@ -178,14 +178,14 @@
     display: flex;
 
     @media only screen and (max-width: 680px) {
-      background-color: var(side-nav-color);
+      background-color: var(--side-nav-color);
       left: 0;
       position: fixed;
       right: 0;
       top: 60px;
 
       @include top-nav-is-colored {
-        background-color: var(primary-color-hover);
+        background-color: var(--primary-color-hover);
       }
     }
 
diff --git a/src/renderer/components/watch-video-info/watch-video-info.scss b/src/renderer/components/watch-video-info/watch-video-info.scss
index 67f2070e5943..5dd5784c4058 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.scss
+++ b/src/renderer/components/watch-video-info/watch-video-info.scss
@@ -52,7 +52,7 @@
 
 .viewCount,
 .datePublished {
-  color: var(secondary-text-color);
+  color: var(--secondary-text-color);
   font-size: 15px;
   text-align: right;
 
@@ -74,7 +74,7 @@
 }
 
 .likeSection {
-  color: var(tertiary-text-color);
+  color: var(--tertiary-text-color);
   display: flex;
   flex-direction: column;
   font-size: 16px;
diff --git a/src/renderer/scss-partials/_ft-list-item.scss b/src/renderer/scss-partials/_ft-list-item.scss
index 806fdea65f0b..12dc9103d24d 100644
--- a/src/renderer/scss-partials/_ft-list-item.scss
+++ b/src/renderer/scss-partials/_ft-list-item.scss
@@ -40,7 +40,7 @@ $watched-transition-duration: 0.5s;
   @at-root {
     .watched &,
     .watched#{&} {
-      color: var(tertiary-text-color);
+      color: var(--tertiary-text-color);
       transition-duration: $watched-transition-duration;
     }
     .watched:hover &,
@@ -55,9 +55,9 @@ $watched-transition-duration: 0.5s;
   padding: 6px;
 
   &.watched {
-    @include low-contrast-when-watched(var(primary-text-color));
+    @include low-contrast-when-watched(var(--primary-text-color));
 
-    background-color: var(bg-color);
+    background-color: var(--bg-color);
 
     .thumbnailImage {
       opacity: 0.3;
@@ -89,8 +89,8 @@ $watched-transition-duration: 0.5s;
     }
 
     .videoWatched {
-      background-color: var(bg-color);
-      color: var(primary-text-color);
+      background-color: var(--bg-color);
+      color: var(--primary-text-color);
       opacity: $thumbnail-overlay-opacity;
       padding: 2px;
       pointer-events: none;
@@ -99,10 +99,10 @@ $watched-transition-duration: 0.5s;
     }
 
     .videoDuration {
-      background-color: var(card-bg-color);
+      background-color: var(--card-bg-color);
       border-radius: 5px;
       bottom: 4px;
-      color: var(primary-text-color);
+      color: var(--primary-text-color);
       font-size: 15px;
       line-height: 1.2;
       margin: 0;
@@ -139,7 +139,7 @@ $watched-transition-duration: 0.5s;
     }
 
     .watchedProgressBar {
-      background-color: var(primary-color);
+      background-color: var(--primary-color);
       bottom: 0;
       height: 2px;
       max-width: 100%;
@@ -165,13 +165,13 @@ $watched-transition-duration: 0.5s;
       }
 
       .background {
-        background-color: var(bg-color);
+        background-color: var(--bg-color);
         opacity: 0.9;
       }
 
       .inner {
         align-items: center;
-        color: var(primary-text-color);
+        color: var(--primary-text-color);
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -202,7 +202,7 @@ $watched-transition-duration: 0.5s;
     }
 
     .title {
-      @include low-contrast-when-watched(var(primary-text-color));
+      @include low-contrast-when-watched(var(--primary-text-color));
 
       font-size: 20px;
       text-decoration: none;
@@ -223,16 +223,16 @@ $watched-transition-duration: 0.5s;
       }
 
       & {
-        @include low-contrast-when-watched(var(secondary-text-color));
+        @include low-contrast-when-watched(var(--secondary-text-color));
       }
 
       .channelName {
-        @include low-contrast-when-watched(var(secondary-text-color));
+        @include low-contrast-when-watched(var(--secondary-text-color));
       }
     }
 
     .description {
-      @include low-contrast-when-watched(var(secondary-text-color));
+      @include low-contrast-when-watched(var(--secondary-text-color));
 
       font-size: 14px;
       max-height: 50px;
diff --git a/src/renderer/views/About/About.scss b/src/renderer/views/About/About.scss
index b2499795d39e..5d683607044e 100644
--- a/src/renderer/views/About/About.scss
+++ b/src/renderer/views/About/About.scss
@@ -35,7 +35,7 @@
 
 .chunk {
   align-items: start;
-  background-color: var(bg-color);
+  background-color: var(--bg-color);
   border-radius: 8px;
   box-shadow: 0 1px 4px -1px rgb(0 0 0 / 50%);
   display: grid;

From 6dce9b85ee0ddfec490d8b6cf1fd3054c99c22ab Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Wed, 4 Jan 2023 14:51:10 +0000
Subject: [PATCH 224/301] Translated using Weblate (Arabic)

Currently translated at 100.0% (658 of 658 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ar/
---
 static/locales/ar.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/locales/ar.yaml b/static/locales/ar.yaml
index c009c220f845..988a790a89d7 100644
--- a/static/locales/ar.yaml
+++ b/static/locales/ar.yaml
@@ -384,6 +384,8 @@ Settings:
     Hide Upcoming Premieres: إخفاء العروض الأولى القادمة
     Hide Channels: إخفاء مقاطع الفيديو من القنوات
     Hide Channels Placeholder: اسم القناة أو معرفها
+    Display Titles Without Excessive Capitalisation: عرض العناوين بدون احرف كبيرة
+      بشكل مفرط
   The app needs to restart for changes to take effect. Restart and apply change?: البرنامج
     يحتاج لإعادة التشغيل كي يسري مفعول التغييرات. هل تريد إعادة التشغيل و تطبيق التغييرات؟
   Proxy Settings:

From b1574955529196a3337d7cf7e78ed4268b2bc19d Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Thu, 5 Jan 2023 04:53:39 +0100
Subject: [PATCH 225/301] Add more electron guards (#3031)

---
 src/index.ejs                                               | 6 +++++-
 src/renderer/components/data-settings/data-settings.js      | 2 +-
 src/renderer/components/top-nav/top-nav.js                  | 2 +-
 .../components/watch-video-comments/watch-video-comments.js | 2 +-
 .../components/watch-video-playlist/watch-video-playlist.js | 2 +-
 src/renderer/views/Channel/Channel.js                       | 6 +++---
 src/renderer/views/Playlist/Playlist.js                     | 2 +-
 src/renderer/views/Search/Search.js                         | 2 +-
 src/renderer/views/Subscriptions/Subscriptions.js           | 4 ++--
 src/renderer/views/Watch/Watch.js                           | 4 ++--
 10 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/index.ejs b/src/index.ejs
index 9fd3136e3ffa..1a224ca4a4a2 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -5,7 +5,9 @@
     <meta charset="utf-8" />
     <meta name="viewport"
           content="width=device-width, initial-scale=1.0" />
+    <% if (!process.env.IS_ELECTRON) { %>
     <link rel="manifest" href="static/manifest.json" />
+    <% } %>
     <title></title>
     <% if (htmlWebpackPlugin.options.nodeModules) { %>
     <script>
@@ -18,13 +20,14 @@
 
   <body>
     <div id="app"></div>
+    <% if (!process.env.IS_ELECTRON) { %>
     <script>
     // This is the service worker with the Advanced caching
 
     // Add this below content to your HTML page, or add the js file to your page at the very top to register service worker
 
     // Check compatibility for the browser we're running this in
-    if ("serviceWorker" in navigator && !<%= process.env.IS_ELECTRON %>) {
+    if ("serviceWorker" in navigator) {
       if (navigator.serviceWorker.controller) {
         console.log("[PWA Builder] active service worker found, no need to register");
       } else {
@@ -39,6 +42,7 @@
       }
     }
     </script>
+    <% } %>
     <!-- webpack builds are automatically injected -->
   </body>
 
diff --git a/src/renderer/components/data-settings/data-settings.js b/src/renderer/components/data-settings/data-settings.js
index 14b7ad982971..854c762d30ec 100644
--- a/src/renderer/components/data-settings/data-settings.js
+++ b/src/renderer/components/data-settings/data-settings.js
@@ -1027,7 +1027,7 @@ export default Vue.extend({
             copyToClipboard(err.responseJSON.error)
           })
 
-          if (this.backendFallback && this.backendPreference === 'invidious') {
+          if (process.env.IS_ELECTRON && this.backendFallback && this.backendPreference === 'invidious') {
             showToast(this.$t('Falling back to the local API'))
             resolve(this.getChannelInfoLocal(channelId))
           } else {
diff --git a/src/renderer/components/top-nav/top-nav.js b/src/renderer/components/top-nav/top-nav.js
index 2c7c26b27f47..d948f0d19e97 100644
--- a/src/renderer/components/top-nav/top-nav.js
+++ b/src/renderer/components/top-nav/top-nav.js
@@ -261,7 +261,7 @@ export default Vue.extend({
         this.searchSuggestionsDataList = results.suggestions
       }).catch((err) => {
         console.error(err)
-        if (this.backendFallback) {
+        if (process.env.IS_ELECTRON && this.backendFallback) {
           console.error(
             'Error gettings search suggestions.  Falling back to Local API'
           )
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.js b/src/renderer/components/watch-video-comments/watch-video-comments.js
index 61259d30673f..dcc517637e76 100644
--- a/src/renderer/components/watch-video-comments/watch-video-comments.js
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.js
@@ -299,7 +299,7 @@ export default Vue.extend({
         showToast(`${errorMessage}: ${xhr.responseText}`, 10000, () => {
           copyToClipboard(xhr.responseText)
         })
-        if (this.backendFallback && this.backendPreference === 'invidious') {
+        if (process.env.IS_ELECTRON && this.backendFallback && this.backendPreference === 'invidious') {
           showToast(this.$t('Falling back to local API'))
           this.getCommentDataLocal()
         } else {
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.js b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
index c9d78fff42e7..247730c6890b 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.js
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
@@ -334,7 +334,7 @@ export default Vue.extend({
         showToast(`${errorMessage}: ${err}`, 10000, () => {
           copyToClipboard(err)
         })
-        if (this.backendPreference === 'invidious' && this.backendFallback) {
+        if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
           showToast(this.$t('Falling back to Local API'))
           this.getPlaylistInformationLocal()
         } else {
diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index 4550ddf1f12c..77fcfa551a48 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -495,7 +495,7 @@ export default Vue.extend({
         showToast(`${errorMessage}: ${err.responseJSON.error}`, 10000, () => {
           copyToClipboard(err.responseJSON.error)
         })
-        if (this.backendPreference === 'invidious' && this.backendFallback) {
+        if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
           showToast(this.$t('Falling back to Local API'))
           this.getPlaylistsLocal()
         } else {
@@ -532,7 +532,7 @@ export default Vue.extend({
         showToast(`${errorMessage}: ${err.responseJSON.error}`, 10000, () => {
           copyToClipboard(err.responseJSON.error)
         })
-        if (this.backendPreference === 'invidious' && this.backendFallback) {
+        if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
           showToast(this.$t('Falling back to Local API'))
           this.getPlaylistsLocal()
         } else {
@@ -727,7 +727,7 @@ export default Vue.extend({
         showToast(`${errorMessage}: ${err}`, 10000, () => {
           copyToClipboard(err)
         })
-        if (this.backendPreference === 'invidious' && this.backendFallback) {
+        if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
           showToast(this.$t('Falling back to Local API'))
           this.searchChannelLocal()
         } else {
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index 9d007f36d9e2..998fc9e62dbf 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -157,7 +157,7 @@ export default Vue.extend({
         this.isLoading = false
       }).catch((err) => {
         console.error(err)
-        if (this.backendPreference === 'invidious' && this.backendFallback) {
+        if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
           console.warn('Error getting data with Invidious, falling back to local backend')
           this.getPlaylistLocal()
         } else {
diff --git a/src/renderer/views/Search/Search.js b/src/renderer/views/Search/Search.js
index 0b762d76db50..02287a52e68b 100644
--- a/src/renderer/views/Search/Search.js
+++ b/src/renderer/views/Search/Search.js
@@ -268,7 +268,7 @@ export default Vue.extend({
         showToast(`${errorMessage}: ${err}`, 10000, () => {
           copyToClipboard(err)
         })
-        if (this.backendPreference === 'invidious' && this.backendFallback) {
+        if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
           showToast(this.$t('Falling back to Local API'))
           this.performSearchLocal(payload)
         } else {
diff --git a/src/renderer/views/Subscriptions/Subscriptions.js b/src/renderer/views/Subscriptions/Subscriptions.js
index 3f326f07d47f..fdd0365d3f55 100644
--- a/src/renderer/views/Subscriptions/Subscriptions.js
+++ b/src/renderer/views/Subscriptions/Subscriptions.js
@@ -375,7 +375,7 @@ export default Vue.extend({
               resolve(this.getChannelVideosInvidiousRSS(channel, failedAttempts + 1))
               break
             case 1:
-              if (this.backendFallback) {
+              if (process.env.IS_ELECTRON && this.backendFallback) {
                 showToast(this.$t('Falling back to the local API'))
                 resolve(this.getChannelVideosLocalScraper(channel, failedAttempts + 1))
               } else {
@@ -414,7 +414,7 @@ export default Vue.extend({
           case 0:
             return this.getChannelVideosInvidiousScraper(channel, failedAttempts + 1)
           case 1:
-            if (this.backendFallback) {
+            if (process.env.IS_ELECTRON && this.backendFallback) {
               showToast(this.$t('Falling back to the local API'))
               return this.getChannelVideosLocalRSS(channel, failedAttempts + 1)
             } else {
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 08fc581fded0..a95d0d8afa2f 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -850,7 +850,7 @@ export default Vue.extend({
             copyToClipboard(err.responseText)
           })
           console.error(err)
-          if (this.backendPreference === 'invidious' && this.backendFallback) {
+          if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
             showToast(this.$t('Falling back to Local API'))
             this.getVideoInformationLocal()
           } else {
@@ -1201,7 +1201,7 @@ export default Vue.extend({
         }
       }
 
-      if (this.removeVideoMetaFiles) {
+      if (process.env.IS_ELECTRON && this.removeVideoMetaFiles) {
         if (process.env.NODE_ENV === 'development') {
           const dashFileLocation = `static/dashFiles/${videoId}.xml`
           const vttFileLocation = `static/storyboards/${videoId}.vtt`

From 156176aca88eb09f1288ae78c8d006df11b13fd7 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Thu, 5 Jan 2023 04:54:08 +0100
Subject: [PATCH 226/301] Migrate search to YouTube.js (#3028)

* Migrate search to YouTube.js

* Fix linting issue
---
 _scripts/build.js                             |   7 -
 _scripts/webpack.renderer.config.js           |   4 -
 _scripts/webpack.web.config.js                |   3 +-
 package.json                                  |   3 +-
 .../ft-list-channel/ft-list-channel.js        |   9 +-
 .../ft-list-channel/ft-list-channel.scss      |   5 +
 .../ft-list-channel/ft-list-channel.vue       |   8 +
 .../ft-list-playlist/ft-list-playlist.js      |  16 +-
 .../components/ft-list-video/ft-list-video.js |   4 +-
 .../ft-list-video/ft-list-video.vue           |   7 +-
 src/renderer/helpers/api/local.js             | 148 +++++++++++++++-
 src/renderer/helpers/utils.js                 |   2 +-
 src/renderer/scss-partials/_ft-list-item.scss |   3 +-
 src/renderer/store/modules/ytdl.js            | 163 +-----------------
 src/renderer/views/Search/Search.js           | 118 ++++++-------
 static/locales/en-US.yaml                     |   1 +
 yarn.lock                                     |   7 -
 17 files changed, 243 insertions(+), 265 deletions(-)

diff --git a/_scripts/build.js b/_scripts/build.js
index 3c4c0312b6d4..035f986c97db 100644
--- a/_scripts/build.js
+++ b/_scripts/build.js
@@ -62,13 +62,6 @@ const config = {
     './dist/**/*',
     '!dist/web/*',
     '!node_modules/**/*',
-
-    // renderer
-    'node_modules/{miniget,ytsr}/**/*',
-
-    '!**/README.md',
-    '!**/*.js.map',
-    '!**/*.d.ts',
   ],
   dmg: {
     contents: [
diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
index 723661f8abf8..8b8ad3c6e4e2 100644
--- a/_scripts/webpack.renderer.config.js
+++ b/_scripts/webpack.renderer.config.js
@@ -32,10 +32,6 @@ const config = {
     path: path.join(__dirname, '../dist'),
     filename: '[name].js',
   },
-  // webpack spits out errors while inlining ytsr as
-  // they dynamically import their package.json file to extract the bug report URL
-  // the error: "Critical dependency: the request of a dependency is an expression"
-  externals: ['ytsr'],
   module: {
     rules: [
       {
diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
index ac15675428fe..17681dd7f0e9 100644
--- a/_scripts/webpack.web.config.js
+++ b/_scripts/webpack.web.config.js
@@ -24,8 +24,7 @@ const config = {
   },
   externals: {
     electron: '{}',
-    'youtubei.js': '{}',
-    ytsr: '{}'
+    'youtubei.js': '{}'
   },
   module: {
     rules: [
diff --git a/package.json b/package.json
index 6c1f837615f6..ee918b173457 100644
--- a/package.json
+++ b/package.json
@@ -83,8 +83,7 @@
     "youtubei.js": "^2.7.0",
     "yt-channel-info": "^3.2.1",
     "yt-dash-manifest-generator": "1.1.0",
-    "ytdl-core": "https://github.com/absidue/node-ytdl-core#fix-likes-extraction",
-    "ytsr": "^3.8.0"
+    "ytdl-core": "https://github.com/absidue/node-ytdl-core#fix-likes-extraction"
   },
   "devDependencies": {
     "@babel/core": "^7.20.7",
diff --git a/src/renderer/components/ft-list-channel/ft-list-channel.js b/src/renderer/components/ft-list-channel/ft-list-channel.js
index aac1e76e0836..31de269b672c 100644
--- a/src/renderer/components/ft-list-channel/ft-list-channel.js
+++ b/src/renderer/components/ft-list-channel/ft-list-channel.js
@@ -20,6 +20,7 @@ export default Vue.extend({
       channelName: '',
       subscriberCount: 0,
       videoCount: '',
+      handle: null,
       uploadedTime: '',
       description: ''
     }
@@ -39,7 +40,7 @@ export default Vue.extend({
     }
   },
   mounted: function () {
-    if (typeof (this.data.avatars) !== 'undefined') {
+    if (this.data.dataSource === 'local' || typeof (this.data.avatars) !== 'undefined') {
       this.parseLocalData()
     } else {
       this.parseInvidiousData()
@@ -47,7 +48,7 @@ export default Vue.extend({
   },
   methods: {
     parseLocalData: function () {
-      this.thumbnail = this.data.bestAvatar.url
+      this.thumbnail = this.data.thumbnail ?? this.data.bestAvatar.url
 
       if (!this.thumbnail.includes('https:')) {
         this.thumbnail = `https:${this.thumbnail}`
@@ -66,6 +67,10 @@ export default Vue.extend({
         this.videoCount = Intl.NumberFormat(this.currentLocale).format(this.data.videos)
       }
 
+      if (this.data.handle) {
+        this.handle = this.data.handle
+      }
+
       this.description = this.data.descriptionShort
     },
 
diff --git a/src/renderer/components/ft-list-channel/ft-list-channel.scss b/src/renderer/components/ft-list-channel/ft-list-channel.scss
index af386ff4b911..9ceb653420fa 100644
--- a/src/renderer/components/ft-list-channel/ft-list-channel.scss
+++ b/src/renderer/components/ft-list-channel/ft-list-channel.scss
@@ -1 +1,6 @@
 @use '../../scss-partials/_ft-list-item';
+
+.handle {
+  color: inherit;
+  text-decoration: none;
+}
diff --git a/src/renderer/components/ft-list-channel/ft-list-channel.vue b/src/renderer/components/ft-list-channel/ft-list-channel.vue
index 3d29d12e3c5c..6ac9f8ed835d 100644
--- a/src/renderer/components/ft-list-channel/ft-list-channel.vue
+++ b/src/renderer/components/ft-list-channel/ft-list-channel.vue
@@ -31,7 +31,15 @@
         >
           {{ subscriberCount }} subscribers -
         </span>
+        <router-link
+          v-if="handle !== null"
+          class="handle"
+          :to="`/channel/${id}`"
+        >
+          {{ handle }}
+        </router-link>
         <span
+          v-else
           class="videoCount"
         >
           {{ videoCount }} videos
diff --git a/src/renderer/components/ft-list-playlist/ft-list-playlist.js b/src/renderer/components/ft-list-playlist/ft-list-playlist.js
index 308ec4639a4f..b310135f30e0 100644
--- a/src/renderer/components/ft-list-playlist/ft-list-playlist.js
+++ b/src/renderer/components/ft-list-playlist/ft-list-playlist.js
@@ -56,7 +56,10 @@ export default Vue.extend({
     }
   },
   mounted: function () {
-    if (typeof (this.data.owner) === 'object') {
+    // temporary until we've migrated the whole local API to youtubei.js
+    if (this.data.dataSource === 'local') {
+      this.parseLocalDataNew()
+    } else if (typeof (this.data.owner) === 'object') {
       this.parseLocalData()
     } else {
       this.parseInvidiousData()
@@ -98,6 +101,17 @@ export default Vue.extend({
       this.videoCount = this.data.length
     },
 
+    // TODO: after the local API is fully switched to YouTube.js
+    // cleanup the old local API stuff
+    parseLocalDataNew: function () {
+      this.title = this.data.title
+      this.thumbnail = this.data.thumbnail
+      this.channelName = this.data.channelName
+      this.channelLink = this.data.channelId
+      this.playlistLink = this.data.playlistId
+      this.videoCount = this.data.videoCount
+    },
+
     ...mapActions([
       'openInExternalPlayer'
     ])
diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js
index 8111889d7be0..5f8042769000 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.js
+++ b/src/renderer/components/ft-list-video/ft-list-video.js
@@ -385,7 +385,9 @@ export default Vue.extend({
       this.isPremium = this.data.premium || false
       this.viewCount = this.data.viewCount
 
-      if (typeof (this.data.premiereTimestamp) !== 'undefined') {
+      if (typeof this.data.premiereDate !== 'undefined') {
+        this.publishedText = this.data.premiereDate.toLocaleString()
+      } else if (typeof (this.data.premiereTimestamp) !== 'undefined') {
         this.publishedText = new Date(this.data.premiereTimestamp * 1000).toLocaleString()
       } else {
         this.publishedText = this.data.publishedText
diff --git a/src/renderer/components/ft-list-video/ft-list-video.vue b/src/renderer/components/ft-list-video/ft-list-video.vue
index 78c8110d48af..d866b5cc2f02 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.vue
+++ b/src/renderer/components/ft-list-video/ft-list-video.vue
@@ -27,9 +27,12 @@
       <div
         v-if="isLive || duration !== '0:00'"
         class="videoDuration"
-        :class="{ live: isLive }"
+        :class="{
+          live: isLive,
+          upcoming: isUpcoming
+        }"
       >
-        {{ isLive ? $t("Video.Live") : duration }}
+        {{ isLive ? $t("Video.Live") : (isUpcoming ? $t("Video.Upcoming") : duration) }}
       </div>
       <ft-icon-button
         v-if="externalPlayer !== ''"
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 474988498c7e..3eb2b2825a77 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -15,9 +15,10 @@ import { extractNumberFromString, getUserDataPath } from '../utils'
  * @param {object} options
  * @param {boolean} options.withPlayer set to true to get an Innertube instance that can decode the streaming URLs
  * @param {string|undefined} options.location the geolocation to pass to YouTube get different content
+ * @param {boolean} options.safetyMode whether to hide mature content
  * @returns the Innertube instance
  */
-async function createInnertube(options = { withPlayer: false, location: undefined }) {
+async function createInnertube(options = { withPlayer: false, location: undefined, safetyMode: false }) {
   let cache
   if (options.withPlayer) {
     const userData = await getUserDataPath()
@@ -27,6 +28,7 @@ async function createInnertube(options = { withPlayer: false, location: undefine
   return await Innertube.create({
     retrieve_player: !!options.withPlayer,
     location: options.location,
+    enable_safety_mode: !!options.safetyMode,
     // use browser fetch
     fetch: (input, init) => fetch(input, init),
     cache
@@ -74,7 +76,7 @@ export async function getLocalTrending(location, tab, instance) {
 
   const results = resultsInstance.videos
     .filter((video) => video.type === 'Video')
-    .map(parseLocalListVideo)
+    .map(parseListVideo)
 
   return {
     results,
@@ -82,6 +84,54 @@ export async function getLocalTrending(location, tab, instance) {
   }
 }
 
+/**
+ * @param {string} query
+ * @param {object} filters
+ * @param {boolean} safetyMode
+ */
+export async function getLocalSearchResults(query, filters, safetyMode) {
+  const innertube = await createInnertube({ safetyMode })
+  const response = await innertube.search(query, convertSearchFilters(filters))
+
+  return handleSearchResponse(response)
+}
+
+/**
+ * @typedef {import('youtubei.js/dist/src/parser/youtube/Search').default} Search
+ */
+
+/**
+ * @param {Search} continuationData
+ */
+export async function getLocalSearchContinuation(continuationData) {
+  const response = await continuationData.getContinuation()
+
+  return handleSearchResponse(response)
+}
+
+/**
+ * @param {Search} response
+ */
+function handleSearchResponse(response) {
+  if (!response.results) {
+    return {
+      results: [],
+      continuationData: null
+    }
+  }
+
+  const results = response.results
+    .filter((item) => {
+      return item.type === 'Video' || item.type === 'Channel' || item.type === 'Playlist'
+    })
+    .map((item) => parseListItem(item))
+
+  return {
+    results,
+    continuationData: response.has_continuation ? response : null
+  }
+}
+
 /**
  * @typedef {import('youtubei.js/dist/src/parser/classes/PlaylistVideo').default} PlaylistVideo
  */
@@ -106,7 +156,7 @@ export function parseLocalPlaylistVideo(video) {
 /**
  * @param {Video} video
  */
-function parseLocalListVideo(video) {
+function parseListVideo(video) {
   return {
     type: 'video',
     videoId: video.id,
@@ -117,6 +167,96 @@ function parseLocalListVideo(video) {
     viewCount: extractNumberFromString(video.view_count.text),
     publishedText: video.published.text,
     lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds,
-    liveNow: video.is_live
+    liveNow: video.is_live,
+    isUpcoming: video.is_upcoming || video.is_premiere,
+    premiereDate: video.upcoming
   }
 }
+
+/**
+ * @typedef {import('youtubei.js/dist/src/parser/helpers').YTNode} YTNode
+ * @typedef {import('youtubei.js/dist/src/parser/classes/Channel').default} Channel
+ * @typedef {import('youtubei.js/dist/src/parser/classes/Playlist').default} Playlist
+ */
+
+/**
+ * @param {YTNode} item
+ */
+function parseListItem(item) {
+  switch (item.type) {
+    case 'Video':
+      return parseListVideo(item)
+    case 'Channel': {
+      /** @type {Channel} */
+      const channel = item
+
+      // see upstream TODO: https://github.com/LuanRT/YouTube.js/blob/main/src/parser/classes/Channel.ts#L33
+
+      // according to https://github.com/iv-org/invidious/issues/3514#issuecomment-1368080392
+      // the response can be the new or old one, so we currently need to handle both here
+      let subscribers
+      let videos = null
+      let handle = null
+      if (channel.subscribers.text.startsWith('@')) {
+        subscribers = channel.videos.text
+        handle = channel.subscribers.text
+      } else {
+        subscribers = channel.subscribers.text
+        videos = channel.videos.text
+      }
+
+      return {
+        type: 'channel',
+        dataSource: 'local',
+        thumbnail: channel.author.best_thumbnail?.url,
+        name: channel.author.name,
+        channelID: channel.author.id,
+        subscribers,
+        videos,
+        handle,
+        descriptionShort: channel.description_snippet.text
+      }
+    }
+    case 'Playlist': {
+      /** @type {Playlist} */
+      const playlist = item
+      return {
+        type: 'playlist',
+        dataSource: 'local',
+        title: playlist.title,
+        thumbnail: playlist.thumbnails[0].url,
+        channelName: playlist.author.name,
+        channelId: playlist.author.id,
+        playlistId: playlist.id,
+        videoCount: extractNumberFromString(playlist.video_count.text)
+      }
+    }
+  }
+}
+
+function convertSearchFilters(filters) {
+  const convertedFilters = {}
+
+  // some of the fields have different names and
+  // others have empty strings that we don't want to pass to youtubei.js
+
+  if (filters) {
+    if (filters.sortBy) {
+      convertedFilters.sort_by = filters.sortBy
+    }
+
+    if (filters.time) {
+      convertedFilters.upload_date = filters.time
+    }
+
+    if (filters.type) {
+      convertedFilters.type = filters.type
+    }
+
+    if (filters.duration) {
+      convertedFilters.type = filters.duration
+    }
+  }
+
+  return convertedFilters
+}
diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index 6c9e6dfbfeb2..31f818902afa 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -481,7 +481,7 @@ export async function getPicturesPath() {
 
 export function extractNumberFromString(str) {
   if (typeof str === 'string') {
-    return parseInt(str.replace(/\D+/, ''))
+    return parseInt(str.replaceAll(/\D+/g, ''))
   } else {
     return NaN
   }
diff --git a/src/renderer/scss-partials/_ft-list-item.scss b/src/renderer/scss-partials/_ft-list-item.scss
index 12dc9103d24d..0e0c100737cb 100644
--- a/src/renderer/scss-partials/_ft-list-item.scss
+++ b/src/renderer/scss-partials/_ft-list-item.scss
@@ -287,6 +287,7 @@ $watched-transition-duration: 0.5s;
 }
 
 .videoWatched,
-.live {
+.live,
+.upcoming {
   text-transform: uppercase;
 }
diff --git a/src/renderer/store/modules/ytdl.js b/src/renderer/store/modules/ytdl.js
index 03299b7451c5..3a946f9ffc3c 100644
--- a/src/renderer/store/modules/ytdl.js
+++ b/src/renderer/store/modules/ytdl.js
@@ -1,15 +1,10 @@
 import ytdl from 'ytdl-core'
-import ytsr from 'ytsr'
 
 import { SocksProxyAgent } from 'socks-proxy-agent'
 import { HttpsProxyAgent } from 'https-proxy-agent'
 import { HttpProxyAgent } from 'http-proxy-agent'
 
-import { searchFiltersMatch } from '../../helpers/utils'
-
-const state = {
-  isYtSearchRunning: false
-}
+const state = {}
 
 const getters = {}
 
@@ -41,156 +36,6 @@ function createProxyAgent(protocol, hostname, port) {
 }
 
 const actions = {
-  ytSearch ({ commit, dispatch, rootState }, payload) {
-    return new Promise((resolve, reject) => {
-      if (state.isYtSearchRunning) {
-        resolve(false)
-      }
-
-      if (typeof payload.options.nextpageRef !== 'undefined') {
-        const continuation = payload.options.nextpageRef
-        const nextPageResults = ytsr.continueReq(continuation)
-        resolve(nextPageResults)
-        return
-      }
-
-      const defaultFilters = {
-        sortBy: 'relevance',
-        time: '',
-        type: 'all',
-        duration: ''
-      }
-
-      const settings = rootState.settings
-
-      if (settings.useProxy) {
-        const agent = createProxyAgent(settings.proxyProtocol, settings.proxyHostname, settings.proxyPort)
-
-        payload.options.requestOptions = { agent }
-      }
-
-      commit('toggleIsYtSearchRunning')
-
-      if (!searchFiltersMatch(defaultFilters, rootState.utils.searchSettings)) {
-        dispatch('ytSearchGetFilters', payload).then((filter) => {
-          if (typeof (payload.options.nextpageRef) === 'undefined' && filter !== payload.query) {
-            payload.options.nextpageRef = filter
-          }
-
-          const query = filter || payload.query
-
-          ytsr(query, payload.options).then((result) => {
-            resolve(result)
-          }).catch((err) => {
-            console.error(err)
-            reject(err)
-          }).finally(() => {
-            commit('toggleIsYtSearchRunning')
-          })
-        }).catch((err) => {
-          console.error(err)
-          commit('toggleIsYtSearchRunning')
-          reject(err)
-        })
-      } else {
-        ytsr(payload.query, payload.options).then((result) => {
-          resolve(result)
-        }).catch((err) => {
-          console.error(err)
-          reject(err)
-        }).finally(() => {
-          commit('toggleIsYtSearchRunning')
-        })
-      }
-    })
-  },
-
-  async ytSearchGetFilters ({ rootState }, payload) {
-    let options = null
-    let agent = null
-    const settings = rootState.settings
-
-    if (settings.useProxy) {
-      agent = createProxyAgent(settings.proxyProtocol, settings.proxyHostname, settings.proxyPort)
-    }
-
-    options = {
-      requestOptions: { agent }
-    }
-
-    let filter = await ytsr.getFilters(payload.query, options)
-    let filterUrl = null
-    let searchSettings = payload.searchSettings
-
-    if (typeof (searchSettings) === 'undefined') {
-      searchSettings = rootState.utils.searchSettings
-    }
-
-    if (searchSettings.sortBy !== 'relevance') {
-      let filterValue
-      switch (searchSettings.sortBy) {
-        case 'rating':
-          filterValue = 'Rating'
-          break
-        case 'upload_date':
-          filterValue = 'Upload date'
-          break
-        case 'view_count':
-          filterValue = 'View count'
-          break
-      }
-      filterUrl = filter.get('Sort by').get(filterValue).url
-      filter = await ytsr.getFilters(filterUrl, options)
-    }
-
-    if (searchSettings.duration !== '') {
-      let filterValue = null
-      if (searchSettings.duration === 'short') {
-        filterValue = 'Under 4 minutes'
-      } else if (searchSettings.duration === 'long') {
-        filterValue = 'Over 20 minutes'
-      }
-
-      filterUrl = filter.get('Duration').get(filterValue).url
-      filter = await ytsr.getFilters(filterUrl, options)
-    }
-
-    if (searchSettings.time !== '') {
-      let filterValue = null
-
-      switch (searchSettings.time) {
-        case 'hour':
-          filterValue = 'Last hour'
-          break
-        case 'today':
-          filterValue = 'Today'
-          break
-        case 'week':
-          filterValue = 'This week'
-          break
-        case 'month':
-          filterValue = 'This month'
-          break
-        case 'year':
-          filterValue = 'This year'
-          break
-      }
-
-      filterUrl = filter.get('Upload date').get(filterValue).url
-      filter = await ytsr.getFilters(filterUrl, options)
-    }
-
-    if (searchSettings.type !== 'all') {
-      const filterValue = searchSettings.type.charAt(0).toUpperCase() + searchSettings.type.slice(1)
-      filterUrl = filter.get('Type').get(filterValue).url
-      filter = await ytsr.getFilters(filterUrl, options)
-    }
-
-    return new Promise((resolve, reject) => {
-      resolve(filterUrl)
-    })
-  },
-
   ytGetVideoInformation ({ rootState }, videoId) {
     return new Promise((resolve, reject) => {
       let agent = null
@@ -212,11 +57,7 @@ const actions = {
   }
 }
 
-const mutations = {
-  toggleIsYtSearchRunning (state) {
-    state.isYtSearchRunning = !state.isYtSearchRunning
-  }
-}
+const mutations = {}
 
 export default {
   state,
diff --git a/src/renderer/views/Search/Search.js b/src/renderer/views/Search/Search.js
index 02287a52e68b..6447095822a1 100644
--- a/src/renderer/views/Search/Search.js
+++ b/src/renderer/views/Search/Search.js
@@ -3,8 +3,8 @@ import { mapActions } from 'vuex'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
-import { timeToSeconds } from 'youtubei.js/dist/src/utils/Utils'
 import { copyToClipboard, searchFiltersMatch, showToast } from '../../helpers/utils'
+import { getLocalSearchContinuation, getLocalSearchResults } from '../../helpers/api/local'
 
 export default Vue.extend({
   name: 'Search',
@@ -20,7 +20,7 @@ export default Vue.extend({
       amountOfResults: 0,
       query: '',
       searchPage: 1,
-      nextPageRef: '',
+      nextPageRef: null,
       lastSearchQuery: '',
       searchSettings: {},
       shownResults: []
@@ -65,7 +65,6 @@ export default Vue.extend({
 
       const payload = {
         query: query,
-        nextPage: false,
         options: {},
         searchSettings: searchSettings
       }
@@ -87,7 +86,6 @@ export default Vue.extend({
 
     const payload = {
       query: this.query,
-      nextPage: false,
       options: {},
       searchSettings: this.searchSettings
     }
@@ -122,86 +120,68 @@ export default Vue.extend({
       }
     },
 
-    performSearchLocal: function (payload) {
-      if (!payload.nextPage) {
-        this.isLoading = true
-        payload.options.pages = 1
-      }
+    performSearchLocal: async function (payload) {
+      this.isLoading = true
 
-      payload.options.safeSearch = this.showFamilyFriendlyOnly
+      try {
+        const { results, continuationData } = await getLocalSearchResults(payload.query, payload.searchSettings, this.showFamilyFriendlyOnly)
 
-      this.ytSearch(payload).then((result) => {
-        if (!result) {
+        if (results.length === 0) {
           return
         }
 
         this.apiUsed = 'local'
 
-        this.amountOfResults = result.results
+        this.shownResults = results
+        this.nextPageRef = continuationData
 
-        const returnData = result.items.filter((item) => {
-          if (typeof item !== 'undefined') {
-            return item.type === 'video' || item.type === 'channel' || item.type === 'playlist'
-          }
+        this.isLoading = false
 
-          return null
-        })
+        const historyPayload = {
+          query: payload.query,
+          data: this.shownResults,
+          searchSettings: this.searchSettings,
+          nextPageRef: this.nextPageRef
+        }
 
-        const dataToShow = []
-        returnData.forEach((video) => {
-          if (video.type === 'video') {
-            const authId = video.author.channelID
-            const publishDate = video.uploadedAt
-            let videoDuration = video.duration
-            const videoId = video.id
-            if (videoDuration !== null && videoDuration !== '' && videoDuration !== 'LIVE' && videoDuration !== 'UPCOMING' && videoDuration !== 'PREMIERE') {
-              videoDuration = timeToSeconds(video.duration)
-            }
-            dataToShow.push(
-              {
-                videoId: videoId,
-                title: video.title,
-                type: 'video',
-                author: video.author.name,
-                authorId: authId,
-                authorUrl: video.author.url,
-                videoThumbnails: video.thumbnail,
-                description: video.description,
-                viewCount: video.views,
-                published: publishDate,
-                publishedText: publishDate,
-                lengthSeconds: videoDuration,
-                liveNow: video.isLive || videoDuration === 'LIVE',
-                paid: false,
-                premium: false,
-                isUpcoming: videoDuration === 'UPCOMING' || videoDuration === 'PREMIERE',
-                timeText: videoDuration
-              }
-            )
-          } else {
-            dataToShow.push(video)
-          }
+        this.$store.commit('addToSessionSearchHistory', historyPayload)
+      } catch (err) {
+        console.error(err)
+        const errorMessage = this.$t('Local API Error (Click to copy)')
+        showToast(`${errorMessage}: ${err}`, 10000, () => {
+          copyToClipboard(err)
         })
-
-        if (payload.nextPage) {
-          this.shownResults = this.shownResults.concat(dataToShow)
+        if (this.backendPreference === 'local' && this.backendFallback) {
+          showToast(this.$t('Falling back to Invidious API'))
+          this.performSearchInvidious(payload)
         } else {
-          this.shownResults = dataToShow
+          this.isLoading = false
         }
+      }
+    },
 
-        this.nextPageRef = result.continuation
-        this.isLoading = false
+    getNextpageLocal: async function (payload) {
+      try {
+        const { results, continuationData } = getLocalSearchContinuation(payload.options.nextPageRef)
+
+        if (results.length === 0) {
+          return
+        }
+
+        this.apiUsed = 'local'
+
+        this.shownResults = this.shownResults.concat(results)
+        this.nextPageRef = continuationData
 
         const historyPayload = {
           query: payload.query,
           data: this.shownResults,
           searchSettings: this.searchSettings,
-          nextPageRef: result.continuation,
-          amountOfResults: result.results
+          nextPageRef: this.nextPageRef
         }
 
         this.$store.commit('addToSessionSearchHistory', historyPayload)
-      }).catch((err) => {
+      } catch (err) {
         console.error(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
         showToast(`${errorMessage}: ${err}`, 10000, () => {
@@ -213,7 +193,7 @@ export default Vue.extend({
         } else {
           this.isLoading = false
         }
-      })
+      }
     },
 
     performSearchInvidious: function (payload) {
@@ -281,19 +261,18 @@ export default Vue.extend({
     nextPage: function () {
       const payload = {
         query: this.query,
-        nextPage: true,
         searchSettings: this.searchSettings,
         options: {
-          nextpageRef: this.nextPageRef
+          nextPageRef: this.nextPageRef
         }
       }
 
       if (this.apiUsed === 'local') {
-        if (this.amountOfResults <= this.shownResults.length) {
-          showToast(this.$t('Search Filters.There are no more results for this search'))
-        } else {
+        if (this.nextPageRef !== null) {
           showToast(this.$t('Search Filters["Fetching results. Please wait"]'))
-          this.performSearchLocal(payload)
+          this.getNextpageLocal(payload)
+        } else {
+          showToast(this.$t('Search Filters.There are no more results for this search'))
         }
       } else {
         showToast(this.$t('Search Filters["Fetching results. Please wait"]'))
@@ -319,7 +298,6 @@ export default Vue.extend({
     },
 
     ...mapActions([
-      'ytSearch',
       'invidiousAPICall'
     ])
   }
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 432a263a5c1e..602e253089de 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -566,6 +566,7 @@ Video:
   # As in a Live Video
   Premieres on: Premieres on
   Premieres: Premieres
+  Upcoming: Upcoming
   Live: Live
   Live Now: Live Now
   Live Chat: Live Chat
diff --git a/yarn.lock b/yarn.lock
index da45a7e79ff1..cd44e8aa5db9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9281,10 +9281,3 @@ ytdl-core@^3.2.2:
     m3u8stream "^0.8.6"
     miniget "^4.2.2"
     sax "^1.1.3"
-
-ytsr@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/ytsr/-/ytsr-3.8.0.tgz#49a8e5dc413f41515fc3d79d93ee3e073d10e772"
-  integrity sha512-R+RfYXvBBMAr2e4OxrQ5SBv5x/Mdhmcj1Q8TH0f2HK5d2jbhHOtK4BdzPvLriA6MDoMwqqX04GD8Rpf9UNtSTg==
-  dependencies:
-    miniget "^4.2.2"

From bff8dc43262fab4991dd13d9762410a67daecc03 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Wed, 4 Jan 2023 22:54:20 -0500
Subject: [PATCH 227/301] Improve accessibility of Channel View (#2984)

* Improve channel info bar

* Reduce width of channel search bar

* fix sizing

* improve channel view accessibility

Co-Authored-By: Jason <84899178+jasonhenriquez@users.noreply.github.com>

* Update src/renderer/components/ft-channel-bubble/ft-channel-bubble.js

Co-authored-by: PikachuEXE <pikachuexe@gmail.com>

* Stop space from clicking channel-bubble (links)

Co-authored-by: vallode <18506096+vallode@users.noreply.github.com>
Co-authored-by: Jason <84899178+jasonhenriquez@users.noreply.github.com>
Co-authored-by: PikachuEXE <pikachuexe@gmail.com>
---
 .../ft-channel-bubble/ft-channel-bubble.js    |  15 ++-
 .../ft-channel-bubble/ft-channel-bubble.vue   |   8 +-
 src/renderer/views/Channel/Channel.css        |  50 +++++---
 src/renderer/views/Channel/Channel.js         |  33 +++++-
 src/renderer/views/Channel/Channel.vue        | 110 ++++++++++++------
 5 files changed, 163 insertions(+), 53 deletions(-)

diff --git a/src/renderer/components/ft-channel-bubble/ft-channel-bubble.js b/src/renderer/components/ft-channel-bubble/ft-channel-bubble.js
index d9752676b97e..ca2a775cbadc 100644
--- a/src/renderer/components/ft-channel-bubble/ft-channel-bubble.js
+++ b/src/renderer/components/ft-channel-bubble/ft-channel-bubble.js
@@ -1,4 +1,5 @@
 import Vue from 'vue'
+import { sanitizeForHtmlId } from '../../helpers/accessibility'
 
 export default Vue.extend({
   name: 'FtChannelBubble',
@@ -21,8 +22,20 @@ export default Vue.extend({
       selected: false
     }
   },
+  computed: {
+    sanitizedId: function() {
+      return 'channelBubble' + sanitizeForHtmlId(this.channelName)
+    }
+  },
   methods: {
-    handleClick: function () {
+    handleClick: function (event) {
+      if (event instanceof KeyboardEvent) {
+        if (event.target.getAttribute('role') === 'link' && event.key !== 'Enter') {
+          return
+        }
+        event.preventDefault()
+      }
+
       if (this.showSelected) {
         this.selected = !this.selected
       }
diff --git a/src/renderer/components/ft-channel-bubble/ft-channel-bubble.vue b/src/renderer/components/ft-channel-bubble/ft-channel-bubble.vue
index 7e9cd68d8bc0..0f6563d4accd 100644
--- a/src/renderer/components/ft-channel-bubble/ft-channel-bubble.vue
+++ b/src/renderer/components/ft-channel-bubble/ft-channel-bubble.vue
@@ -1,7 +1,10 @@
 <template>
   <div
     class="bubblePadding"
+    tabindex="0"
+    :aria-labelledby="sanitizedId"
     @click="handleClick"
+    @keydown.space.enter.prevent="handleClick($event)"
   >
     <img
       class="bubble"
@@ -16,7 +19,10 @@
         class="icon"
       />
     </div>
-    <div class="channelName">
+    <div
+      :id="sanitizedId"
+      class="channelName"
+    >
       {{ channelName }}
     </div>
   </div>
diff --git a/src/renderer/views/Channel/Channel.css b/src/renderer/views/Channel/Channel.css
index 568edf62402e..e0f1ca39294d 100644
--- a/src/renderer/views/Channel/Channel.css
+++ b/src/renderer/views/Channel/Channel.css
@@ -6,7 +6,7 @@
 }
 
 .channelDetails {
-  padding: 0 0 16px;
+  padding: 0;
 }
 
 .channelBannerContainer {
@@ -75,38 +75,51 @@
 
 .channelSearch {
   width: 220px;
+  margin-left: auto;
   align-self: flex-end;
+  flex: 1 1 0%;
 }
 
 .sortSelect {
-  align-self: flex-end;
+  margin-left: auto;
 }
 
 .channelInfoTabs {
   position: relative;
   width: 100%;
-  margin-top: -16px;
-  margin-bottom: -13px;
+  height: auto;
+  justify-content: unset;
+  gap: 32px;
+  padding: .3em 0;
+}
+
+.tabs {
+  display: flex;
+  flex: 0 1 33%;
 }
 
 .tab {
   padding: 15px;
   font-size: 15px;
   cursor: pointer;
+  flex: 1 1 0%;
   align-self: flex-end;
+  text-align: center;
   color: var(--tertiary-text-color);
+  border-bottom: 3px solid transparent;
 }
 
-.selectedTab {
-  color: var(--primary-text-color);
-  border-bottom: 3px solid var(--primary-color);
-  margin-bottom: -3px;
+.tab:hover {
   font-weight: bold;
-  box-sizing: border-box;
+  border-bottom: 3px solid var(--tertiary-text-color);
 }
 
-.tab:hover {
+.selectedTab,
+.selectedTab:hover {
+  color: var(--primary-text-color);
+  border-bottom: 3px solid var(--primary-color);
   font-weight: bold;
+  box-sizing: border-box;
 }
 
 .aboutTab {
@@ -125,10 +138,7 @@
 
 .channelSearch {
   margin-top: 10px;
-}
-
-.elementList {
-  margin-top: 15px;
+  max-width: 250px;
 }
 
 .elementListLoading {
@@ -164,3 +174,15 @@
 .channelLineContainer p {
   margin: 0;
 }
+
+@media only screen and (max-width: 800px) {
+  .channelInfoTabs {
+    height: auto;
+    flex-flow: column-reverse;
+  }
+
+  .channelSearch {
+    width: 100%;
+    max-width: none;
+  }
+}
diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index 77fcfa551a48..748801c02c6d 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -68,6 +68,11 @@ export default Vue.extend({
       playlistSelectValues: [
         'last',
         'newest'
+      ],
+      tabInfoValues: [
+        'videos',
+        'playlists',
+        'about'
       ]
     }
   },
@@ -652,8 +657,34 @@ export default Vue.extend({
       }
     },
 
-    changeTab: function (tab) {
+    changeTab: function (tab, event) {
+      if (event instanceof KeyboardEvent) {
+        // use arrowkeys to navigate
+        event.preventDefault()
+        if (event.key === 'ArrowLeft' || event.key === 'ArrowRight') {
+          const index = this.tabInfoValues.indexOf(tab)
+
+          // focus left or right tab with wrap around
+          tab = (event.key === 'ArrowLeft')
+            ? this.tabInfoValues[(index > 0 ? index : this.tabInfoValues.length) - 1]
+            : this.tabInfoValues[(index + 1) % this.tabInfoValues.length]
+
+          const tabNode = document.getElementById(`${tab}Tab`)
+          event.target.setAttribute('tabindex', '-1')
+          tabNode.setAttribute('tabindex', 0)
+          tabNode.focus({ focusVisible: true })
+          return
+        }
+      }
+
+      const currentTabNode = document.querySelector('.tabs > .tab[aria-selected="true"]')
+      const newTabNode = document.getElementById(`${tab}Tab`)
+      document.querySelector('.tabs > .tab[tabindex="0"]').setAttribute('tabindex', '-1')
+      newTabNode.setAttribute('tabindex', '0')
+      currentTabNode.setAttribute('aria-selected', 'false')
+      newTabNode.setAttribute('aria-selected', 'true')
       this.currentTab = tab
+      newTabNode.focus({ focusVisible: true })
     },
 
     newSearch: function (query) {
diff --git a/src/renderer/views/Channel/Channel.vue b/src/renderer/views/Channel/Channel.vue
index 5c48a037b200..3d25f9a7ff9f 100644
--- a/src/renderer/views/Channel/Channel.vue
+++ b/src/renderer/views/Channel/Channel.vue
@@ -30,6 +30,7 @@
             <img
               class="channelThumbnail"
               :src="thumbnailUrl"
+              alt=""
             >
             <div
               class="channelLineContainer"
@@ -74,50 +75,57 @@
           class="channelInfoTabs"
         >
           <div
-            class="tab"
-            :class="(currentTab==='videos')?'selectedTab':''"
-            @click="changeTab('videos')"
+            class="tabs"
+            role="tablist"
+            :aria-label="$t('Channel.Channel Tabs')"
           >
-            {{ $t("Channel.Videos.Videos").toUpperCase() }}
-          </div>
-          <div
-            class="tab"
-            :class="(currentTab==='playlists')?'selectedTab':''"
-            @click="changeTab('playlists')"
-          >
-            {{ $t("Channel.Playlists.Playlists").toUpperCase() }}
-          </div>
-          <div
-            class="tab"
-            :class="(currentTab==='about')?'selectedTab':''"
-            @click="changeTab('about')"
-          >
-            {{ $t("Channel.About.About").toUpperCase() }}
+            <div
+              id="videosTab"
+              class="tab"
+              :class="(currentTab==='videos')?'selectedTab':''"
+              role="tab"
+              aria-selected="true"
+              aria-controls="videoPanel"
+              tabindex="0"
+              @click="changeTab('videos')"
+              @keydown.left.right.enter.space="changeTab('videos', $event)"
+            >
+              {{ $t("Channel.Videos.Videos").toUpperCase() }}
+            </div>
+            <div
+              id="playlistsTab"
+              class="tab"
+              role="tab"
+              aria-selected="false"
+              aria-controls="playlistPanel"
+              tabindex="-1"
+              :class="(currentTab==='playlists')?'selectedTab':''"
+              @click="changeTab('playlists')"
+              @keydown.left.right.enter.space="changeTab('playlists', $event)"
+            >
+              {{ $t("Channel.Playlists.Playlists").toUpperCase() }}
+            </div>
+            <div
+              id="aboutTab"
+              class="tab"
+              role="tab"
+              aria-selected="false"
+              aria-controls="aboutPanel"
+              tabindex="-1"
+              :class="(currentTab==='about')?'selectedTab':''"
+              @click="changeTab('about')"
+              @keydown.left.right.enter.space="changeTab('about', $event)"
+            >
+              {{ $t("Channel.About.About").toUpperCase() }}
+            </div>
           </div>
+
           <ft-input
             :placeholder="$t('Channel.Search Channel')"
             :show-clear-text-button="true"
             class="channelSearch"
             @click="newSearch"
           />
-          <ft-select
-            v-show="currentTab === 'videos'"
-            class="sortSelect"
-            :value="videoSelectValues[0]"
-            :select-names="videoSelectNames"
-            :select-values="videoSelectValues"
-            :placeholder="$t('Search Filters.Sort By.Sort By')"
-            @change="videoSortBy = $event"
-          />
-          <ft-select
-            v-show="currentTab === 'playlists'"
-            class="sortSelect"
-            :value="playlistSelectValues[0]"
-            :select-names="playlistSelectNames"
-            :select-values="playlistSelectValues"
-            :placeholder="$t('Search Filters.Sort By.Sort By')"
-            @change="playlistSortBy = $event"
-          />
         </ft-flex-box>
       </div>
     </ft-card>
@@ -127,6 +135,7 @@
     >
       <div
         v-if="currentTab === 'about'"
+        id="aboutPanel"
         class="aboutTab"
       >
         <h2>
@@ -151,10 +160,29 @@
             :channel-name="channel.author || channel.channelName"
             :channel-id="channel.channelId"
             :channel-thumbnail="channel.authorThumbnails[channel.authorThumbnails.length - 1].url"
+            role="link"
             @click="goToChannel(channel.channelId)"
           />
         </ft-flex-box>
       </div>
+      <ft-select
+        v-show="currentTab === 'videos'"
+        class="sortSelect"
+        :value="videoSelectValues[0]"
+        :select-names="videoSelectNames"
+        :select-values="videoSelectValues"
+        :placeholder="$t('Search Filters.Sort By.Sort By')"
+        @change="videoSortBy = $event"
+      />
+      <ft-select
+        v-show="currentTab === 'playlists'"
+        class="sortSelect"
+        :value="playlistSelectValues[0]"
+        :select-names="playlistSelectNames"
+        :select-values="playlistSelectValues"
+        :placeholder="$t('Search Filters.Sort By.Sort By')"
+        @change="playlistSortBy = $event"
+      />
       <ft-loader
         v-if="isElementListLoading"
       />
@@ -164,7 +192,10 @@
       >
         <ft-element-list
           v-show="currentTab === 'videos'"
+          id="videoPanel"
           :data="latestVideos"
+          role="tabpanel"
+          aria-labelledby="videosTab"
         />
         <ft-flex-box
           v-if="currentTab === 'videos' && latestVideos.length === 0"
@@ -175,7 +206,10 @@
         </ft-flex-box>
         <ft-element-list
           v-show="currentTab === 'playlists'"
+          id="playlistPanel"
           :data="latestPlaylists"
+          role="tabpanel"
+          aria-labelledby="playlistsTab"
         />
         <ft-flex-box
           v-if="currentTab === 'playlists' && latestPlaylists.length === 0"
@@ -198,7 +232,11 @@
         <div
           v-if="showFetchMoreButton"
           class="getNextPage"
+          role="button"
+          tabindex="0"
           @click="handleFetchMore"
+          @keydown.space.prevent="handleFetchMore"
+          @keydown.enter.prevent="handleFetchMore"
         >
           <font-awesome-icon :icon="['fas', 'search']" /> {{ $t("Search Filters.Fetch more results") }}
         </div>

From 5ca547ead48a933462cd03c8b9a919d030acb583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9A=D0=BE=D1=82=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B1=D0=B0=D0=B9?= <artemkotlubai@yandex.ru>
Date: Thu, 5 Jan 2023 08:35:27 +0000
Subject: [PATCH 228/301] Translated using Weblate (Russian)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 7a48488cec74..481683e38ade 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -693,6 +693,7 @@ Video:
   Premieres: Премьеры
   Show Super Chat Comment: Показать комментарий «Супер Чата»
   Scroll to Bottom: Прокрутите вниз
+  Upcoming: Предстоящее
 Videos:
   #& Sort By
   Sort By:

From fd87d2a6b595481f2d7f77e663a0a8f19e51605c Mon Sep 17 00:00:00 2001
From: Massimo Pissarello <mapi68@gmail.com>
Date: Thu, 5 Jan 2023 06:08:43 +0000
Subject: [PATCH 229/301] Translated using Weblate (Italian)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/it/
---
 static/locales/it.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/it.yaml b/static/locales/it.yaml
index 23fae6516968..8255785f379f 100644
--- a/static/locales/it.yaml
+++ b/static/locales/it.yaml
@@ -707,6 +707,7 @@ Video:
   Premieres: Première
   Scroll to Bottom: Scorri fino in fondo
   Show Super Chat Comment: Mostra commento Super Chat
+  Upcoming: In arrivo
 Videos:
   #& Sort By
   Sort By:

From ca712c09762cb2df3268494cfa4760c1eadd85d3 Mon Sep 17 00:00:00 2001
From: Retrial <giwrgosmant@gmail.com>
Date: Thu, 5 Jan 2023 05:43:10 +0000
Subject: [PATCH 230/301] Translated using Weblate (Greek)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/el/
---
 static/locales/el.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/el.yaml b/static/locales/el.yaml
index 8b60866e68ca..55fab0878770 100644
--- a/static/locales/el.yaml
+++ b/static/locales/el.yaml
@@ -756,6 +756,7 @@ Video:
   Show Super Chat Comment: Εμφάνιση Σχολίου Super Chat
   Scroll to Bottom: Κύλιση προς τα Κάτω
   Premieres: Πρεμιέρες
+  Upcoming: Επερχόμενο
 Videos:
   #& Sort By
   Sort By:

From 4a2b2dd7a45d8612abec29a4cd4eb40b5bc9569b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguz@ersen.moe>
Date: Thu, 5 Jan 2023 04:24:13 +0000
Subject: [PATCH 231/301] Translated using Weblate (Turkish)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/tr/
---
 static/locales/tr.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/tr.yaml b/static/locales/tr.yaml
index 8528ce56a7cb..c1c71461b323 100644
--- a/static/locales/tr.yaml
+++ b/static/locales/tr.yaml
@@ -742,6 +742,7 @@ Video:
   Premieres: İlk gösterim
   Scroll to Bottom: Aşağıya Kaydır
   Show Super Chat Comment: Süper Sohbet Yorumunu Göster
+  Upcoming: Yakında
 Videos:
   #& Sort By
   Sort By:

From 7c4565d0846064fa4138de1cebb461e5aaf64bdc Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Thu, 5 Jan 2023 07:14:24 +0000
Subject: [PATCH 232/301] Translated using Weblate (Hebrew)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/he/
---
 static/locales/he.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/he.yaml b/static/locales/he.yaml
index 48d410df8f90..ddce9f3249f3 100644
--- a/static/locales/he.yaml
+++ b/static/locales/he.yaml
@@ -721,6 +721,7 @@ Video:
   Premieres: בכורות
   Scroll to Bottom: גלילה לתחתית
   Show Super Chat Comment: הצגת הערת סופר צ׳אט
+  Upcoming: בקרוב
 Videos:
   #& Sort By
   Sort By:

From 3d6469038ca7b6f9bcd6064888afe84ef03c4dfd Mon Sep 17 00:00:00 2001
From: Eric <hamburger2048@users.noreply.hosted.weblate.org>
Date: Thu, 5 Jan 2023 10:17:42 +0000
Subject: [PATCH 233/301] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/zh_Hans/
---
 static/locales/zh-CN.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/zh-CN.yaml b/static/locales/zh-CN.yaml
index c5270a52cae9..aca9f9fe2118 100644
--- a/static/locales/zh-CN.yaml
+++ b/static/locales/zh-CN.yaml
@@ -633,6 +633,7 @@ Video:
   Premieres: 首映
   Scroll to Bottom: 滚动到底部
   Show Super Chat Comment: 显示超级聊天评论
+  Upcoming: 即将到来
 Videos:
   #& Sort By
   Sort By:

From e0c7fded634be75513f0a81c52a33a4b3bdba4a5 Mon Sep 17 00:00:00 2001
From: Rex_sa <rex.sa@pm.me>
Date: Thu, 5 Jan 2023 09:58:26 +0000
Subject: [PATCH 234/301] Translated using Weblate (Arabic)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ar/
---
 static/locales/ar.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/ar.yaml b/static/locales/ar.yaml
index 988a790a89d7..79aed24af0c9 100644
--- a/static/locales/ar.yaml
+++ b/static/locales/ar.yaml
@@ -723,6 +723,7 @@ Video:
   Premieres: العرض الأولي
   Scroll to Bottom: انتقل إلى الأسفل
   Show Super Chat Comment: إظهار تعليق Super Chat
+  Upcoming: القادمة
 Videos:
   #& Sort By
   Sort By:

From ce355e7b1b4c30e613315e3278c00f569cf501e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Thu, 5 Jan 2023 09:57:04 +0000
Subject: [PATCH 235/301] Translated using Weblate (Icelandic)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/is/
---
 static/locales/is.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/is.yaml b/static/locales/is.yaml
index ad24f4729490..c33456e00b56 100644
--- a/static/locales/is.yaml
+++ b/static/locales/is.yaml
@@ -684,6 +684,7 @@ Video:
   Premieres: Frumsýnt
   Show Super Chat Comment: Birta athugasemd Super Chat
   Scroll to Bottom: Skruna neðst
+  Upcoming: Á næstunni
 Videos:
   #& Sort By
   Sort By:

From 3771dfdbaa69847cfe5b1014f591e1902c6bc6aa Mon Sep 17 00:00:00 2001
From: Dragibus Noir <dragibusnoir@pm.me>
Date: Thu, 5 Jan 2023 12:09:01 +0000
Subject: [PATCH 236/301] Translated using Weblate (French)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/fr/
---
 static/locales/fr-FR.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/fr-FR.yaml b/static/locales/fr-FR.yaml
index 4d4c6c7d6892..8fc450caef16 100644
--- a/static/locales/fr-FR.yaml
+++ b/static/locales/fr-FR.yaml
@@ -728,6 +728,7 @@ Video:
   Premieres: Avant-première
   Show Super Chat Comment: Afficher le commentaire Super Chat
   Scroll to Bottom: Faire défiler jusqu'en bas
+  Upcoming: À venir
 Videos:
   #& Sort By
   Sort By:

From 94c232647578690fbe26d7397a02f9219713d857 Mon Sep 17 00:00:00 2001
From: Piotr Strebski <strebski@gmail.com>
Date: Thu, 5 Jan 2023 12:15:41 +0000
Subject: [PATCH 237/301] Translated using Weblate (Polish)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pl/
---
 static/locales/pl.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml
index 310ad7b376a0..b2091af88f4f 100644
--- a/static/locales/pl.yaml
+++ b/static/locales/pl.yaml
@@ -398,6 +398,8 @@ Settings:
     Hide Upcoming Premieres: Schowaj nadchodzące premiery
     Hide Channels: Schowaj filmy z kanałów
     Hide Channels Placeholder: Nazwa albo ID kanału
+    Display Titles Without Excessive Capitalisation: Wyświetlaj tytuły bez nadmiernych
+      wielkich liter
   The app needs to restart for changes to take effect. Restart and apply change?: Aplikacja
     musi zostać ponownie uruchomiona, aby zmiany zostały wprowadzone. Uruchomić ponownie
     i zastosować zmiany?
@@ -707,6 +709,7 @@ Video:
   Premieres: Premiery
   Show Super Chat Comment: Pokazuj komentarze z „Superczatu”
   Scroll to Bottom: Przewiń do końca
+  Upcoming: Nadchodzące
 Videos:
   #& Sort By
   Sort By:

From cfeb2e65e7bbb9cb46981cdda75a25448323a426 Mon Sep 17 00:00:00 2001
From: Milo Ivir <mail@milotype.de>
Date: Thu, 5 Jan 2023 12:52:26 +0000
Subject: [PATCH 238/301] Translated using Weblate (Croatian)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/hr/
---
 static/locales/hr.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/hr.yaml b/static/locales/hr.yaml
index 538ae2d4fcd4..8bde2bd8ea86 100644
--- a/static/locales/hr.yaml
+++ b/static/locales/hr.yaml
@@ -739,6 +739,7 @@ Video:
   Premieres: Premijere
   Show Super Chat Comment: Prikaži Super Chat komentar
   Scroll to Bottom: Pomakni se skroz dolje
+  Upcoming: Predstojeći
 Videos:
   #& Sort By
   Sort By:

From 75c279630f1f7c8e04aed82dfcb06f58b116cb7b Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Thu, 5 Jan 2023 12:31:35 +0000
Subject: [PATCH 239/301] Translated using Weblate (Spanish)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/es/
---
 static/locales/es.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/es.yaml b/static/locales/es.yaml
index f396c8b40f2e..5ab3174a4b8b 100644
--- a/static/locales/es.yaml
+++ b/static/locales/es.yaml
@@ -737,6 +737,7 @@ Video:
   Premieres: Estrenos
   Show Super Chat Comment: Mostrar los comentarios del Super Chat
   Scroll to Bottom: Desplazarse hacia abajo
+  Upcoming: Próximamente
 Videos:
   #& Sort By
   Sort By:

From 60b6079ef7c2140d74fc6dbd0a3aa719554f0a70 Mon Sep 17 00:00:00 2001
From: Fjuro <ifjuro@proton.me>
Date: Thu, 5 Jan 2023 14:06:52 +0000
Subject: [PATCH 240/301] Translated using Weblate (Czech)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/cs/
---
 static/locales/cs.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml
index f3f80e92c4d8..a3ae928f1834 100644
--- a/static/locales/cs.yaml
+++ b/static/locales/cs.yaml
@@ -718,6 +718,7 @@ Video:
   Premieres: Premiéra
   Show Super Chat Comment: Zobrazit komentář Super Chat
   Scroll to Bottom: Posunout dolů
+  Upcoming: Nadcházející
 Videos:
   #& Sort By
   Sort By:

From f8814d7c46fd3b88703b9b0d3785ad8e1179f58f Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Thu, 5 Jan 2023 12:32:23 +0000
Subject: [PATCH 241/301] Translated using Weblate (Galician)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/gl/
---
 static/locales/gl.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/gl.yaml b/static/locales/gl.yaml
index aef51bb4f97e..697b3847ca5f 100644
--- a/static/locales/gl.yaml
+++ b/static/locales/gl.yaml
@@ -730,6 +730,7 @@ Video:
   Premieres: Estreos
   Show Super Chat Comment: Mostralos comentarios do Super Chat
   Scroll to Bottom: Desprácese ata abaixo
+  Upcoming: Próximamente
 Videos:
   #& Sort By
   Sort By:

From 13e9db2325b17856647d54b904f7df5d39399e0e Mon Sep 17 00:00:00 2001
From: Rusi Dimitrov <astral_86@mail.bg>
Date: Thu, 5 Jan 2023 20:36:20 +0000
Subject: [PATCH 242/301] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/bg/
---
 static/locales/bg.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/bg.yaml b/static/locales/bg.yaml
index bc8c6518be8a..446199bf6f6f 100644
--- a/static/locales/bg.yaml
+++ b/static/locales/bg.yaml
@@ -740,6 +740,7 @@ Video:
   Premieres: Премиерa
   Show Super Chat Comment: Показване на Super Chat коментар
   Scroll to Bottom: Превъртане в долната част
+  Upcoming: Предстоящи
 Videos:
   #& Sort By
   Sort By:

From 5f12205fed60849beee09b410d3f06c71266eb24 Mon Sep 17 00:00:00 2001
From: Ihor Hordiichuk <igor_ck@outlook.com>
Date: Thu, 5 Jan 2023 21:08:11 +0000
Subject: [PATCH 243/301] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/uk/
---
 static/locales/uk.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/uk.yaml b/static/locales/uk.yaml
index 856fba89dc43..e0d2214cc523 100644
--- a/static/locales/uk.yaml
+++ b/static/locales/uk.yaml
@@ -714,6 +714,7 @@ Video:
   Premieres: Прем'єри
   Scroll to Bottom: Прокрутити до кінця
   Show Super Chat Comment: Показати коментар із суперчату
+  Upcoming: Незабаром
 Videos:
   #& Sort By
   Sort By:

From 1ee3206b6849ec1f6efbb09c32cefdb780c5be8a Mon Sep 17 00:00:00 2001
From: jc <jcwkgxc@nightorb.com>
Date: Fri, 6 Jan 2023 16:21:22 +0000
Subject: [PATCH 244/301] Translated using Weblate (Portuguese (Portugal))

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt_PT/
---
 static/locales/pt-PT.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/pt-PT.yaml b/static/locales/pt-PT.yaml
index f7f13795c5a1..5a8a5b3e6c43 100644
--- a/static/locales/pt-PT.yaml
+++ b/static/locales/pt-PT.yaml
@@ -678,6 +678,7 @@ Video:
   Premieres: Estreias
   Show Super Chat Comment: Mostrar Comentário do Super Chat
   Scroll to Bottom: Percorrer para o fundo
+  Upcoming: Próximo
 Videos:
   #& Sort By
   Sort By:

From 4b55e496179e3ea2782fcdd24fd411664d650ef4 Mon Sep 17 00:00:00 2001
From: jc <jcwkgxc@nightorb.com>
Date: Fri, 6 Jan 2023 16:20:29 +0000
Subject: [PATCH 245/301] Translated using Weblate (Portuguese)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt/
---
 static/locales/pt.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/pt.yaml b/static/locales/pt.yaml
index 07f9769dde9d..2691c72e37ec 100644
--- a/static/locales/pt.yaml
+++ b/static/locales/pt.yaml
@@ -735,6 +735,7 @@ Video:
   Premieres: Estreias
   Scroll to Bottom: Rolar para baixo
   Show Super Chat Comment: Mostrar Comentário do Super Chat
+  Upcoming: Próximo
 Videos:
   #& Sort By
   Sort By:

From 15b15026b6ce4d66c4e270a7e6961dec6f667766 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sat, 7 Jan 2023 02:52:59 +0100
Subject: [PATCH 246/301] Migrate the watch page to YouTube.js (#3035)

* Migrate the watch page to YouTube.js

* Fix YouTube.js exclusion in the web build
---
 _scripts/webpack.web.config.js                |   7 +-
 package.json                                  |   9 +-
 .../ft-video-player/ft-video-player.js        |  14 +-
 src/renderer/helpers/api/local.js             | 123 ++-
 src/renderer/helpers/utils.js                 |  45 +-
 src/renderer/store/modules/ytdl.js            |  67 --
 src/renderer/views/Watch/Watch.js             | 791 ++++++++----------
 yarn.lock                                     | 107 +--
 8 files changed, 544 insertions(+), 619 deletions(-)
 delete mode 100644 src/renderer/store/modules/ytdl.js

diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
index 17681dd7f0e9..42ab8dac26a3 100644
--- a/_scripts/webpack.web.config.js
+++ b/_scripts/webpack.web.config.js
@@ -23,8 +23,7 @@ const config = {
     filename: '[name].js',
   },
   externals: {
-    electron: '{}',
-    'youtubei.js': '{}'
+    electron: '{}'
   },
   module: {
     rules: [
@@ -124,6 +123,10 @@ const config = {
       filename: isDevMode ? '[name].css' : '[name].[contenthash].css',
       chunkFilename: isDevMode ? '[id].css' : '[id].[contenthash].css',
     }),
+    // ignore all youtubei.js imports, even the ones with paths in them
+    new webpack.IgnorePlugin({
+      resourceRegExp: /^youtubei\.js/
+    })
   ],
   resolve: {
     alias: {
diff --git a/package.json b/package.json
index ee918b173457..cc2bff687ae3 100644
--- a/package.json
+++ b/package.json
@@ -62,13 +62,10 @@
     "browserify": "^17.0.0",
     "browserify-zlib": "^0.2.0",
     "electron-context-menu": "^3.6.1",
-    "http-proxy-agent": "^5.0.0",
-    "https-proxy-agent": "^5.0.0",
     "lodash.debounce": "^4.0.8",
     "marked": "^4.2.5",
     "nedb-promises": "^6.2.1",
     "process": "^0.11.10",
-    "socks-proxy-agent": "^7.0.0",
     "video.js": "7.20.3",
     "videojs-contrib-quality-levels": "^3.0.0",
     "videojs-http-source-selector": "^1.1.6",
@@ -80,10 +77,8 @@
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
-    "youtubei.js": "^2.7.0",
-    "yt-channel-info": "^3.2.1",
-    "yt-dash-manifest-generator": "1.1.0",
-    "ytdl-core": "https://github.com/absidue/node-ytdl-core#fix-likes-extraction"
+    "youtubei.js": "^2.8.0",
+    "yt-channel-info": "^3.2.1"
   },
   "devDependencies": {
     "@babel/core": "^7.20.7",
diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
index e16e9ddac801..5e648bf608f7 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -1571,10 +1571,10 @@ export default Vue.extend({
 
     sortCaptions: function (captionList) {
       return captionList.sort((captionA, captionB) => {
-        const aCode = captionA.languageCode.split('-') // ex. [en,US]
-        const bCode = captionB.languageCode.split('-')
-        const aName = (captionA.label || captionA.name.simpleText) // ex: english (auto-generated)
-        const bName = (captionB.label || captionB.name.simpleText)
+        const aCode = captionA.language_code.split('-') // ex. [en,US]
+        const bCode = captionB.language_code.split('-')
+        const aName = (captionA.label) // ex: english (auto-generated)
+        const bName = (captionB.label)
         const userLocale = this.currentLocale.split(/-|_/) // ex. [en,US]
         if (aCode[0] === userLocale[0]) { // caption a has same language as user's locale
           if (bCode[0] === userLocale[0]) { // caption b has same language as user's locale
@@ -1622,9 +1622,9 @@ export default Vue.extend({
       for (const caption of this.sortCaptions(captionList)) {
         this.player.addRemoteTextTrack({
           kind: 'subtitles',
-          src: caption.baseUrl || caption.url,
-          srclang: caption.languageCode,
-          label: caption.label || caption.name.simpleText,
+          src: caption.url,
+          srclang: caption.language_code,
+          label: caption.label,
           type: caption.type
         }, true)
       }
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 3eb2b2825a77..21cd45b96cd0 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -1,4 +1,5 @@
 import { Innertube } from 'youtubei.js'
+import { ClientType } from 'youtubei.js/dist/src/core/Session'
 import { join } from 'path'
 
 import { PlayerCache } from './PlayerCache'
@@ -16,9 +17,10 @@ import { extractNumberFromString, getUserDataPath } from '../utils'
  * @param {boolean} options.withPlayer set to true to get an Innertube instance that can decode the streaming URLs
  * @param {string|undefined} options.location the geolocation to pass to YouTube get different content
  * @param {boolean} options.safetyMode whether to hide mature content
+ * @param {string} options.clientType use an alterate client
  * @returns the Innertube instance
  */
-async function createInnertube(options = { withPlayer: false, location: undefined, safetyMode: false }) {
+async function createInnertube(options = { withPlayer: false, location: undefined, safetyMode: false, clientType: undefined }) {
   let cache
   if (options.withPlayer) {
     const userData = await getUserDataPath()
@@ -29,6 +31,8 @@ async function createInnertube(options = { withPlayer: false, location: undefine
     retrieve_player: !!options.withPlayer,
     location: options.location,
     enable_safety_mode: !!options.safetyMode,
+    client_type: options.clientType,
+
     // use browser fetch
     fetch: (input, init) => fetch(input, init),
     cache
@@ -109,6 +113,18 @@ export async function getLocalSearchContinuation(continuationData) {
   return handleSearchResponse(response)
 }
 
+export async function getLocalVideoInfo(id, attemptBypass = false) {
+  if (attemptBypass) {
+    const innertube = await createInnertube({ withPlayer: true, clientType: ClientType.TV_EMBEDDED })
+    // the second request that getInfo makes 404s with the bypass, so we use getBasicInfo instead
+    // that's fine as we have most of the information from the original getInfo request
+    return await innertube.getBasicInfo(id, 'TV_EMBEDDED')
+  } else {
+    const innertube = await createInnertube({ withPlayer: true })
+    return await innertube.getInfo(id)
+  }
+}
+
 /**
  * @param {Search} response
  */
@@ -234,6 +250,28 @@ function parseListItem(item) {
   }
 }
 
+/**
+ * @typedef {import('youtubei.js/dist/src/parser/classes/CompactVideo').default} CompactVideo
+ */
+
+/**
+ * @param {CompactVideo} video
+ */
+export function parseLocalWatchNextVideo(video) {
+  return {
+    type: 'video',
+    videoId: video.id,
+    title: video.title.text,
+    author: video.author.name,
+    authorId: video.author.id,
+    viewCount: extractNumberFromString(video.view_count.text),
+    // CompactVideo doesn't have is_live, is_upcoming or is_premiere,
+    // so we have to make do with this for the moment, to stop toLocalePublicationString erroring
+    publishedText: video.published.text === 'N/A' ? null : video.published.text,
+    lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds
+  }
+}
+
 function convertSearchFilters(filters) {
   const convertedFilters = {}
 
@@ -260,3 +298,86 @@ function convertSearchFilters(filters) {
 
   return convertedFilters
 }
+
+/**
+ * @typedef {import('youtubei.js/dist/src/parser/classes/misc/TextRun').default} TextRun
+ */
+
+/**
+ * @param {TextRun[]} textRuns
+ */
+export function parseLocalTextRuns(textRuns) {
+  if (!Array.isArray(textRuns)) {
+    throw new Error('not an array of text runs')
+  }
+
+  const timestampRegex = /^(?:\d+:){1,2}\d+$/
+  const runs = []
+
+  for (const { text, endpoint } of textRuns) {
+    if (endpoint && !text.startsWith('#')) {
+      switch (endpoint.metadata.page_type) {
+        case 'WEB_PAGE_TYPE_WATCH':
+          if (timestampRegex.test(text)) {
+            runs.push(text)
+          } else {
+            runs.push(`https://www.youtube.com${endpoint.metadata.url}`)
+          }
+          break
+        case 'WEB_PAGE_TYPE_CHANNEL':
+          if (text.startsWith('@')) {
+            runs.push(`<a href="https://www.youtube.com/channel/${endpoint.payload.browseId}">${text}</a>`)
+          } else {
+            runs.push(`https://www.youtube.com${endpoint.metadata.url}`)
+          }
+          break
+        case 'WEB_PAGE_TYPE_PLAYLIST':
+          runs.push(`https://www.youtube.com${endpoint.metadata.url}`)
+          break
+        case 'WEB_PAGE_TYPE_UNKNOWN':
+        default: {
+          const url = new URL(endpoint.payload.url)
+          if (url.hostname === 'www.youtube.com' && url.pathname === '/redirect' && url.searchParams.has('q')) {
+            // remove utm tracking parameters
+            const realURL = new URL(url.searchParams.get('q'))
+
+            realURL.searchParams.delete('utm_source')
+            realURL.searchParams.delete('utm_medium')
+            realURL.searchParams.delete('utm_campaign')
+            realURL.searchParams.delete('utm_term')
+            realURL.searchParams.delete('utm_content')
+
+            runs.push(realURL.toString())
+          } else {
+            // this is probably a special YouTube URL like http://www.youtube.com/approachingnirvana
+            runs.push(endpoint.payload.url)
+          }
+          break
+        }
+      }
+    } else {
+      runs.push(text)
+    }
+  }
+
+  return runs.join('')
+}
+
+/**
+ * @typedef {import('youtubei.js/dist/src/parser/classes/misc/Format').default} Format
+ */
+
+/**
+ * @param {Format} format
+ */
+export function mapLocalFormat(format) {
+  return {
+    itag: format.itag,
+    qualityLabel: format.quality_label,
+    fps: format.fps,
+    bitrate: format.bitrate,
+    mimeType: format.mime_type,
+    height: format.height,
+    url: format.url
+  }
+}
diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index 31f818902afa..e759cf3ce85f 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -92,11 +92,10 @@ export function toLocalePublicationString ({ publishText, isLive = false, isUpco
 export function buildVTTFileLocally(storyboard) {
   let vttString = 'WEBVTT\n\n'
   // how many images are in one image
-  const numberOfSubImagesPerImage = storyboard.sWidth * storyboard.sHeight
+  const numberOfSubImagesPerImage = storyboard.columns * storyboard.rows
   // the number of storyboard images
-  const numberOfImages = Math.ceil(storyboard.count / numberOfSubImagesPerImage)
+  const numberOfImages = Math.ceil(storyboard.thumbnail_count / numberOfSubImagesPerImage)
   const intervalInSeconds = storyboard.interval / 1000
-  let currentUrl = storyboard.url
   let startHours = 0
   let startMinutes = 0
   let startSeconds = 0
@@ -104,6 +103,7 @@ export function buildVTTFileLocally(storyboard) {
   let endMinutes = 0
   let endSeconds = intervalInSeconds
   for (let i = 0; i < numberOfImages; i++) {
+    const currentUrl = storyboard.template_url.replace('$M.jpg', `${i}.jpg`)
     let xCoord = 0
     let yCoord = 0
     for (let j = 0; j < numberOfSubImagesPerImage; j++) {
@@ -116,7 +116,7 @@ export function buildVTTFileLocally(storyboard) {
       const paddedEndSeconds = endSeconds.toString().padStart(2, '0')
       vttString += `${paddedStartHours}:${paddedStartMinutes}:${paddedStartSeconds}.000 --> ${paddedEndHours}:${paddedEndMinutes}:${paddedEndSeconds}.000\n`
       // add the current image url as well as the x, y, width, height information
-      vttString += currentUrl + `#xywh=${xCoord},${yCoord},${storyboard.width},${storyboard.height}\n\n`
+      vttString += `${currentUrl}#xywh=${xCoord},${yCoord},${storyboard.thumbnail_width},${storyboard.thumbnail_height}\n\n`
       // update the variables
       startHours = endHours
       startMinutes = endMinutes
@@ -131,18 +131,47 @@ export function buildVTTFileLocally(storyboard) {
         endHours += 1
       }
       // x coordinate can only be smaller than the width of one subimage * the number of subimages per row
-      xCoord = (xCoord + storyboard.width) % (storyboard.width * storyboard.sWidth)
+      xCoord = (xCoord + storyboard.thumbnail_width) % (storyboard.thumbnail_width * storyboard.columns)
       // only if the x coordinate is , so in a new row, we have to update the y coordinate
       if (xCoord === 0) {
-        yCoord += storyboard.height
+        yCoord += storyboard.thumbnail_height
       }
     }
-    // make sure that there is no value like M0 or M1 in the parameters that gets replaced
-    currentUrl = currentUrl.replace('M' + i.toString() + '.jpg', 'M' + (i + 1).toString() + '.jpg')
   }
   return vttString
 }
 
+export async function getFormatsFromHLSManifest(manifestUrl) {
+  const response = await fetch(manifestUrl)
+  const text = await response.text()
+
+  const lines = text.split('\n').filter(line => line)
+
+  const formats = []
+  let currentHeight = 0
+
+  for (const line of lines) {
+    if (line.startsWith('#')) {
+      if (!line.startsWith('#EXT-X-STREAM-INF:')) {
+        continue
+      }
+
+      const height = line
+        .split(',')
+        .find(part => part.startsWith('RESOLUTION'))
+        .split('x')[1]
+      currentHeight = parseInt(height)
+    } else {
+      formats.push({
+        height: currentHeight,
+        url: line.trim()
+      })
+    }
+  }
+
+  return formats
+}
+
 export function showToast(message, time = null, action = null) {
   FtToastEvents.$emit('toast-open', message, time, action)
 }
diff --git a/src/renderer/store/modules/ytdl.js b/src/renderer/store/modules/ytdl.js
deleted file mode 100644
index 3a946f9ffc3c..000000000000
--- a/src/renderer/store/modules/ytdl.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import ytdl from 'ytdl-core'
-
-import { SocksProxyAgent } from 'socks-proxy-agent'
-import { HttpsProxyAgent } from 'https-proxy-agent'
-import { HttpProxyAgent } from 'http-proxy-agent'
-
-const state = {}
-
-const getters = {}
-
-function createProxyAgent(protocol, hostname, port) {
-  switch (protocol) {
-    case 'http':
-      return new HttpProxyAgent({
-        host: hostname,
-        port: port
-      })
-    case 'https':
-      return new HttpsProxyAgent({
-        host: hostname,
-        port: port
-      })
-    case 'socks4':
-      return new SocksProxyAgent({
-        hostname: hostname,
-        port: port,
-        type: 4
-      })
-    case 'socks5':
-      return new SocksProxyAgent({
-        hostname: hostname,
-        port: port,
-        type: 5
-      })
-  }
-}
-
-const actions = {
-  ytGetVideoInformation ({ rootState }, videoId) {
-    return new Promise((resolve, reject) => {
-      let agent = null
-      const settings = rootState.settings
-
-      if (settings.useProxy) {
-        agent = createProxyAgent(settings.proxyProtocol, settings.proxyHostname, settings.proxyPort)
-      }
-
-      ytdl.getInfo(videoId, {
-        lang: 'en-US',
-        requestOptions: { agent }
-      }).then((result) => {
-        resolve(result)
-      }).catch((err) => {
-        reject(err)
-      })
-    })
-  }
-}
-
-const mutations = {}
-
-export default {
-  state,
-  getters,
-  actions,
-  mutations
-}
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index a95d0d8afa2f..eea456b118f9 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import { mapActions } from 'vuex'
 import fs from 'fs/promises'
-import ytDashGen from 'yt-dash-manifest-generator'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtVideoPlayer from '../../components/ft-video-player/ft-video-player.vue'
 import WatchVideoInfo from '../../components/watch-video-info/watch-video-info.vue'
@@ -12,15 +11,22 @@ import WatchVideoLiveChat from '../../components/watch-video-live-chat/watch-vid
 import WatchVideoPlaylist from '../../components/watch-video-playlist/watch-video-playlist.vue'
 import WatchVideoRecommendations from '../../components/watch-video-recommendations/watch-video-recommendations.vue'
 import FtAgeRestricted from '../../components/ft-age-restricted/ft-age-restricted.vue'
-import i18n from '../../i18n/index'
 import { pathExists } from '../../helpers/filesystem'
 import {
   buildVTTFileLocally,
   copyToClipboard,
+  extractNumberFromString,
   formatDurationAsTimestamp,
+  getFormatsFromHLSManifest,
   getUserDataPath,
   showToast
 } from '../../helpers/utils'
+import {
+  getLocalVideoInfo,
+  mapLocalFormat,
+  parseLocalTextRuns,
+  parseLocalWatchNextVideo
+} from '../../helpers/api/local'
 
 export default Vue.extend({
   name: 'Watch',
@@ -167,7 +173,7 @@ export default Vue.extend({
       return !this.hideRecommendedVideos || (!this.hideLiveChat && this.isLive) || this.watchingPlaylist
     },
     currentLocale: function () {
-      return i18n.locale.replace('_', '-')
+      return this.$i18n.locale.replace('_', '-')
     },
     hideChapters: function () {
       return this.$store.getters.getHideChapters
@@ -245,398 +251,401 @@ export default Vue.extend({
       this.useTheatreMode = !this.useTheatreMode
     },
 
-    getVideoInformationLocal: function () {
+    getVideoInformationLocal: async function () {
       if (this.firstLoad) {
         this.isLoading = true
       }
 
-      this.ytGetVideoInformation(this.videoId)
-        .then(async result => {
-          const playabilityStatus = result.player_response.playabilityStatus
-          if (playabilityStatus.status === 'UNPLAYABLE') {
-            const errorScreen = playabilityStatus.errorScreen.playerErrorMessageRenderer
-            const reason = errorScreen.reason.simpleText
-            let subReason
-            let skipIndex
-            errorScreen.subreason.runs.forEach((message, index) => {
-              if (index !== skipIndex) {
-                if (/<a.*>/.test(message.text)) {
-                  skipIndex = index + 1
-                } else if (!/<\/a>/.test(message.text)) {
-                  if (typeof subReason === 'undefined') {
-                    subReason = message.text
-                  } else {
-                    subReason = subReason + message.text
-                  }
-                }
-              }
-            })
+      try {
+        let result = await getLocalVideoInfo(this.videoId)
 
-            throw new Error(`${reason}: ${subReason}`)
-          }
+        this.isFamilyFriendly = result.basic_info.is_family_safe
+
+        this.recommendedVideos = result.watch_next_feed
+          ?.filter((item) => item.type === 'CompactVideo')
+          .map(parseLocalWatchNextVideo) ?? []
+
+        if (this.showFamilyFriendlyOnly && !this.isFamilyFriendly) {
+          this.isLoading = false
+          this.handleVideoEnded()
+          return
+        }
+
+        let playabilityStatus = result.playability_status
+        let bypassedResult = null
+        if (playabilityStatus.status === 'LOGIN_REQUIRED') {
+          // try to bypass the age restriction
+          bypassedResult = await getLocalVideoInfo(this.videoId, true)
+          playabilityStatus = result.playability_status
+        }
+
+        if (playabilityStatus.status === 'UNPLAYABLE') {
+          /**
+           * @typedef {import('youtubei.js/dist/src/parser/classes/PlayerErrorMessage').default} PlayerErrorMessage
+           * @type {PlayerErrorMessage}
+           */
+          const errorScreen = playabilityStatus.error_screen
+          throw new Error(`[${playabilityStatus.status}] ${errorScreen.reason.text}: ${errorScreen.subreason.text}`)
+        }
+
+        // extract localised title first and fall back to the not localised one
+        this.videoTitle = result.primary_info?.title.text ?? result.basic_info.title
+        this.videoViewCount = result.basic_info.view_count
+
+        this.channelId = result.basic_info.channel_id
+        this.channelName = result.basic_info.author
+
+        if (result.secondary_info.owner?.author) {
+          this.channelThumbnail = result.secondary_info.owner.author.best_thumbnail?.url ?? ''
+        } else {
+          this.channelThumbnail = ''
+        }
+
+        this.updateSubscriptionDetails({
+          channelThumbnailUrl: this.channelThumbnail.length === 0 ? null : this.channelThumbnail,
+          channelName: this.channelName,
+          channelId: this.channelId
+        })
+
+        this.videoPublished = new Date(result.primary_info.published.text.replace('-', '/')).getTime()
+
+        if (result.secondary_info?.description.runs) {
           try {
-            // workaround for title localization
-            this.videoTitle = result.response.contents.twoColumnWatchNextResults.results.results.contents[0].videoPrimaryInfoRenderer.title.runs.map(run => run.text).join('')
-          } catch (err) {
-            console.error('Failed to extract localised video title, falling back to the standard one.', err)
-            // if the workaround for localization fails, this sets the title to the potentially non-localized value
-            this.videoTitle = result.videoDetails.title
+            this.videoDescription = parseLocalTextRuns(result.secondary_info.description.runs)
+          } catch (error) {
+            console.error('Failed to extract the localised description, falling back to the standard one.', error, JSON.stringify(result.secondary_info.description.runs))
+            this.videoDescription = result.basic_info.short_description
           }
-          this.videoViewCount = parseInt(
-            result.player_response.videoDetails.viewCount,
-            10
-          )
-          if ('id' in result.videoDetails.author) {
-            this.channelId = result.player_response.videoDetails.channelId
-            this.channelName = result.videoDetails.author.name
-            if (result.videoDetails.author.thumbnails.length > 0) {
-              this.channelThumbnail = result.videoDetails.author.thumbnails[0].url
-            }
-          } else {
-            this.channelId = result.player_response.videoDetails.channelId
-            this.channelName = result.player_response.videoDetails.author
-            this.channelThumbnail = result.player_response.embedPreview.thumbnailPreviewRenderer.videoDetails.embeddedPlayerOverlayVideoDetailsRenderer.channelThumbnail.thumbnails[0].url
-          }
-          this.updateSubscriptionDetails({
-            channelThumbnailUrl: this.channelThumbnail,
-            channelName: this.channelName,
-            channelId: this.channelId
-          })
+        } else {
+          this.videoDescription = result.basic_info.short_description
+        }
 
-          this.videoPublished = new Date(result.videoDetails.publishDate.replace('-', '/')).getTime()
-          try {
-            // workaround for description localization
-            const descriptionRuns = result.response.contents.twoColumnWatchNextResults.results.results.contents[1].videoSecondaryInfoRenderer.description?.runs
+        switch (this.thumbnailPreference) {
+          case 'start':
+            this.thumbnail = `https://i.ytimg.com/vi/${this.videoId}/maxres1.jpg`
+            break
+          case 'middle':
+            this.thumbnail = `https://i.ytimg.com/vi/${this.videoId}/maxres2.jpg`
+            break
+          case 'end':
+            this.thumbnail = `https://i.ytimg.com/vi/${this.videoId}/maxres3.jpg`
+            break
+          default:
+            this.thumbnail = result.basic_info.thumbnail[0].url
+            break
+        }
 
-            if (!Array.isArray(descriptionRuns)) {
-              // eslint-disable-next-line no-throw-literal
-              throw ['not an array', descriptionRuns]
-            }
+        if (this.hideVideoLikesAndDislikes) {
+          this.videoLikeCount = null
+          this.videoDislikeCount = null
+        } else {
+          this.videoLikeCount = isNaN(result.basic_info.like_count) ? 0 : result.basic_info.like_count
 
-            const fallbackDescription = result.player_response.videoDetails.shortDescription
-
-            // YouTube truncates links in the localised description
-            // so we need to fix them here, so that autolinker can do it's job properly later on
-            this.videoDescription = descriptionRuns
-              .map(run => this.processDescriptionPart(run, fallbackDescription))
-              .join('')
-          } catch (err) {
-            console.error('Failed to extract localised video description, falling back to the standard one.', err)
-            // if the workaround for localization fails, this sets the description to the potentially non-localized value
-            this.videoDescription = result.player_response.videoDetails.shortDescription
-          }
+          // YouTube doesn't return dislikes anymore
+          this.videoDislikeCount = 0
+        }
 
-          switch (this.thumbnailPreference) {
-            case 'start':
-              this.thumbnail = `https://i.ytimg.com/vi/${this.videoId}/maxres1.jpg`
-              break
-            case 'middle':
-              this.thumbnail = `https://i.ytimg.com/vi/${this.videoId}/maxres2.jpg`
-              break
-            case 'end':
-              this.thumbnail = `https://i.ytimg.com/vi/${this.videoId}/maxres3.jpg`
-              break
-            default:
-              this.thumbnail = result.videoDetails.thumbnails[result.videoDetails.thumbnails.length - 1].url
-              break
-          }
+        this.isLive = !!result.basic_info.is_live
+        this.isUpcoming = !!result.basic_info.is_upcoming
+        this.isLiveContent = !!result.basic_info.is_live_content
+
+        if (!this.hideChannelSubscriptions) {
+          // really not a fan of this :(, YouTube returns the subscribers as "15.1M subscribers"
+          // so we have to parse it somehow
+          const rawSubCount = result.secondary_info.owner.subscriber_count.text
+          const match = rawSubCount
+            .replace(',', '.')
+            .toUpperCase()
+            .match(/([\d.]+)\s*([KM]?)/)
+          let subCount
+          if (match) {
+            subCount = parseFloat(match[1])
+
+            if (match[2] === 'K') {
+              subCount *= 1000
+            } else if (match[2] === 'M') {
+              subCount *= 1000_000
+            }
 
-          this.isFamilyFriendly = result.videoDetails.isFamilySafe
-          this.recommendedVideos = result.related_videos.map((video) => {
-            video.videoId = video.id
-            video.authorId = video.author.id
-            video.viewCount = video.view_count
-            video.lengthSeconds = video.length_seconds
-            video.author = video.author.name
-            video.publishedText = video.published
-            return video
-          })
-          if (this.hideVideoLikesAndDislikes) {
-            this.videoLikeCount = null
-            this.videoDislikeCount = null
+            subCount = Math.trunc(subCount)
           } else {
-            this.videoLikeCount = isNaN(result.videoDetails.likes) ? 0 : result.videoDetails.likes
-            this.videoDislikeCount = isNaN(result.videoDetails.dislikes) ? 0 : result.videoDetails.dislikes
-          }
-          this.isLive = result.player_response.videoDetails.isLive
-          this.isLiveContent = result.player_response.videoDetails.isLiveContent
-          this.isUpcoming = result.player_response.videoDetails.isUpcoming ? result.player_response.videoDetails.isUpcoming : false
-
-          if (this.videoDislikeCount === null && !this.hideVideoLikesAndDislikes) {
-            this.videoDislikeCount = 0
+            subCount = extractNumberFromString(rawSubCount)
           }
 
-          const subCount = result.videoDetails.author.subscriber_count
-
-          if (typeof (subCount) !== 'undefined' && !this.hideChannelSubscriptions) {
+          if (!isNaN(subCount)) {
             if (subCount >= 10000) {
               this.channelSubscriptionCountText = Intl.NumberFormat([this.currentLocale, 'en'], { notation: 'compact' }).format(subCount)
             } else {
               this.channelSubscriptionCountText = Intl.NumberFormat([this.currentLocale, 'en']).format(subCount)
             }
+          } else {
+            this.channelSubscriptionCountText = ''
           }
+        } else {
+          this.channelSubscriptionCountText = ''
+        }
 
-          const chapters = []
-          if (!this.hideChapters) {
-            const rawChapters = result.response.playerOverlays.playerOverlayRenderer.decoratedPlayerBarRenderer?.decoratedPlayerBarRenderer.playerBar?.multiMarkersPlayerBarRenderer.markersMap?.find(m => m.key === 'DESCRIPTION_CHAPTERS')?.value.chapters
-            if (rawChapters) {
-              for (const { chapterRenderer } of rawChapters) {
-                const start = chapterRenderer.timeRangeStartMillis / 1000
-
-                chapters.push({
-                  title: chapterRenderer.title.simpleText,
-                  timestamp: formatDurationAsTimestamp(start),
-                  startSeconds: start,
-                  endSeconds: 0,
-                  thumbnail: chapterRenderer.thumbnail.thumbnails[0].url
-                })
-              }
-
-              this.addChaptersEndSeconds(chapters, result.videoDetails.lengthSeconds)
+        const chapters = []
+        if (!this.hideChapters) {
+          const rawChapters = result.player_overlays?.decorated_player_bar?.player_bar?.markers_map?.get({ marker_key: 'DESCRIPTION_CHAPTERS' })?.value.chapters
+          if (rawChapters) {
+            for (const chapter of rawChapters) {
+              const start = chapter.time_range_start_millis / 1000
 
-              // prevent vue from adding reactivity which isn't needed
-              // as the chapter objects are read-only after this anyway
-              // the chapters are checked for every timeupdate event that the player emits
-              // this should lessen the performance and memory impact of the chapters
-              chapters.forEach(Object.freeze)
+              chapters.push({
+                title: chapter.title.text,
+                timestamp: formatDurationAsTimestamp(start),
+                startSeconds: start,
+                endSeconds: 0,
+                thumbnail: chapter.thumbnail[0].url
+              })
             }
+
+            this.addChaptersEndSeconds(chapters, result.basic_info.duration)
+
+            // prevent vue from adding reactivity which isn't needed
+            // as the chapter objects are read-only after this anyway
+            // the chapters are checked for every timeupdate event that the player emits
+            // this should lessen the performance and memory impact of the chapters
+            chapters.forEach(Object.freeze)
           }
-          // only set this at the end so that there is only a single update to the view
-          this.videoChapters = chapters
+        }
 
-          if ((this.isLive && this.isLiveContent) && !this.isUpcoming) {
-            this.enableLegacyFormat()
+        this.videoChapters = chapters
 
-            this.videoSourceList = result.formats.filter((format) => {
-              if (typeof (format.mimeType) !== 'undefined') {
-                return format.mimeType.includes('video/ts')
-              }
+        // the bypassed result is missing some of the info that we extract in the code above
+        // so we only overwrite the result here
+        // we need the bypassed result for the streaming data and the subtitles
+        if (bypassedResult) {
+          result = bypassedResult
+        }
 
-              return format.itag === 300 || format.itag === 301
-            }).map((format) => {
-              let qualityLabel
-
-              if (format.itag === 300) {
-                qualityLabel = '720p'
-              } else if (format.itag === 301) {
-                qualityLabel = '1080p'
-              } else {
-                qualityLabel = format.qualityLabel
-              }
-              return {
-                url: format.url,
+        if ((this.isLive && this.isLiveContent) && !this.isUpcoming) {
+          try {
+            const formats = await getFormatsFromHLSManifest(result.streaming_data.hls_manifest_url)
+
+            this.videoSourceList = formats
+              .sort((formatA, formatB) => {
+                return formatB.height - formatA.height
+              })
+              .map((format) => {
+                return {
+                  url: format.url,
+                  type: 'application/x-mpegURL',
+                  label: 'Dash',
+                  qualityLabel: `${format.height}p`
+                }
+              })
+          } catch (e) {
+            console.error('Failed to extract formats form HLS manifest, falling back to passing it directly to video.js', e)
+
+            this.videoSourceList = [
+              {
+                url: result.streaming_data.hls_manifest_url,
                 type: 'application/x-mpegURL',
                 label: 'Dash',
-                qualityLabel: qualityLabel
+                qualityLabel: 'Live'
               }
-            }).sort((a, b) => {
-              const qualityA = parseInt(a.qualityLabel.replace('p', ''))
-              const qualityB = parseInt(b.qualityLabel.replace('p', ''))
-              return qualityA - qualityB
-            }).reverse()
+            ]
+          }
 
-            if (this.videoSourceList.length === 0) {
-              this.activeSourceList = result.player_response.streamingData.formats
-            } else {
-              this.activeSourceList = this.videoSourceList
+          this.showLegacyPlayer = true
+          this.showDashPlayer = false
+          this.activeFormat = 'legacy'
+          this.activeSourceList = this.videoSourceList
+        } else if (this.isUpcoming) {
+          const upcomingTimestamp = result.basic_info.start_timestamp
+
+          if (upcomingTimestamp) {
+            const timestampOptions = {
+              month: 'long',
+              day: 'numeric',
+              hour: 'numeric',
+              minute: '2-digit'
             }
-          } else if (this.isUpcoming) {
-            const startTimestamp = result.videoDetails.liveBroadcastDetails.startTimestamp
-
-            if (typeof startTimestamp !== 'undefined') {
-              const upcomingTimestamp = new Date(result.videoDetails.liveBroadcastDetails.startTimestamp)
-              const timestampOptions = {
-                month: 'long',
-                day: 'numeric',
-                hour: 'numeric',
-                minute: '2-digit'
-              }
-              if (new Date().getFullYear() < upcomingTimestamp.getFullYear()) {
-                Object.defineProperty(timestampOptions, 'year', {
-                  value: 'numeric'
-                })
-              }
-              this.upcomingTimestamp = Intl.DateTimeFormat(this.currentLocale, timestampOptions).format(upcomingTimestamp)
+            const now = new Date()
+            if (now.getFullYear() < upcomingTimestamp.getFullYear()) {
+              Object.defineProperty(timestampOptions, 'year', {
+                value: 'numeric'
+              })
+            }
+            this.upcomingTimestamp = Intl.DateTimeFormat(this.currentLocale, timestampOptions).format(upcomingTimestamp)
 
-              let upcomingTimeLeft = upcomingTimestamp - new Date()
+            let upcomingTimeLeft = upcomingTimestamp - now
 
-              // Convert from ms to second to minute
-              upcomingTimeLeft = (upcomingTimeLeft / 1000) / 60
-              let timeUnit = 'minute'
+            // Convert from ms to second to minute
+            upcomingTimeLeft = (upcomingTimeLeft / 1000) / 60
+            let timeUnit = 'minute'
 
-              // Youtube switches to showing time left in minutes at 120 minutes remaining
-              if (upcomingTimeLeft > 120) {
-                upcomingTimeLeft = upcomingTimeLeft / 60
-                timeUnit = 'hour'
-              }
+            // Youtube switches to showing time left in minutes at 120 minutes remaining
+            if (upcomingTimeLeft > 120) {
+              upcomingTimeLeft /= 60
+              timeUnit = 'hour'
+            }
 
-              if (timeUnit === 'hour' && upcomingTimeLeft > 24) {
-                upcomingTimeLeft = upcomingTimeLeft / 24
-                timeUnit = 'day'
-              }
+            if (timeUnit === 'hour' && upcomingTimeLeft > 24) {
+              upcomingTimeLeft /= 24
+              timeUnit = 'day'
+            }
 
-              // Value after decimal not to be displayed
-              // e.g. > 2 days = display as `2 days`
-              upcomingTimeLeft = Math.floor(upcomingTimeLeft)
-
-              // Displays when less than a minute remains
-              // Looks better than `Premieres in x seconds`
-              if (upcomingTimeLeft < 1) {
-                this.upcomingTimeLeft = this.$t('Video.Published.In less than a minute').toLowerCase()
-              } else {
-                // TODO a I18n entry for time format might be needed here
-                this.upcomingTimeLeft = new Intl.RelativeTimeFormat(this.currentLocale).format(upcomingTimeLeft, timeUnit)
-              }
+            // Value after decimal not to be displayed
+            // e.g. > 2 days = display as `2 days`
+            upcomingTimeLeft = Math.floor(upcomingTimeLeft)
+
+            // Displays when less than a minute remains
+            // Looks better than `Premieres in x seconds`
+            if (upcomingTimeLeft < 1) {
+              this.upcomingTimeLeft = this.$t('Video.Published.In less than a minute').toLowerCase()
             } else {
-              this.upcomingTimestamp = null
-              this.upcomingTimeLeft = null
+              // TODO a I18n entry for time format might be needed here
+              this.upcomingTimeLeft = new Intl.RelativeTimeFormat(this.currentLocale).format(upcomingTimeLeft, timeUnit)
             }
           } else {
-            this.videoLengthSeconds = parseInt(result.videoDetails.lengthSeconds)
-            if (result.player_response.streamingData !== undefined) {
-              if (typeof (result.player_response.streamingData.formats) !== 'undefined') {
-                this.videoSourceList = result.player_response.streamingData.formats.reverse()
-              } else {
-                this.videoSourceList = result.player_response.streamingData.adaptiveFormats.reverse()
-              }
-              this.adaptiveFormats = this.videoSourceList
-              this.downloadLinks = result.formats.filter((format) => {
-                return typeof format.mimeType !== 'undefined'
-              }).map((format) => {
-                const qualityLabel = format.qualityLabel || format.bitrate
-                const itag = format.itag
-                const fps = format.fps ? (format.fps + 'fps') : 'kbps'
-                const type = format.mimeType.match(/.*;/)[0].replace(';', '')
-                let label = `${qualityLabel} ${fps} - ${type}`
-
-                if (itag !== 18 && itag !== 22) {
-                  if (type.includes('video')) {
-                    label += ` ${this.$t('Video.video only')}`
-                  } else {
-                    label += ` ${this.$t('Video.audio only')}`
-                  }
-                }
-                const object = {
-                  url: format.url,
-                  label: label
+            this.upcomingTimestamp = null
+            this.upcomingTimeLeft = null
+          }
+        } else {
+          this.videoLengthSeconds = result.basic_info.duration
+          if (result.streaming_data) {
+            if (result.streaming_data.formats.length > 0) {
+              this.videoSourceList = result.streaming_data.formats.map(mapLocalFormat).reverse()
+            } else {
+              this.videoSourceList = result.streaming_data.adaptive_formats.map(mapLocalFormat).reverse()
+            }
+            this.adaptiveFormats = this.videoSourceList
+
+            const formats = [...result.streaming_data.formats, ...result.streaming_data.adaptive_formats]
+            this.downloadLinks = formats.map((format) => {
+              const qualityLabel = format.quality_label ?? format.bitrate
+              const fps = format.fps ? `${format.fps}fps` : 'kbps'
+              const type = format.mime_type.match(/.*;/)[0].replace(';', '')
+              let label = `${qualityLabel} ${fps} - ${type}`
+
+              if (format.has_audio !== format.has_video) {
+                if (format.has_video) {
+                  label += ` ${this.$t('Video.video only')}`
+                } else {
+                  label += ` ${this.$t('Video.audio only')}`
                 }
+              }
 
-                return object
-              })
+              return {
+                url: format.url,
+                label: label
+              }
+            })
 
-              const captionTracks =
-                result.player_response.captions &&
-                result.player_response.captions.playerCaptionsTracklistRenderer
-                  .captionTracks
-
-              if (typeof captionTracks !== 'undefined') {
-                const locale = this.$i18n.locale
-                if (locale !== null) {
-                  const standardLocale = locale.replace('_', '-')
-                  const noLocaleCaption = !captionTracks.some(track =>
-                    track.languageCode === standardLocale && track.kind !== 'asr'
-                  )
-
-                  if (!standardLocale.startsWith('en') && noLocaleCaption) {
-                    captionTracks.forEach((caption) => {
-                      this.tryAddingTranslatedLocaleCaption(captionTracks, standardLocale, caption.baseUrl)
-                    })
-                  }
+            if (result.captions) {
+              const captionTracks = result.captions.caption_tracks.map((caption) => {
+                return {
+                  url: caption.base_url,
+                  label: caption.name.text,
+                  language_code: caption.language_code,
+                  kind: caption.kind
                 }
+              })
+              if (this.currentLocale) {
+                const noLocaleCaption = !captionTracks.some(track =>
+                  track.language_code === this.currentLocale && track.kind !== 'asr'
+                )
+
+                if (!this.currentLocale.startsWith('en') && noLocaleCaption) {
+                  captionTracks.forEach((caption) => {
+                    this.tryAddingTranslatedLocaleCaption(captionTracks, this.currentLocale, caption.url)
+                  })
+                }
+              }
 
-                this.captionHybridList = this.createCaptionPromiseList(captionTracks)
+              this.captionHybridList = this.createCaptionPromiseList(captionTracks)
 
-                const captionLinks = captionTracks.map((caption) => {
-                  const label = `${caption.name.simpleText} (${caption.languageCode}) - text/vtt`
+              const captionLinks = captionTracks.map((caption) => {
+                const label = `${caption.label} (${caption.language_code}) - text/vtt`
 
-                  return {
-                    url: caption.baseUrl,
-                    label: label
-                  }
-                })
+                return {
+                  url: caption.url,
+                  label: label
+                }
+              })
 
-                this.downloadLinks = this.downloadLinks.concat(captionLinks)
-              }
-            } else {
-              // video might be region locked or something else. This leads to no formats being available
-              showToast(
-                this.$t('This video is unavailable because of missing formats. This can happen due to country unavailability.'),
-                7000
-              )
-              this.handleVideoEnded()
-              return
+              this.downloadLinks = this.downloadLinks.concat(captionLinks)
             }
+          } else {
+            // video might be region locked or something else. This leads to no formats being available
+            showToast(
+              this.$t('This video is unavailable because of missing formats. This can happen due to country unavailability.'),
+              7000
+            )
+            this.handleVideoEnded()
+            return
+          }
 
-            if (typeof result.player_response.streamingData.adaptiveFormats !== 'undefined') {
-              const adaptiveFormats = result.player_response.streamingData.adaptiveFormats
-              this.adaptiveFormats = adaptiveFormats
-              if (this.proxyVideos) {
-                this.dashSrc = await this.createInvidiousDashManifest()
-              } else {
-                this.dashSrc = await this.createLocalDashManifest(adaptiveFormats)
-              }
+          if (result.streaming_data?.adaptive_formats.length > 0) {
+            this.adaptiveFormats = result.streaming_data.adaptive_formats.map(mapLocalFormat)
+            if (this.proxyVideos) {
+              this.dashSrc = await this.createInvidiousDashManifest()
+            } else {
+              this.dashSrc = await this.createLocalDashManifest(result)
+            }
 
-              this.audioSourceList = result.player_response.streamingData.adaptiveFormats.filter((format) => {
-                return format.mimeType.includes('audio')
-              }).sort((a, b) => {
-                return a.bitrate - b.bitrate
-              }).map((format, index) => {
-                const label = (x) => {
-                  switch (x) {
-                    case 0:
-                      return this.$t('Video.Audio.Low')
-                    case 1:
-                      return this.$t('Video.Audio.Medium')
-                    case 2:
-                      return this.$t('Video.Audio.High')
-                    case 3:
-                      return this.$t('Video.Audio.Best')
-                    default:
-                      return format.bitrate
-                  }
-                }
-                return {
-                  url: format.url,
-                  type: format.mimeType,
-                  label: 'Audio',
-                  qualityLabel: label(index)
+            this.audioSourceList = result.streaming_data.adaptive_formats.filter((format) => {
+              return format.has_audio
+            }).sort((a, b) => {
+              return a.bitrate - b.bitrate
+            }).map((format, index) => {
+              const label = (x) => {
+                switch (x) {
+                  case 0:
+                    return this.$t('Video.Audio.Low')
+                  case 1:
+                    return this.$t('Video.Audio.Medium')
+                  case 2:
+                    return this.$t('Video.Audio.High')
+                  case 3:
+                    return this.$t('Video.Audio.Best')
+                  default:
+                    return format.bitrate
                 }
-              }).reverse()
-
-              if (this.activeFormat === 'audio') {
-                this.activeSourceList = this.audioSourceList
-              } else {
-                this.activeSourceList = this.videoSourceList
               }
+              return {
+                url: format.url,
+                type: format.mime_type,
+                label: 'Audio',
+                qualityLabel: label(index)
+              }
+            }).reverse()
+
+            if (this.activeFormat === 'audio') {
+              this.activeSourceList = this.audioSourceList
             } else {
               this.activeSourceList = this.videoSourceList
-              this.audioSourceList = null
-              this.dashSrc = null
-              this.enableLegacyFormat()
-            }
-
-            if (typeof result.player_response.storyboards !== 'undefined') {
-              const templateUrl = result.player_response.storyboards.playerStoryboardSpecRenderer.spec
-              await this.createLocalStoryboardUrls(templateUrl)
             }
+          } else {
+            this.activeSourceList = this.videoSourceList
+            this.audioSourceList = null
+            this.dashSrc = null
+            this.enableLegacyFormat()
           }
 
-          this.isLoading = false
-          this.updateTitle()
-        })
-        .catch(err => {
-          const errorMessage = this.$t('Local API Error (Click to copy)')
-          showToast(`${errorMessage}: ${err}`, 10000, () => {
-            copyToClipboard(err)
-          })
-          console.error(err)
-          if (this.backendPreference === 'local' && this.backendFallback && !err.toString().includes('private')) {
-            showToast(this.$t('Falling back to Invidious API'))
-            this.getVideoInformationInvidious()
-          } else {
-            this.isLoading = false
+          if (result.storyboards?.type === 'PlayerStoryboardSpec') {
+            await this.createLocalStoryboardUrls(result.storyboards.boards[2])
           }
+        }
+
+        this.isLoading = false
+        this.updateTitle()
+      } catch (err) {
+        const errorMessage = this.$t('Local API Error (Click to copy)')
+        showToast(`${errorMessage}: ${err}`, 10000, () => {
+          copyToClipboard(err)
         })
+        console.error(err)
+        if (this.backendPreference === 'local' && this.backendFallback && !err.toString().includes('private')) {
+          showToast(this.$t('Falling back to Invidious API'))
+          this.getVideoInformationInvidious()
+        } else {
+          this.isLoading = false
+        }
+      }
     },
 
     getVideoInformationInvidious: function () {
@@ -859,62 +868,6 @@ export default Vue.extend({
         })
     },
 
-    processDescriptionPart(part, fallbackDescription) {
-      const timestampRegex = /^(\d+:)?\d+:\d+$/
-
-      if (typeof part.navigationEndpoint === 'undefined' || part.navigationEndpoint === null || part.text.startsWith('#')) {
-        return part.text
-      }
-
-      if (part.navigationEndpoint.urlEndpoint) {
-        const urlWithTracking = part.navigationEndpoint.urlEndpoint.url
-        const url = new URL(urlWithTracking)
-
-        if (url.hostname === 'www.youtube.com' && url.pathname === '/redirect' && url.searchParams.has('q')) {
-          // remove utm tracking parameters
-          const realURL = new URL(url.searchParams.get('q'))
-
-          realURL.searchParams.delete('utm_source')
-          realURL.searchParams.delete('utm_medium')
-          realURL.searchParams.delete('utm_campaign')
-          realURL.searchParams.delete('utm_term')
-          realURL.searchParams.delete('utm_content')
-
-          return realURL.toString()
-        } else if (fallbackDescription.includes(urlWithTracking)) {
-          // this is probably a special YouTube URL like http://www.youtube.com/approachingnirvana
-          // only use it if it exists in the fallback description
-          // otherwise assume YouTube has changed it's tracking URLs and throw an error
-          return urlWithTracking
-        }
-
-        // eslint-disable-next-line no-throw-literal
-        throw `Failed to extract real URL from tracking URL: ${urlWithTracking}`
-      } else if (part.navigationEndpoint.watchEndpoint) {
-        if (timestampRegex.test(part.text)) {
-          return part.text
-        }
-        const watchEndpoint = part.navigationEndpoint.watchEndpoint
-
-        let videoURL = `https://www.youtube.com/watch?v=${watchEndpoint.videoId}`
-        if (watchEndpoint.startTimeSeconds !== 0) {
-          videoURL += `&t=${watchEndpoint.startTimeSeconds}s`
-        }
-        return videoURL
-      } else {
-        // Some YouTube URLs don't have the urlEndpoint so we handle them here
-
-        const { browseEndpoint, commandMetadata: { webCommandMetadata } } = part.navigationEndpoint
-        // channel handle
-        if (webCommandMetadata.webPageType === 'WEB_PAGE_TYPE_CHANNEL' && part.text.startsWith('@')) {
-          return `<a href="https://www.youtube.com/channel/${browseEndpoint.browseId}">${part.text}</a>`
-        } else {
-          const path = webCommandMetadata.url
-          return `https://www.youtube.com${path}`
-        }
-      }
-    },
-
     addChaptersEndSeconds: function (chapters, videoLengthSeconds) {
       for (let i = 0; i < chapters.length - 1; i++) {
         chapters[i].endSeconds = chapters[i + 1].startSeconds
@@ -1033,9 +986,9 @@ export default Vue.extend({
     },
 
     getLegacyFormats: function () {
-      this.ytGetVideoInformation(this.videoId)
+      getLocalVideoInfo(this.videoId)
         .then(result => {
-          this.videoSourceList = result.player_response.streamingData.formats
+          this.videoSourceList = result.streaming_data.formats.map(mapLocalFormat)
         })
         .catch(err => {
           const errorMessage = this.$t('Local API Error (Click to copy)')
@@ -1245,8 +1198,14 @@ export default Vue.extend({
       }
     },
 
-    createLocalDashManifest: async function (formats) {
-      const xmlData = ytDashGen.generate_dash_file_from_formats(formats, this.videoLengthSeconds)
+    /**
+     * @typedef {import('youtubei.js/dist/src/parser/youtube/VideoInfo').default} VideoInfo
+     */
+    /**
+     * @param {VideoInfo} videoInfo
+     */
+    createLocalDashManifest: async function (videoInfo) {
+      const xmlData = videoInfo.toDash()
       const userData = await getUserDataPath()
       let fileLocation
       let uriSchema
@@ -1286,7 +1245,7 @@ export default Vue.extend({
     createInvidiousDashManifest: function () {
       let url = `${this.currentInvidiousInstance}/api/manifest/dash/id/${this.videoId}`
 
-      if (this.proxyVideos || !process.env.IS_ELECTRON) {
+      if (!process.env.IS_ELECTRON || this.proxyVideos) {
         url += '?local=true'
       }
 
@@ -1300,31 +1259,8 @@ export default Vue.extend({
       ]
     },
 
-    createLocalStoryboardUrls: async function (templateUrl) {
-      const storyboards = templateUrl.split('|')
-      const storyboardArray = []
-      // Second storyboard: L1/M0 - Third storyboard: L2/M0 - Fourth: L3/M0
-
-      const baseUrl = storyboards.shift()
-      // remove the first link because it does not work
-      storyboards.splice(0, 1)
-      storyboards.forEach((storyboard, i) => {
-        // Not sure why the _ variable is needed, but storyboards don't work unless we initialize it.
-
-        /* eslint-disable-next-line */
-        const [width, height, count, sWidth, sHeight, interval, _, sigh] = storyboard.split('#')
-        storyboardArray.push({
-          url: baseUrl.replace('$L', i + 1).replace('$N', 'M0').replaceAll(/<\/?sub>/g, '') + '&sigh=' + sigh,
-          width: Number(width), // Width of one sub image
-          height: Number(height), // Height of one sub image
-          sWidth: Number(sWidth), // Number of images vertically  (if full)
-          sHeight: Number(sHeight), // Number of images horizontally (if full)
-          count: Number(count), // Number of images total
-          interval: Number(interval) // How long one image is used
-        })
-      })
-      // TODO: MAKE A VARIABLE WHICH CAN CHOOSE BETWEEN STORYBOARD ARRAY ELEMENTS
-      const results = buildVTTFileLocally(storyboardArray[1])
+    createLocalStoryboardUrls: async function (storyboardInfo) {
+      const results = buildVTTFileLocally(storyboardInfo)
       const userData = await getUserDataPath()
       let fileLocation
       let uriSchema
@@ -1357,7 +1293,7 @@ export default Vue.extend({
 
     tryAddingTranslatedLocaleCaption: function (captionTracks, locale, baseUrl) {
       const enCaptionIdx = captionTracks.findIndex(track =>
-        track.languageCode === 'en' && track.kind !== 'asr'
+        track.language_code === 'en' && track.kind !== 'asr'
       )
 
       const enCaptionExists = enCaptionIdx !== -1
@@ -1374,14 +1310,14 @@ export default Vue.extend({
         }
 
         const indexTranslated = captionTracks.findIndex((item) => {
-          return item.name.simpleText === label
+          return item.label === label
         })
         if (indexTranslated !== -1) {
           return
         }
 
         if (enCaptionExists) {
-          url = new URL(captionTracks[enCaptionIdx].baseUrl)
+          url = new URL(captionTracks[enCaptionIdx].url)
         } else {
           url = new URL(baseUrl)
           url.searchParams.set('lang', 'en')
@@ -1390,8 +1326,8 @@ export default Vue.extend({
 
         url.searchParams.set('tlang', locale)
         captionTracks.unshift({
-          baseUrl: url.toString(),
-          name: { simpleText: label },
+          url: url.toString(),
+          label,
           languageCode: locale
         })
       }
@@ -1403,7 +1339,7 @@ export default Vue.extend({
         caption.charset = 'charset=utf-8'
         caption.dataSource = 'local'
 
-        const url = new URL(caption.baseUrl)
+        const url = new URL(caption.url)
         url.searchParams.set('fmt', 'vtt')
 
         fetch(url)
@@ -1429,7 +1365,7 @@ export default Vue.extend({
               vtt = vtt.replaceAll(/ position:\d{1,3}%/g, '')
             }
 
-            caption.baseUrl = `data:${caption.type};${caption.charset},${vtt}`
+            caption.url = `data:${caption.type};${caption.charset},${vtt}`
             resolve(caption)
           })
           .catch((error) => {
@@ -1481,7 +1417,6 @@ export default Vue.extend({
     ...mapActions([
       'updateHistory',
       'updateWatchProgress',
-      'ytGetVideoInformation',
       'invidiousGetVideoInformation',
       'updateSubscriptionDetails'
     ])
diff --git a/yarn.lock b/yarn.lock
index cd44e8aa5db9..cb422659c121 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1821,7 +1821,7 @@ aes-decrypter@3.1.3:
     global "^4.4.0"
     pkcs7 "^1.0.4"
 
-agent-base@6, agent-base@^6.0.2:
+agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
@@ -3196,7 +3196,7 @@ debug@2.6.9, debug@^2.6.8, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -4833,11 +4833,6 @@ hpack.js@^2.1.6:
     readable-stream "^2.0.1"
     wbuf "^1.1.0"
 
-html-entities@^1.3.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
-  integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
-
 html-entities@^2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46"
@@ -5155,11 +5150,6 @@ interpret@^3.1.1:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
   integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
 
-ip@^1.1.5:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48"
-  integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==
-
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
@@ -5921,22 +5911,6 @@ m3u8-parser@4.7.1:
     "@videojs/vhs-utils" "^3.0.5"
     global "^4.4.0"
 
-m3u8stream@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/m3u8stream/-/m3u8stream-0.7.1.tgz#74b01a67ca248ac7bbdc263a65d9d8d2c479a65c"
-  integrity sha512-z6ldnAdhbuWOL6LmMkwptSZGzj+qbRytMKLTbNicwF/bJMjf9U9lqD57RNQUFecvWadEkzy6PDjcNJFFgi19uQ==
-  dependencies:
-    miniget "^1.6.1"
-    sax "^1.2.4"
-
-m3u8stream@^0.8.6:
-  version "0.8.6"
-  resolved "https://registry.yarnpkg.com/m3u8stream/-/m3u8stream-0.8.6.tgz#0d6de4ce8ee69731734e6b616e7b05dd9d9a55b1"
-  integrity sha512-LZj8kIVf9KCphiHmH7sbFQTVe4tOemb202fWwvJwR9W5ENW/1hxJN6ksAWGhQgSBSa3jyWhnjKU1Fw1GaOdbyA==
-  dependencies:
-    miniget "^4.2.2"
-    sax "^1.2.4"
-
 make-dir@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -6119,21 +6093,6 @@ mini-css-extract-plugin@^2.7.2:
   dependencies:
     schema-utils "^4.0.0"
 
-miniget@^1.6.1:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/miniget/-/miniget-1.7.2.tgz#f95eff50b78d798dddee2460c4aa3c72db1aa23a"
-  integrity sha512-USPNNK2bnHLOplX8BZVMehUkyQizS/DFpBdoH0TS+fM+hQoLNg9tWg4MeY9wE8gfY0pbzmx5UBEODujt3Lz8AA==
-
-miniget@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/miniget/-/miniget-2.1.0.tgz#2dfb9ecb3a9a55d9dc682102f65fca2a06e3f5ca"
-  integrity sha512-fy9x3d/0oOIhkwAms6kgxTYkHwdELhMfgj+9a/aYZpJdTWIIWGta9aXHUtnzUn+LjBmRoTdPRQSi2hkmEvXk3A==
-
-miniget@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/miniget/-/miniget-4.2.2.tgz#db20320f265efdc4c1826a0be431d56753074475"
-  integrity sha512-a7voNL1N5lDMxvTMExOkg+Fq89jM2vY8pAi9ZEWzZtfNmdfP6RXkvUtFnCAXoCv2T9k1v/fUJVaAEuepGcvLYA==
-
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
@@ -7633,7 +7592,7 @@ sass@^1.57.1:
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sax@^1.1.3, sax@^1.2.4:
+sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -7867,7 +7826,7 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
-smart-buffer@^4.0.2, smart-buffer@^4.2.0:
+smart-buffer@^4.0.2:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
@@ -7881,23 +7840,6 @@ sockjs@^0.3.24:
     uuid "^8.3.2"
     websocket-driver "^0.7.4"
 
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
-
-socks@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a"
-  integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==
-  dependencies:
-    ip "^1.1.5"
-    smart-buffer "^4.2.0"
-
 sort-keys-length@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188"
@@ -9151,13 +9093,6 @@ ws@^8.4.2:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz#e5e9f1d9e7ff88083d0c0dd8281ea662a42c9c23"
   integrity sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==
 
-xml-js@^1.6.11:
-  version "1.6.11"
-  resolved "https://registry.yarnpkg.com/xml-js/-/xml-js-1.6.11.tgz#927d2f6947f7f1c19a316dd8eea3614e8b18f8e9"
-  integrity sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==
-  dependencies:
-    sax "^1.2.4"
-
 xml-name-validator@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
@@ -9239,10 +9174,10 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
-youtubei.js@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-2.7.0.tgz#2b980f3e97c9b05097d3b387ff4f6a8d42a61e0d"
-  integrity sha512-npMhgWSru/tPdHvUUqgc0UZv9J7nn/o2V9cfcMS2WvnjhHW9vc9wR54QxyNxURC3uFKkk5WBouu+QjMn+bMtwg==
+youtubei.js@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-2.8.0.tgz#f0170f390791cde733facf615f3cf0e2470c31de"
+  integrity sha512-UEH3wP1Wmrmnh2wJohhg+rAq94bF2EqGnlnph2z91kZ+I1tQzlZD09Zc7QNqCYV0t2G4Cl2Lu+DqXrdhf1/SoQ==
   dependencies:
     "@protobuf-ts/runtime" "^2.7.0"
     jintr "^0.3.1"
@@ -9255,29 +9190,3 @@ yt-channel-info@^3.2.1:
   integrity sha512-drGySe+MqoYMhZzkJpapG5pCfAEBSsCaOZXDzZz4nfQfYhXQGUU11IJ9HpDZmnari1vEWrUasjeu2hwZujZYmw==
   dependencies:
     axios "^1.1.2"
-
-yt-dash-manifest-generator@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/yt-dash-manifest-generator/-/yt-dash-manifest-generator-1.1.0.tgz#3cbcb086cbb4f6d9cb44f718d3d08b7d5467be1a"
-  integrity sha512-kLYeroH5LmdlvoRf4PrYyzgR5+tFaB1COSsLOjKHPnDvHQ+0Vp+c258TYR0WQp2RNpW57DYci9WG3O8+b1FQzQ==
-  dependencies:
-    xml-js "^1.6.11"
-    ytdl-core "^3.2.2"
-
-ytdl-core@^3.2.2:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/ytdl-core/-/ytdl-core-3.4.2.tgz#0d3d35f54d4f6b1de870b987f3d45e88c64b6a6c"
-  integrity sha512-R6m1XZQK+iXxb9Q9Wo14/K8mti1r4HnKv4zKrbp5FvMG/jDbeV0xQHUHqqDLk+uiDy/VU6fVATm5x2ms0QaF5w==
-  dependencies:
-    html-entities "^1.3.1"
-    m3u8stream "^0.7.1"
-    miniget "^2.0.1"
-    sax "^1.1.3"
-
-"ytdl-core@https://github.com/absidue/node-ytdl-core#fix-likes-extraction":
-  version "0.0.0-development"
-  resolved "https://github.com/absidue/node-ytdl-core#937d589cbe5f69f3153a7db12bf529c92a620800"
-  dependencies:
-    m3u8stream "^0.8.6"
-    miniget "^4.2.2"
-    sax "^1.1.3"

From be8508e42d1457a8bf2415fc4c8fb96bfc0964f5 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 7 Jan 2023 01:27:02 +0000
Subject: [PATCH 247/301] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/zh_Hant/
---
 static/locales/zh-TW.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/zh-TW.yaml b/static/locales/zh-TW.yaml
index 08bdcf8644b4..a0636378e607 100644
--- a/static/locales/zh-TW.yaml
+++ b/static/locales/zh-TW.yaml
@@ -643,6 +643,7 @@ Video:
   Premieres: 首映
   Show Super Chat Comment: 顯示超級聊天留言
   Scroll to Bottom: 捲動至底部
+  Upcoming: 即將到來
 Videos:
   #& Sort By
   Sort By:

From 55b37814695685cf969a0695d5221f091195be18 Mon Sep 17 00:00:00 2001
From: ovari <ovari123@zoho.com>
Date: Sat, 7 Jan 2023 11:05:38 +0000
Subject: [PATCH 248/301] Translated using Weblate (Hungarian)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/hu/
---
 static/locales/hu.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/hu.yaml b/static/locales/hu.yaml
index b72f936dd829..35a3025645f8 100644
--- a/static/locales/hu.yaml
+++ b/static/locales/hu.yaml
@@ -735,6 +735,7 @@ Video:
   Premieres: Első előadások
   Show Super Chat Comment: Haladó csevegési megjegyzés megjelenítése
   Scroll to Bottom: Görgetés legalulra
+  Upcoming: Közelgő
 Videos:
   #& Sort By
   Sort By:

From dd404937998695f56e9fa568b6eabda34409269c Mon Sep 17 00:00:00 2001
From: Ettore Atalan <atalanttore@googlemail.com>
Date: Sat, 7 Jan 2023 16:21:24 +0000
Subject: [PATCH 249/301] Translated using Weblate (German)

Currently translated at 99.8% (658 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/de/
---
 static/locales/de-DE.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/static/locales/de-DE.yaml b/static/locales/de-DE.yaml
index fe0d076d7926..d5b6b60d50a0 100644
--- a/static/locales/de-DE.yaml
+++ b/static/locales/de-DE.yaml
@@ -398,6 +398,8 @@ Settings:
     Hide Upcoming Premieres: Anstehende Premieren ausblenden
     Hide Channels: Videos aus Kanälen ausblenden
     Hide Channels Placeholder: Kanalname oder Kanal-ID
+    Display Titles Without Excessive Capitalisation: Titel ohne übermäßige Großschreibung
+      anzeigen
   The app needs to restart for changes to take effect. Restart and apply change?: Um
     die Änderungen anzuwenden muss die Anwendung neustarten. Jetzt neustarten und
     Änderungen aktivieren?
@@ -714,6 +716,7 @@ Video:
   Premieres: Premiere
   Show Super Chat Comment: Super-Chat-Kommentar anzeigen
   Scroll to Bottom: Nach unten scrollen
+  Upcoming: Demnächst
 Videos:
   #& Sort By
   Sort By:

From fe85a17b4e4962590c86b46fe5ce160b99497132 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sat, 7 Jan 2023 20:45:27 +0100
Subject: [PATCH 250/301] Use webpack externals to exclude dependencies (#3036)

---
 _scripts/webpack.renderer.config.js |  8 ++++----
 _scripts/webpack.web.config.js      | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
index 8b8ad3c6e4e2..21258d9e4a80 100644
--- a/_scripts/webpack.renderer.config.js
+++ b/_scripts/webpack.renderer.config.js
@@ -32,6 +32,10 @@ const config = {
     path: path.join(__dirname, '../dist'),
     filename: '[name].js',
   },
+  externals: {
+    // ignore linkedom's unnecessary broken canvas import, as youtubei.js only uses linkedom to generate DASH manifests
+    canvas: '{}'
+  },
   module: {
     rules: [
       {
@@ -122,10 +126,6 @@ const config = {
     new MiniCssExtractPlugin({
       filename: isDevMode ? '[name].css' : '[name].[contenthash].css',
       chunkFilename: isDevMode ? '[id].css' : '[id].[contenthash].css',
-    }),
-    // ignore linkedom's unnecessary broken canvas import, as youtubei.js only uses linkedom to generate DASH manifests
-    new webpack.IgnorePlugin({
-      resourceRegExp: /^canvas$/
     })
   ],
   resolve: {
diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
index 42ab8dac26a3..a61bdbc2d1f0 100644
--- a/_scripts/webpack.web.config.js
+++ b/_scripts/webpack.web.config.js
@@ -22,9 +22,17 @@ const config = {
     path: path.join(__dirname, '../dist/web'),
     filename: '[name].js',
   },
-  externals: {
-    electron: '{}'
-  },
+  externals: [
+    {
+      electron: '{}'
+    },
+    ({ request }, callback) => {
+      if (request.startsWith('youtubei.js')) {
+        return callback(null, '{}')
+      }
+      callback()
+    }
+  ],
   module: {
     rules: [
       {
@@ -122,10 +130,6 @@ const config = {
     new MiniCssExtractPlugin({
       filename: isDevMode ? '[name].css' : '[name].[contenthash].css',
       chunkFilename: isDevMode ? '[id].css' : '[id].[contenthash].css',
-    }),
-    // ignore all youtubei.js imports, even the ones with paths in them
-    new webpack.IgnorePlugin({
-      resourceRegExp: /^youtubei\.js/
     })
   ],
   resolve: {

From 75bf0377ca8263d3b0cbe48d1bdf2a9a2c82c833 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 8 Jan 2023 01:29:06 +0100
Subject: [PATCH 251/301] Hide the proxy settings in the web build (#3037)

---
 src/renderer/components/proxy-settings/proxy-settings.js | 2 --
 src/renderer/views/Settings/Settings.vue                 | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/proxy-settings/proxy-settings.js b/src/renderer/components/proxy-settings/proxy-settings.js
index abc50e7283ef..33df0bf8d406 100644
--- a/src/renderer/components/proxy-settings/proxy-settings.js
+++ b/src/renderer/components/proxy-settings/proxy-settings.js
@@ -8,8 +8,6 @@ import FtInput from '../ft-input/ft-input.vue'
 import FtLoader from '../ft-loader/ft-loader.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 
-// FIXME: Missing web logic branching
-
 import { ipcRenderer } from 'electron'
 import debounce from 'lodash.debounce'
 
diff --git a/src/renderer/views/Settings/Settings.vue b/src/renderer/views/Settings/Settings.vue
index d8c27347bb1a..0109b54cdd09 100644
--- a/src/renderer/views/Settings/Settings.vue
+++ b/src/renderer/views/Settings/Settings.vue
@@ -17,8 +17,8 @@
       <hr>
       <data-settings />
       <hr>
-      <proxy-settings />
-      <hr>
+      <proxy-settings v-if="usingElectron" />
+      <hr v-if="usingElectron">
       <download-settings v-if="usingElectron" />
       <hr v-if="usingElectron">
       <parental-control-settings />

From 17ad3da18fd34281611922a6e500446b9d836c1e Mon Sep 17 00:00:00 2001
From: Emma <MarmadileManteater@proton.me>
Date: Sun, 8 Jan 2023 06:33:29 -0500
Subject: [PATCH 252/301] Update mastodon link to `@FreeTube@fosstodon.org`
 (#3038)

AFAIK mastodon.technology is shut down
---
 src/renderer/views/About/About.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/About/About.js b/src/renderer/views/About/About.js
index 5b2df21f87be..3e65a78dd98b 100644
--- a/src/renderer/views/About/About.js
+++ b/src/renderer/views/About/About.js
@@ -49,7 +49,7 @@ export default Vue.extend({
         {
           icon: ['fab', 'mastodon'],
           title: this.$t('About.Mastodon'),
-          content: '<a href="https://mastodon.technology/@FreeTube">@FreeTube@mastodon.technology</a>'
+          content: '<a href="https://fosstodon.org/@FreeTube">@FreeTube@fosstodon.org</a>'
         },
         {
           icon: ['fas', 'comment-dots'],

From abd470885a2b8c3acf0f48937ea0eafe16fe1f08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jan 2023 09:47:06 +0100
Subject: [PATCH 253/301] Bump prettier from 2.8.1 to 2.8.2 (#3044)

Bumps [prettier](https://github.com/prettier/prettier) from 2.8.1 to 2.8.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.8.1...2.8.2)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index cc2bff687ae3..269ac80e8c34 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.20",
     "postcss-scss": "^4.0.6",
-    "prettier": "^2.8.1",
+    "prettier": "^2.8.2",
     "rimraf": "^3.0.2",
     "sass": "^1.57.1",
     "sass-loader": "^13.2.0",
diff --git a/yarn.lock b/yarn.lock
index cb422659c121..ce0ea12d1f5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7027,10 +7027,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-"prettier@^1.18.2 || ^2.0.0", prettier@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.1.tgz#4e1fd11c34e2421bc1da9aea9bd8127cd0a35efc"
-  integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==
+"prettier@^1.18.2 || ^2.0.0", prettier@^2.8.2:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.2.tgz#c4ea1b5b454d7c4b59966db2e06ed7eec5dfd160"
+  integrity sha512-BtRV9BcncDyI2tsuS19zzhzoxD8Dh8LiCx7j7tHzrkz8GFXAexeWFdi22mjE1d16dftH2qNaytVxqiRTGlMfpw==
 
 pretty-error@^4.0.0:
   version "4.0.0"

From 23a6ea0cfa570811ddd0e4fb2df5083d1f234e48 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jan 2023 09:47:21 +0100
Subject: [PATCH 254/301] Bump @babel/core from 7.20.7 to 7.20.12 (#3043)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.20.7 to 7.20.12.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.20.12/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 269ac80e8c34..12a3b3042a81 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "yt-channel-info": "^3.2.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.7",
+    "@babel/core": "^7.20.12",
     "@babel/eslint-parser": "^7.19.1",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/preset-env": "^7.20.2",
diff --git a/yarn.lock b/yarn.lock
index ce0ea12d1f5b..70eae383128a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -32,25 +32,25 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec"
   integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==
 
-"@babel/core@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz#37072f951bd4d28315445f66e0ec9f6ae0c8c35f"
-  integrity sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw==
+"@babel/core@^7.20.12":
+  version "7.20.12"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d"
+  integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.18.6"
     "@babel/generator" "^7.20.7"
     "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-module-transforms" "^7.20.7"
+    "@babel/helper-module-transforms" "^7.20.11"
     "@babel/helpers" "^7.20.7"
     "@babel/parser" "^7.20.7"
     "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.7"
+    "@babel/traverse" "^7.20.12"
     "@babel/types" "^7.20.7"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
+    json5 "^2.2.2"
     semver "^6.3.0"
 
 "@babel/eslint-parser@^7.19.1":
@@ -187,7 +187,7 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.7":
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.11":
   version "7.20.11"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0"
   integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==
@@ -927,10 +927,10 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.7":
-  version "7.20.10"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.10.tgz#2bf98239597fcec12f842756f186a9dde6d09230"
-  integrity sha512-oSf1juCgymrSez8NI4A2sr4+uB/mFd9MXplYGPEBnfAuWmmyeVcHa6xLPiaRBcXkcb/28bgxmQLTVwFKE1yfsg==
+"@babel/traverse@^7.18.11", "@babel/traverse@^7.18.9", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.7":
+  version "7.20.12"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5"
+  integrity sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==
   dependencies:
     "@babel/code-frame" "^7.18.6"
     "@babel/generator" "^7.20.7"
@@ -5604,10 +5604,10 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.2.0, json5@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
-  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+json5@^2.2.0, json5@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 jsonc-eslint-parser@^2.0.4:
   version "2.1.0"

From d0240fb1c91b1095ed098a4930c7ef75f401f552 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jan 2023 09:47:33 +0100
Subject: [PATCH 255/301] Bump babel-loader from 9.1.0 to 9.1.2 (#3042)

Bumps [babel-loader](https://github.com/babel/babel-loader) from 9.1.0 to 9.1.2.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v9.1.0...v9.1.2)

---
updated-dependencies:
- dependency-name: babel-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 12a3b3042a81..99c934eabd26 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/preset-env": "^7.20.2",
     "@double-great/stylelint-a11y": "^2.0.2",
-    "babel-loader": "^9.1.0",
+    "babel-loader": "^9.1.2",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.3",
     "css-minimizer-webpack-plugin": "^4.2.2",
diff --git a/yarn.lock b/yarn.lock
index 70eae383128a..37b2cd89b9fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2102,10 +2102,10 @@ axios@^1.1.2:
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
-babel-loader@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.0.tgz#839e9ae88aea930864ef9ec0f356dfca96ecf238"
-  integrity sha512-Antt61KJPinUMwHwIIz9T5zfMgevnfZkEVWYDWlG888fgdvRRGD0JTuf/fFozQnfT+uq64sk1bmdHDy/mOEWnA==
+babel-loader@^9.1.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.2.tgz#a16a080de52d08854ee14570469905a5fc00d39c"
+  integrity sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==
   dependencies:
     find-cache-dir "^3.3.2"
     schema-utils "^4.0.0"

From 842901fc9dc974432f6bd5ddfdb522e9ebe0dd91 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jan 2023 09:47:48 +0100
Subject: [PATCH 256/301] Bump eslint-plugin-jsonc from 2.5.0 to 2.6.0 (#3040)

Bumps [eslint-plugin-jsonc](https://github.com/ota-meshi/eslint-plugin-jsonc) from 2.5.0 to 2.6.0.
- [Release notes](https://github.com/ota-meshi/eslint-plugin-jsonc/releases)
- [Changelog](https://github.com/ota-meshi/eslint-plugin-jsonc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ota-meshi/eslint-plugin-jsonc/compare/v2.5.0...v2.6.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-jsonc
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 99c934eabd26..f0f03cef0f66 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "eslint-config-prettier": "^8.6.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsonc": "^2.5.0",
+    "eslint-plugin-jsonc": "^2.6.0",
     "eslint-plugin-n": "^15.6.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^6.1.1",
diff --git a/yarn.lock b/yarn.lock
index 37b2cd89b9fc..8ddbba4b0053 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3872,10 +3872,10 @@ eslint-plugin-import@^2.26.0:
     resolve "^1.22.0"
     tsconfig-paths "^3.14.1"
 
-eslint-plugin-jsonc@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.5.0.tgz#b0daea12f0927a3bba99557902ce6e0b48c37b4b"
-  integrity sha512-G257khwkrOQ5MJpSzz4yQh5K12W4xFZRcHmVlhVFWh2GCLDX+JwHnmkQoUoFDbOieSPBMsPFZDTJScwrXiWlIg==
+eslint-plugin-jsonc@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.6.0.tgz#5a439ec15b4930c022bf157264a3d4f4712b982c"
+  integrity sha512-4bA9YTx58QaWalua1Q1b82zt7eZMB7i+ed8q8cKkbKP75ofOA2SXbtFyCSok7RY6jIXeCqQnKjN9If8zCgv6PA==
   dependencies:
     eslint-utils "^3.0.0"
     jsonc-eslint-parser "^2.0.4"

From 4d4f1c0885da90ead5fd02f971a75f9bb9d0c37a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jan 2023 06:12:27 -0500
Subject: [PATCH 257/301] Bump postcss from 8.4.20 to 8.4.21 (#3041)

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.20 to 8.4.21.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.20...8.4.21)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f0f03cef0f66..423c712bea09 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
     "lefthook": "^1.2.6",
     "mini-css-extract-plugin": "^2.7.2",
     "npm-run-all": "^4.1.5",
-    "postcss": "^8.4.20",
+    "postcss": "^8.4.21",
     "postcss-scss": "^4.0.6",
     "prettier": "^2.8.2",
     "rimraf": "^3.0.2",
diff --git a/yarn.lock b/yarn.lock
index 8ddbba4b0053..788c41027b88 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7006,10 +7006,10 @@ postcss@^7.0.36:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.3.11, postcss@^8.4.14, postcss@^8.4.17, postcss@^8.4.19, postcss@^8.4.20:
-  version "8.4.20"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.20.tgz#64c52f509644cecad8567e949f4081d98349dc56"
-  integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==
+postcss@^8.3.11, postcss@^8.4.14, postcss@^8.4.17, postcss@^8.4.19, postcss@^8.4.21:
+  version "8.4.21"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
+  integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
   dependencies:
     nanoid "^3.3.4"
     picocolors "^1.0.0"

From 597cf8a66fd0b296e95c2ac06e352ed9b162ab9f Mon Sep 17 00:00:00 2001
From: Daniel Abrante <danielabrante@protonmail.com>
Date: Wed, 11 Jan 2023 15:58:00 +0000
Subject: [PATCH 258/301] Translated using Weblate (Portuguese)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt/
---
 static/locales/pt.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/pt.yaml b/static/locales/pt.yaml
index 2691c72e37ec..fa0297e3ff0a 100644
--- a/static/locales/pt.yaml
+++ b/static/locales/pt.yaml
@@ -30,7 +30,7 @@ Back: 'Recuar'
 Forward: 'Avançar'
 
 Version {versionNumber} is now available!  Click for more details: 'A versão {versionNumber}
-  está disponível! Clique aqui para mais informações.'
+  está disponível! Clique aqui para mais informações'
 Download From Site: 'Descarregar do site'
 A new blog is now available, {blogTitle}. Click to view more: 'Está disponível um
   novo blogue, {blogTitle}. Clique aqui para ver mais.'

From 0c69fc23e67b211f922c595520bf1e6eaafeaab0 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Thu, 12 Jan 2023 07:54:09 +0100
Subject: [PATCH 259/301] Generate local API sessions locally (#3052)

---
 src/renderer/helpers/api/local.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 21cd45b96cd0..66494a533974 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -35,7 +35,8 @@ async function createInnertube(options = { withPlayer: false, location: undefine
 
     // use browser fetch
     fetch: (input, init) => fetch(input, init),
-    cache
+    cache,
+    generate_session_locally: true
   })
 }
 

From 03f73c5d33820f08c2d461dad1b37c3b50fc5696 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Thu, 12 Jan 2023 01:55:21 -0500
Subject: [PATCH 260/301] Move invidious out of stores (#3045)

* move invidious out of stores

* fix getting more replies & local api fallback for comments

* throw error if error message found in invidious response

* fix issue with data setting

* fix issue with replacing thumbnails

* add bank line, remove slash

* Apply suggestions from code review

Co-authored-by: absidue <48293849+absidue@users.noreply.github.com>

Co-authored-by: absidue <48293849+absidue@users.noreply.github.com>
---
 src/main/index.js                             |   4 +-
 .../components/data-settings/data-settings.js |   4 +-
 .../ft-list-channel/ft-list-channel.js        |  10 +-
 .../ft-profile-channel-list.js                |   5 +-
 .../ft-profile-filter-channels-list.js        |   5 +-
 src/renderer/components/side-nav/side-nav.js  |   3 +-
 src/renderer/components/top-nav/top-nav.js    |   4 +-
 .../watch-video-comments.js                   |  96 ++++-----------
 .../watch-video-info/watch-video-info.js      |   1 -
 .../watch-video-playlist.js                   |  14 +--
 src/renderer/helpers/api/invidious.js         | 112 ++++++++++++++++++
 src/renderer/main.js                          |   2 +-
 src/renderer/store/modules/invidious.js       |  81 +------------
 src/renderer/store/modules/utils.js           |   2 +-
 src/renderer/views/Channel/Channel.js         |  22 ++--
 src/renderer/views/Playlist/Playlist.js       |  11 +-
 src/renderer/views/Popular/Popular.js         |  11 +-
 src/renderer/views/Search/Search.js           |  10 +-
 .../SubscribedChannels/SubscribedChannels.js  |  12 +-
 .../views/Subscriptions/Subscriptions.js      |   4 +-
 src/renderer/views/Trending/Trending.js       |  10 +-
 src/renderer/views/Watch/Watch.js             |  10 +-
 22 files changed, 201 insertions(+), 232 deletions(-)
 create mode 100644 src/renderer/helpers/api/invidious.js

diff --git a/src/main/index.js b/src/main/index.js
index b911fef6f67a..6bdff568c470 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -457,7 +457,7 @@ function runApp() {
       darkTheme: nativeTheme.shouldUseDarkColors,
       icon: process.env.NODE_ENV === 'development'
         ? path.join(__dirname, '../../_icons/iconColor.png')
-        /* eslint-disable-next-line */
+        /* eslint-disable-next-line n/no-path-concat */
         : `${__dirname}/_icons/iconColor.png`,
       autoHideMenuBar: true,
       // useContentSize: true,
@@ -548,7 +548,7 @@ function runApp() {
       if (windowStartupUrl != null) {
         newWindow.loadURL(windowStartupUrl)
       } else {
-        /* eslint-disable-next-line */
+        /* eslint-disable-next-line n/no-path-concat */
         newWindow.loadFile(`${__dirname}/index.html`)
       }
     }
diff --git a/src/renderer/components/data-settings/data-settings.js b/src/renderer/components/data-settings/data-settings.js
index 854c762d30ec..ca61126f3eed 100644
--- a/src/renderer/components/data-settings/data-settings.js
+++ b/src/renderer/components/data-settings/data-settings.js
@@ -16,6 +16,7 @@ import {
   showToast,
   writeFileFromDialog
 } from '../../helpers/utils'
+import { invidiousAPICall } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'DataSettings',
@@ -1018,7 +1019,7 @@ export default Vue.extend({
           params: {}
         }
 
-        this.invidiousAPICall(subscriptionsPayload).then((response) => {
+        invidiousAPICall(subscriptionsPayload).then((response) => {
           resolve(response)
         }).catch((err) => {
           console.error(err)
@@ -1116,7 +1117,6 @@ export default Vue.extend({
     },
 
     ...mapActions([
-      'invidiousAPICall',
       'updateProfile',
       'compactProfiles',
       'updateShowProgressBar',
diff --git a/src/renderer/components/ft-list-channel/ft-list-channel.js b/src/renderer/components/ft-list-channel/ft-list-channel.js
index 31de269b672c..4ea0bec01220 100644
--- a/src/renderer/components/ft-list-channel/ft-list-channel.js
+++ b/src/renderer/components/ft-list-channel/ft-list-channel.js
@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import i18n from '../../i18n/index'
+import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'FtListChannel',
@@ -76,14 +77,9 @@ export default Vue.extend({
 
     parseInvidiousData: function () {
       // Can be prefixed with `https://` or `//` (protocol relative)
-      let thumbnailUrl = this.data.authorThumbnails[2].url
+      const thumbnailUrl = this.data.authorThumbnails[2].url
 
-      // Update protocol relative URL to be prefixed with `https://`
-      if (thumbnailUrl.startsWith('//')) {
-        thumbnailUrl = `https:${thumbnailUrl}`
-      }
-
-      this.thumbnail = thumbnailUrl.replace('https://yt3.ggpht.com', `${this.currentInvidiousInstance}/ggpht/`)
+      this.thumbnail = youtubeImageUrlToInvidious(thumbnailUrl, this.currentInvidiousInstance)
 
       this.channelName = this.data.author
       this.id = this.data.authorId
diff --git a/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.js b/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.js
index 89bf80e65ecc..9d0483041679 100644
--- a/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.js
+++ b/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.js
@@ -7,6 +7,7 @@ import FtChannelBubble from '../../components/ft-channel-bubble/ft-channel-bubbl
 import FtButton from '../../components/ft-button/ft-button.vue'
 import FtPrompt from '../../components/ft-prompt/ft-prompt.vue'
 import { showToast } from '../../helpers/utils'
+import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'FtProfileChannelList',
@@ -80,7 +81,7 @@ export default Vue.extend({
         return 0
       }).map((channel) => {
         if (this.backendPreference === 'invidious') {
-          channel.thumbnail = channel.thumbnail.replace('https://yt3.ggpht.com', `${this.currentInvidiousInstance}/ggpht/`)
+          channel.thumbnail = youtubeImageUrlToInvidious(channel.thumbnail, this.currentInvidiousInstance)
         }
         channel.selected = false
         return channel
@@ -101,7 +102,7 @@ export default Vue.extend({
         return 0
       }).map((channel) => {
         if (this.backendPreference === 'invidious') {
-          channel.thumbnail = channel.thumbnail.replace('https://yt3.ggpht.com', `${this.currentInvidiousInstance}/ggpht/`)
+          channel.thumbnail = youtubeImageUrlToInvidious(channel.thumbnail, this.currentInvidiousInstance)
         }
         channel.selected = false
         return channel
diff --git a/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.js b/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.js
index 7ae4cdcf7128..2e4cea562385 100644
--- a/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.js
+++ b/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.js
@@ -7,6 +7,7 @@ import FtChannelBubble from '../../components/ft-channel-bubble/ft-channel-bubbl
 import FtButton from '../../components/ft-button/ft-button.vue'
 import FtSelect from '../ft-select/ft-select.vue'
 import { showToast } from '../../helpers/utils'
+import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'FtProfileFilterChannelsList',
@@ -71,7 +72,7 @@ export default Vue.extend({
         return index === -1
       }).map((channel) => {
         if (this.backendPreference === 'invidious') {
-          channel.thumbnail = channel.thumbnail.replace('https://yt3.ggpht.com', `${this.currentInvidiousInstance}/ggpht/`)
+          channel.thumbnail = youtubeImageUrlToInvidious(channel.thumbnail, this.currentInvidiousInstance)
         }
         channel.selected = false
         return channel
@@ -98,7 +99,7 @@ export default Vue.extend({
         return index === -1
       }).map((channel) => {
         if (this.backendPreference === 'invidious') {
-          channel.thumbnail = channel.thumbnail.replace('https://yt3.ggpht.com', `${this.currentInvidiousInstance}/ggpht/`)
+          channel.thumbnail = youtubeImageUrlToInvidious(channel.thumbnail, this.currentInvidiousInstance)
         }
         channel.selected = false
         return channel
diff --git a/src/renderer/components/side-nav/side-nav.js b/src/renderer/components/side-nav/side-nav.js
index 7c7be13ef65c..b9940b4a0372 100644
--- a/src/renderer/components/side-nav/side-nav.js
+++ b/src/renderer/components/side-nav/side-nav.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import SideNavMoreOptions from '../side-nav-more-options/side-nav-more-options.vue'
+import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'SideNav',
@@ -41,7 +42,7 @@ export default Vue.extend({
         return 0
       }).map((channel) => {
         if (this.backendPreference === 'invidious') {
-          channel.thumbnail = channel.thumbnail.replace('https://yt3.ggpht.com', `${this.currentInvidiousInstance}/ggpht/`)
+          channel.thumbnail = youtubeImageUrlToInvidious(channel.thumbnail, this.currentInvidiousInstance)
         }
 
         return channel
diff --git a/src/renderer/components/top-nav/top-nav.js b/src/renderer/components/top-nav/top-nav.js
index d948f0d19e97..90026ea8db15 100644
--- a/src/renderer/components/top-nav/top-nav.js
+++ b/src/renderer/components/top-nav/top-nav.js
@@ -8,6 +8,7 @@ import debounce from 'lodash.debounce'
 import { IpcChannels } from '../../../constants'
 import { openInternalPath, showToast } from '../../helpers/utils'
 import { clearLocalSearchSuggestionsSession, getLocalSearchSuggestions } from '../../helpers/api/local'
+import { invidiousAPICall } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'TopNav',
@@ -257,7 +258,7 @@ export default Vue.extend({
         }
       }
 
-      this.invidiousAPICall(searchPayload).then((results) => {
+      invidiousAPICall(searchPayload).then((results) => {
         this.searchSuggestionsDataList = results.suggestions
       }).catch((err) => {
         console.error(err)
@@ -339,7 +340,6 @@ export default Vue.extend({
     },
     ...mapActions([
       'getYoutubeUrlInfo',
-      'invidiousAPICall'
     ])
   }
 })
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.js b/src/renderer/components/watch-video-comments/watch-video-comments.js
index dcc517637e76..b79d2f7accca 100644
--- a/src/renderer/components/watch-video-comments/watch-video-comments.js
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.js
@@ -1,5 +1,4 @@
 import Vue from 'vue'
-import { mapActions } from 'vuex'
 import FtCard from '../ft-card/ft-card.vue'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtSelect from '../../components/ft-select/ft-select.vue'
@@ -12,6 +11,7 @@ import {
   stripHTML,
   toLocalePublicationString
 } from '../../helpers/utils'
+import { invidiousGetCommentReplies, invidiousGetComments } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'WatchVideoComments',
@@ -245,50 +245,12 @@ export default Vue.extend({
       }
     },
 
-    parseInvidiousCommentData: function (response) {
-      return response.comments.map((comment) => {
-        comment.showReplies = false
-        comment.authorLink = comment.authorId
-        comment.authorThumb = comment.authorThumbnails[1].url.replace('https://yt3.ggpht.com', `${this.currentInvidiousInstance}/ggpht/`)
-        if (this.hideCommentLikes) {
-          comment.likes = null
-        } else {
-          comment.likes = comment.likeCount
-        }
-        comment.text = autolinker.link(stripHTML(comment.content))
-        comment.dataType = 'invidious'
-        comment.isOwner = comment.authorIsChannelOwner
-
-        if (typeof (comment.replies) !== 'undefined' && typeof (comment.replies.replyCount) !== 'undefined') {
-          comment.numReplies = comment.replies.replyCount
-          comment.replyContinuation = comment.replies.continuation
-        } else {
-          comment.numReplies = 0
-          comment.replyContinuation = ''
-        }
-
-        comment.replies = []
-        comment.time = toLocalePublicationString({
-          publishText: comment.publishedText
-        })
-
-        return comment
-      })
-    },
-
     getCommentDataInvidious: function () {
-      const payload = {
-        resource: 'comments',
+      invidiousGetComments({
         id: this.id,
-        params: {
-          continuation: this.nextPageToken ?? '',
-          sort_by: this.sortNewest ? 'new' : 'top'
-        }
-      }
-
-      this.invidiousAPICall(payload).then((response) => {
-        const commentData = this.parseInvidiousCommentData(response)
-
+        nextPageToken: this.nextPageToken,
+        sortNewest: this.sortNewest
+      }).then(({ response, commentData }) => {
         this.commentData = this.commentData.concat(commentData)
         this.nextPageToken = response.continuation
         this.isLoading = false
@@ -301,7 +263,12 @@ export default Vue.extend({
         })
         if (process.env.IS_ELECTRON && this.backendFallback && this.backendPreference === 'invidious') {
           showToast(this.$t('Falling back to local API'))
-          this.getCommentDataLocal()
+          this.getCommentDataLocal({
+            videoId: this.id,
+            setCookie: false,
+            sortByNewest: this.sortNewest,
+            continuation: this.nextPageToken ? this.nextPageToken : undefined
+          })
         } else {
           this.isLoading = false
         }
@@ -310,32 +277,21 @@ export default Vue.extend({
 
     getCommentRepliesInvidious: function (index) {
       showToast(this.$t('Comments.Getting comment replies, please wait'))
-      const payload = {
-        resource: 'comments',
-        id: this.id,
-        params: {
-          continuation: this.commentData[index].replyContinuation
-        }
-      }
-
-      this.invidiousAPICall(payload).then((response) => {
-        const commentData = this.parseInvidiousCommentData(response)
-
-        this.commentData[index].replies = commentData
-        this.commentData[index].showReplies = true
-        this.isLoading = false
-      }).catch((xhr) => {
-        console.error(xhr)
-        const errorMessage = this.$t('Invidious API Error (Click to copy)')
-        showToast(`${errorMessage}: ${xhr.responseText}`, 10000, () => {
-          copyToClipboard(xhr.responseText)
+      const replyToken = this.commentData[index].replyToken
+      invidiousGetCommentReplies({ id: this.id, replyToken: replyToken })
+        .then(({ commentData, continuation }) => {
+          this.commentData[index].replies = commentData
+          this.commentData[index].showReplies = true
+          this.commentData[index].replyToken = continuation
+          this.isLoading = false
+        }).catch((xhr) => {
+          console.error(xhr)
+          const errorMessage = this.$t('Invidious API Error (Click to copy)')
+          showToast(`${errorMessage}: ${xhr.responseText}`, 10000, () => {
+            copyToClipboard(xhr.responseText)
+          })
+          this.isLoading = false
         })
-        this.isLoading = false
-      })
-    },
-
-    ...mapActions([
-      'invidiousAPICall'
-    ])
+    }
   }
 })
diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js
index 58e68db6eaef..a1c10f4f16f7 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.js
+++ b/src/renderer/components/watch-video-info/watch-video-info.js
@@ -287,7 +287,6 @@ export default Vue.extend({
   },
   mounted: function () {
     if ('mediaSession' in navigator) {
-      /* eslint-disable-next-line */
       navigator.mediaSession.metadata = new MediaMetadata({
         title: this.title,
         artist: this.channelName,
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.js b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
index 247730c6890b..05f32a003a37 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.js
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
@@ -1,10 +1,11 @@
 import Vue from 'vue'
-import { mapActions, mapMutations } from 'vuex'
+import { mapMutations } from 'vuex'
 import FtLoader from '../ft-loader/ft-loader.vue'
 import FtCard from '../ft-card/ft-card.vue'
 import FtListVideoLazy from '../ft-list-video-lazy/ft-list-video-lazy.vue'
 import { copyToClipboard, showToast } from '../../helpers/utils'
 import { getLocalPlaylist, parseLocalPlaylistVideo } from '../../helpers/api/local'
+import { invidiousGetPlaylistInfo } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'WatchVideoPlaylist',
@@ -316,12 +317,7 @@ export default Vue.extend({
     getPlaylistInformationInvidious: function () {
       this.isLoading = true
 
-      const payload = {
-        resource: 'playlists',
-        id: this.playlistId
-      }
-
-      this.invidiousGetPlaylistInfo(payload).then((result) => {
+      invidiousGetPlaylistInfo({ playlistId: this.playlistId }).then((result) => {
         this.playlistTitle = result.title
         this.channelName = result.author
         this.channelId = result.authorId
@@ -364,10 +360,6 @@ export default Vue.extend({
       this.randomizedPlaylistItems = items
     },
 
-    ...mapActions([
-      'invidiousGetPlaylistInfo'
-    ]),
-
     ...mapMutations([
       'setCachedPlaylist'
     ])
diff --git a/src/renderer/helpers/api/invidious.js b/src/renderer/helpers/api/invidious.js
new file mode 100644
index 000000000000..cf13d97459fe
--- /dev/null
+++ b/src/renderer/helpers/api/invidious.js
@@ -0,0 +1,112 @@
+import store from '../../store/index'
+import { stripHTML, toLocalePublicationString } from '../utils'
+import autolinker from 'autolinker'
+
+function getCurrentInstance() {
+  return store.getters.getCurrentInvidiousInstance
+}
+
+export function invidiousAPICall({ resource, id = '', params = {} }) {
+  return new Promise((resolve, reject) => {
+    const requestUrl = getCurrentInstance() + '/api/v1/' + resource + '/' + id + '?' + new URLSearchParams(params).toString()
+
+    fetch(requestUrl)
+      .then((response) => response.json())
+      .then((json) => {
+        if (json.error !== undefined) {
+          throw new Error(json.error)
+        }
+        resolve(json)
+      })
+      .catch((error) => {
+        console.error('Invidious API error', requestUrl, error)
+        reject(error)
+      })
+  })
+}
+
+export async function invidiousGetChannelInfo(channelId) {
+  return await invidiousAPICall({
+    resource: 'channels',
+    id: channelId,
+  })
+}
+
+export async function invidiousGetPlaylistInfo(playlistId) {
+  return await invidiousAPICall({
+    resource: 'playlists',
+    id: playlistId,
+  })
+}
+
+export async function invidiousGetVideoInformation(videoId) {
+  return await invidiousAPICall({
+    resource: 'videos',
+    id: videoId,
+  })
+}
+export async function invidiousGetComments({ id, nextPageToken = '', sortNewest = true }) {
+  const payload = {
+    resource: 'comments',
+    id: id,
+    params: {
+      continuation: nextPageToken ?? '',
+      sort_by: sortNewest ? 'new' : 'top'
+    }
+  }
+  const response = await invidiousAPICall(payload)
+
+  const commentData = parseInvidiousCommentData(response)
+
+  return { response, commentData }
+}
+
+export async function invidiousGetCommentReplies({ id, replyToken }) {
+  const payload = {
+    resource: 'comments',
+    id: id,
+    params: {
+      continuation: replyToken
+    }
+  }
+
+  const response = await invidiousAPICall(payload)
+  return { commentData: parseInvidiousCommentData(response), continuation: response.continuation ?? null }
+}
+
+export function youtubeImageUrlToInvidious(url, currentInstance = null) {
+  if (currentInstance === null) {
+    currentInstance = getCurrentInstance()
+  }
+  // Can be prefixed with `https://` or `//` (protocol relative)
+  if (url.startsWith('//')) {
+    url = 'https:' + url
+  }
+
+  return url.replace('https://yt3.ggpht.com', `${currentInstance}/ggpht`)
+}
+
+export function invidiousImageUrlToInvidious(url, currentInstance = null) {
+  return url.replace(/^.+(ggpht.+)/, currentInstance)
+}
+
+function parseInvidiousCommentData(response) {
+  return response.comments.map((comment) => {
+    comment.showReplies = false
+    comment.authorLink = comment.authorId
+    comment.authorThumb = youtubeImageUrlToInvidious(comment.authorThumbnails[1].url)
+    comment.likes = comment.likeCount
+    comment.text = autolinker.link(stripHTML(comment.content))
+    comment.dataType = 'invidious'
+    comment.isOwner = comment.authorIsChannelOwner
+    comment.numReplies = comment.replies?.replyCount ?? 0
+    comment.replyToken = comment.replies?.continuation ?? ''
+    comment.isHearted = comment.creatorHeart !== undefined
+    comment.replies = []
+    comment.time = toLocalePublicationString({
+      publishText: comment.publishedText
+    })
+
+    return comment
+  })
+}
diff --git a/src/renderer/main.js b/src/renderer/main.js
index 635a61c6f250..dc68e6f34e98 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -125,7 +125,7 @@ library.add(
 
 Vue.component('FontAwesomeIcon', FontAwesomeIcon)
 
-/* eslint-disable-next-line */
+/* eslint-disable-next-line no-new */
 new Vue({
   el: '#app',
   router,
diff --git a/src/renderer/store/modules/invidious.js b/src/renderer/store/modules/invidious.js
index 669ae926f9a7..c188b90ccada 100644
--- a/src/renderer/store/modules/invidious.js
+++ b/src/renderer/store/modules/invidious.js
@@ -25,11 +25,10 @@ const actions = {
       const response = await fetch(requestUrl)
       const json = await response.json()
       instances = json.filter((instance) => {
-        if (instance[0].includes('.onion') || instance[0].includes('.i2p') || !instance[1].api || (!process.env.IS_ELECTRON && !instance[1].cors)) {
-          return false
-        } else {
-          return true
-        }
+        return !(instance[0].includes('.onion') ||
+          instance[0].includes('.i2p') ||
+          !instance[1].api ||
+          (!process.env.IS_ELECTRON && !instance[1].cors))
       }).map((instance) => {
         return instance[1].uri.replace(/\/$/, '')
       })
@@ -38,10 +37,9 @@ const actions = {
     }
     // If the invidious instance fetch isn't returning anything interpretable
     if (instances.length === 0) {
-      // Starts fallback strategy: read from static file
-      // And fallback to hardcoded entry(s) if static file absent
+      // Fallback: read from static file
       const fileName = 'invidious-instances.json'
-      /* eslint-disable-next-line */
+      /* eslint-disable-next-line n/no-path-concat */
       const fileLocation = process.env.NODE_ENV === 'development' ? './static/' : `${__dirname}/static/`
       if (await pathExists(`${fileLocation}${fileName}`)) {
         console.warn('reading static file for invidious instances')
@@ -49,12 +47,6 @@ const actions = {
         instances = JSON.parse(fileData).map((entry) => {
           return entry.url
         })
-      } else {
-        console.error('unable to read static file for invidious instances')
-        instances = [
-          'https://invidious.sethforprivacy.com',
-          'https://invidious.namazso.eu'
-        ]
       }
     }
     commit('setInvidiousInstancesList', instances)
@@ -64,67 +56,6 @@ const actions = {
     const instanceList = state.invidiousInstancesList
     const randomIndex = Math.floor(Math.random() * instanceList.length)
     commit('setCurrentInvidiousInstance', instanceList[randomIndex])
-  },
-
-  invidiousAPICall({ state }, payload) {
-    return new Promise((resolve, reject) => {
-      const requestUrl = state.currentInvidiousInstance + '/api/v1/' + payload.resource + '/' + payload.id + '?' + new URLSearchParams(payload.params).toString()
-
-      fetch(requestUrl)
-        .then((response) => response.json())
-        .then((json) => {
-          resolve(json)
-        })
-        .catch((error) => {
-          console.error('Invidious API error', requestUrl, error)
-          reject(error)
-        })
-    })
-  },
-
-  invidiousGetChannelInfo({ commit, dispatch }, channelId) {
-    return new Promise((resolve, reject) => {
-      const payload = {
-        resource: 'channels',
-        id: channelId,
-        params: {}
-      }
-
-      dispatch('invidiousAPICall', payload).then((response) => {
-        resolve(response)
-      }).catch((xhr) => {
-        console.error(xhr)
-        reject(xhr)
-      })
-    })
-  },
-
-  invidiousGetPlaylistInfo({ commit, dispatch }, payload) {
-    return new Promise((resolve, reject) => {
-      dispatch('invidiousAPICall', payload).then((response) => {
-        resolve(response)
-      }).catch((xhr) => {
-        console.error(xhr)
-        reject(xhr)
-      })
-    })
-  },
-
-  invidiousGetVideoInformation({ dispatch }, videoId) {
-    return new Promise((resolve, reject) => {
-      const payload = {
-        resource: 'videos',
-        id: videoId,
-        params: {}
-      }
-
-      dispatch('invidiousAPICall', payload).then((response) => {
-        resolve(response)
-      }).catch((xhr) => {
-        console.error(xhr)
-        reject(xhr)
-      })
-    })
   }
 }
 
diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index fd2fafc00b2b..0b09504fc538 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -452,7 +452,7 @@ const actions = {
   async getExternalPlayerCmdArgumentsData ({ commit }, payload) {
     const fileName = 'external-player-map.json'
     let fileData
-    /* eslint-disable-next-line */
+    /* eslint-disable-next-line n/no-path-concat */
     const fileLocation = process.env.NODE_ENV === 'development' ? './static/' : `${__dirname}/static/`
 
     if (await pathExists(`${fileLocation}${fileName}`)) {
diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index 748801c02c6d..f5a668f76baa 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -17,6 +17,7 @@ import { MAIN_PROFILE_ID } from '../../../constants'
 import i18n from '../../i18n/index'
 import { copyToClipboard, showToast } from '../../helpers/utils'
 import packageDetails from '../../../../package.json'
+import { invidiousAPICall, invidiousGetChannelInfo, youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'Search',
@@ -371,7 +372,7 @@ export default Vue.extend({
       this.apiUsed = 'invidious'
 
       const expectedId = this.originalId
-      this.invidiousGetChannelInfo(this.id).then((response) => {
+      invidiousGetChannelInfo(this.id).then((response) => {
         if (expectedId !== this.originalId) {
           return
         }
@@ -388,18 +389,21 @@ export default Vue.extend({
           this.subCount = response.subCount
         }
         const thumbnail = response.authorThumbnails[3].url
-        this.thumbnailUrl = thumbnail.replace('https://yt3.ggpht.com', `${this.currentInvidiousInstance}/ggpht/`)
+        this.thumbnailUrl = youtubeImageUrlToInvidious(thumbnail, this.currentInvidiousInstance)
         this.updateSubscriptionDetails({ channelThumbnailUrl: thumbnail, channelName: channelName, channelId: channelId })
         this.channelDescription = autolinker.link(response.description)
         this.relatedChannels = response.relatedChannels.map((channel) => {
-          channel.authorThumbnails[channel.authorThumbnails.length - 1].url = channel.authorThumbnails[channel.authorThumbnails.length - 1].url.replace('https://yt3.ggpht.com', `${this.currentInvidiousInstance}/ggpht/`)
+          channel.authorThumbnails = channel.authorThumbnails.map(thumbnail => {
+            thumbnail.url = youtubeImageUrlToInvidious(thumbnail.url, this.currentInvidiousInstance)
+            return thumbnail
+          })
           channel.channelId = channel.authorId
           return channel
         })
         this.latestVideos = response.latestVideos
 
         if (response.authorBanners instanceof Array && response.authorBanners.length > 0) {
-          this.bannerUrl = response.authorBanners[0].url.replace('https://yt3.ggpht.com', `${this.currentInvidiousInstance}/ggpht/`)
+          this.bannerUrl = youtubeImageUrlToInvidious(response.authorBanners[0].url, this.currentInvidiousInstance)
         } else {
           this.bannerUrl = null
         }
@@ -427,7 +431,7 @@ export default Vue.extend({
         }
       }
 
-      this.invidiousAPICall(payload).then((response) => {
+      invidiousAPICall(payload).then((response) => {
         this.latestVideos = this.latestVideos.concat(response)
         this.latestVideosPage++
         this.isElementListLoading = false
@@ -490,7 +494,7 @@ export default Vue.extend({
         }
       }
 
-      this.invidiousAPICall(payload).then((response) => {
+      invidiousAPICall(payload).then((response) => {
         this.playlistContinuationString = response.continuation
         this.latestPlaylists = response.playlists
         this.isElementListLoading = false
@@ -527,7 +531,7 @@ export default Vue.extend({
         payload.params.continuation = this.playlistContinuationString
       }
 
-      this.invidiousAPICall(payload).then((response) => {
+      invidiousAPICall(payload).then((response) => {
         this.playlistContinuationString = response.continuation
         this.latestPlaylists = this.latestPlaylists.concat(response.playlists)
         this.isElementListLoading = false
@@ -748,7 +752,7 @@ export default Vue.extend({
         }
       }
 
-      this.invidiousAPICall(payload).then((response) => {
+      invidiousAPICall(payload).then((response) => {
         this.searchResults = this.searchResults.concat(response)
         this.isElementListLoading = false
         this.searchPage++
@@ -769,8 +773,6 @@ export default Vue.extend({
 
     ...mapActions([
       'updateProfile',
-      'invidiousGetChannelInfo',
-      'invidiousAPICall',
       'updateSubscriptionDetails'
     ])
   }
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index 998fc9e62dbf..f1ef1662a482 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -9,6 +9,7 @@ import FtButton from '../../components/ft-button/ft-button.vue'
 import i18n from '../../i18n/index'
 import { getLocalPlaylist, parseLocalPlaylistVideo } from '../../helpers/api/local'
 import { extractNumberFromString } from '../../helpers/utils'
+import { invidiousGetPlaylistInfo, youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'Playlist',
@@ -124,12 +125,7 @@ export default Vue.extend({
     getPlaylistInvidious: function () {
       this.isLoading = true
 
-      const payload = {
-        resource: 'playlists',
-        id: this.playlistId
-      }
-
-      this.invidiousGetPlaylistInfo(payload).then((result) => {
+      invidiousGetPlaylistInfo({ playlistId: this.playlistId }).then((result) => {
         this.infoData = {
           id: result.playlistId,
           title: result.title,
@@ -138,7 +134,7 @@ export default Vue.extend({
           viewCount: result.viewCount,
           videoCount: result.videoCount,
           channelName: result.author,
-          channelThumbnail: result.authorThumbnails[2].url.replace('https://yt3.ggpht.com', `${this.currentInvidiousInstance}/ggpht/`),
+          channelThumbnail: youtubeImageUrlToInvidious(result.authorThumbnails[2].url, this.currentInvidiousInstance),
           channelId: result.authorId,
           infoSource: 'invidious'
         }
@@ -196,7 +192,6 @@ export default Vue.extend({
     },
 
     ...mapActions([
-      'invidiousGetPlaylistInfo',
       'updateSubscriptionDetails'
     ]),
 
diff --git a/src/renderer/views/Popular/Popular.js b/src/renderer/views/Popular/Popular.js
index a70e4f578f1f..03f35f87530f 100644
--- a/src/renderer/views/Popular/Popular.js
+++ b/src/renderer/views/Popular/Popular.js
@@ -1,10 +1,11 @@
 import Vue from 'vue'
-import { mapActions } from 'vuex'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
 import FtIconButton from '../../components/ft-icon-button/ft-icon-button.vue'
 
+import { invidiousAPICall } from '../../helpers/api/invidious'
+
 export default Vue.extend({
   name: 'Popular',
   components: {
@@ -44,7 +45,7 @@ export default Vue.extend({
       }
 
       this.isLoading = true
-      const result = await this.invidiousAPICall(searchPayload)
+      const result = await invidiousAPICall(searchPayload)
         .catch((err) => {
           console.error(err)
         })
@@ -74,10 +75,6 @@ export default Vue.extend({
           }
           break
       }
-    },
-
-    ...mapActions([
-      'invidiousAPICall'
-    ])
+    }
   }
 })
diff --git a/src/renderer/views/Search/Search.js b/src/renderer/views/Search/Search.js
index 6447095822a1..344dbf7332c6 100644
--- a/src/renderer/views/Search/Search.js
+++ b/src/renderer/views/Search/Search.js
@@ -1,10 +1,10 @@
 import Vue from 'vue'
-import { mapActions } from 'vuex'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
 import { copyToClipboard, searchFiltersMatch, showToast } from '../../helpers/utils'
 import { getLocalSearchContinuation, getLocalSearchResults } from '../../helpers/api/local'
+import { invidiousAPICall } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'Search',
@@ -214,7 +214,7 @@ export default Vue.extend({
         }
       }
 
-      this.invidiousAPICall(searchPayload).then((result) => {
+      invidiousAPICall(searchPayload).then((result) => {
         if (!result) {
           return
         }
@@ -295,10 +295,6 @@ export default Vue.extend({
       }
 
       this.isLoading = false
-    },
-
-    ...mapActions([
-      'invidiousAPICall'
-    ])
+    }
   }
 })
diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.js b/src/renderer/views/SubscribedChannels/SubscribedChannels.js
index 8a4a66c79f4d..60c9910fc343 100644
--- a/src/renderer/views/SubscribedChannels/SubscribedChannels.js
+++ b/src/renderer/views/SubscribedChannels/SubscribedChannels.js
@@ -7,6 +7,7 @@ import FtInput from '../../components/ft-input/ft-input.vue'
 import FtPrompt from '../../components/ft-prompt/ft-prompt.vue'
 import ytch from 'yt-channel-info'
 import { showToast } from '../../helpers/utils'
+import { invidiousGetChannelInfo, youtubeImageUrlToInvidious, invidiousImageUrlToInvidious } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'SubscribedChannels',
@@ -24,9 +25,7 @@ export default Vue.extend({
       filteredChannels: [],
       re: {
         url: /(.+=\w)\d+(.+)/,
-        ivToIv: /^.+(ggpht.+)/,
-        ivToYt: /^.+ggpht\/(.+)/,
-        ytToIv: /^.+ggpht\.com\/(.+)/
+        ivToYt: /^.+ggpht\/(.+)/
       },
       thumbnailSize: 176,
       ytBaseURL: 'https://yt3.ggpht.com',
@@ -165,13 +164,13 @@ export default Vue.extend({
       let newURL = originalURL
       if (new URL(originalURL).hostname === 'yt3.ggpht.com') {
         if (this.backendPreference === 'invidious') { // YT to IV
-          newURL = originalURL.replace(this.re.ytToIv, `${this.currentInvidiousInstance}/ggpht/$1`)
+          newURL = youtubeImageUrlToInvidious(originalURL, this.currentInvidiousInstance)
         }
       } else {
         if (this.backendPreference === 'local') { // IV to YT
           newURL = originalURL.replace(this.re.ivToYt, `${this.ytBaseURL}/$1`)
         } else { // IV to IV
-          newURL = originalURL.replace(this.re.ivToIv, `${this.currentInvidiousInstance}/$1`)
+          newURL = invidiousImageUrlToInvidious(originalURL, this.currentInvidiousInstance)
         }
       }
 
@@ -193,7 +192,7 @@ export default Vue.extend({
         }, this.errorCount * 500)
       } else {
         setTimeout(() => {
-          this.invidiousGetChannelInfo(channel.id).then(response => {
+          invidiousGetChannelInfo(channel.id).then(response => {
             this.updateSubscriptionDetails({
               channelThumbnailUrl: this.thumbnailURL(response.authorThumbnails[0].url),
               channelName: channel.name,
@@ -207,7 +206,6 @@ export default Vue.extend({
     ...mapActions([
       'updateProfile',
       'updateSubscriptionDetails',
-      'invidiousGetChannelInfo'
     ])
   }
 })
diff --git a/src/renderer/views/Subscriptions/Subscriptions.js b/src/renderer/views/Subscriptions/Subscriptions.js
index fdd0365d3f55..b1c3c2cf8625 100644
--- a/src/renderer/views/Subscriptions/Subscriptions.js
+++ b/src/renderer/views/Subscriptions/Subscriptions.js
@@ -11,6 +11,7 @@ import FtChannelBubble from '../../components/ft-channel-bubble/ft-channel-bubbl
 import ytch from 'yt-channel-info'
 import { MAIN_PROFILE_ID } from '../../../constants'
 import { calculatePublishedDate, copyToClipboard, showToast } from '../../helpers/utils'
+import { invidiousAPICall } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'Subscriptions',
@@ -359,7 +360,7 @@ export default Vue.extend({
           params: {}
         }
 
-        this.invidiousAPICall(subscriptionsPayload).then(async (result) => {
+        invidiousAPICall(subscriptionsPayload).then(async (result) => {
           resolve(await Promise.all(result.map((video) => {
             video.publishedDate = new Date(video.published * 1000)
             return video
@@ -481,7 +482,6 @@ export default Vue.extend({
     },
 
     ...mapActions([
-      'invidiousAPICall',
       'updateShowProgressBar',
       'updateProfileSubscriptions',
       'updateAllSubscriptionsList'
diff --git a/src/renderer/views/Trending/Trending.js b/src/renderer/views/Trending/Trending.js
index 3950adda2826..2ab09df50741 100644
--- a/src/renderer/views/Trending/Trending.js
+++ b/src/renderer/views/Trending/Trending.js
@@ -1,5 +1,4 @@
 import Vue from 'vue'
-import { mapActions } from 'vuex'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
@@ -8,6 +7,7 @@ import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
 
 import { copyToClipboard, showToast } from '../../helpers/utils'
 import { getLocalTrending } from '../../helpers/api/local'
+import { invidiousAPICall } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'Trending',
@@ -133,7 +133,7 @@ export default Vue.extend({
         trendingPayload.params.type = this.currentTab.charAt(0).toUpperCase() + this.currentTab.slice(1)
       }
 
-      this.invidiousAPICall(trendingPayload).then((result) => {
+      invidiousAPICall(trendingPayload).then((result) => {
         if (!result) {
           return
         }
@@ -177,10 +177,6 @@ export default Vue.extend({
           }
           break
       }
-    },
-
-    ...mapActions([
-      'invidiousAPICall'
-    ])
+    }
   }
 })
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index eea456b118f9..395c7da5c93b 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -27,6 +27,7 @@ import {
   parseLocalTextRuns,
   parseLocalWatchNextVideo
 } from '../../helpers/api/local'
+import { invidiousGetVideoInformation, youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 
 export default Vue.extend({
   name: 'Watch',
@@ -159,10 +160,6 @@ export default Vue.extend({
     showFamilyFriendlyOnly: function() {
       return this.$store.getters.getShowFamilyFriendlyOnly
     },
-
-    youtubeNoCookieEmbeddedFrame: function () {
-      return `<iframe width='560' height='315' src='https://www.youtube-nocookie.com/embed/${this.videoId}?rel=0' frameborder='0' allow='autoplay; encrypted-media' allowfullscreen></iframe>`
-    },
     hideChannelSubscriptions: function () {
       return this.$store.getters.getHideChannelSubscriptions
     },
@@ -656,7 +653,7 @@ export default Vue.extend({
       this.dashSrc = this.createInvidiousDashManifest()
       this.videoStoryboardSrc = `${this.currentInvidiousInstance}/api/v1/storyboards/${this.videoId}?height=90`
 
-      this.invidiousGetVideoInformation(this.videoId)
+      invidiousGetVideoInformation(this.videoId)
         .then(result => {
           if (result.error) {
             throw new Error(result.error)
@@ -679,7 +676,7 @@ export default Vue.extend({
           this.channelId = result.authorId
           this.channelName = result.author
           const channelThumb = result.authorThumbnails[1]
-          this.channelThumbnail = channelThumb ? channelThumb.url.replace('https://yt3.ggpht.com', `${this.currentInvidiousInstance}/ggpht/`) : ''
+          this.channelThumbnail = channelThumb ? youtubeImageUrlToInvidious(channelThumb.url, this.currentInvidiousInstance) : ''
           this.updateSubscriptionDetails({
             channelThumbnailUrl: channelThumb?.url,
             channelName: result.author,
@@ -1417,7 +1414,6 @@ export default Vue.extend({
     ...mapActions([
       'updateHistory',
       'updateWatchProgress',
-      'invidiousGetVideoInformation',
       'updateSubscriptionDetails'
     ])
   }

From afb9e51cddef011073ae5783375e3c0b3bba646b Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Thu, 12 Jan 2023 01:55:47 -0500
Subject: [PATCH 261/301] small accessibility improvements (#3033)

* small accessibility improvements

* switch to routerlink for side-nav-more-options
---
 .stylelintrc.json                             | 11 ++-
 .vscode/extensions.json                       | 11 +++
 .vscode/settings.json                         | 16 ++++
 jsconfig.json                                 |  5 ++
 .../external-player-settings.vue              | 42 +++++------
 .../ft-channel-bubble/ft-channel-bubble.vue   |  1 +
 .../ft-icon-button/ft-icon-button.scss        | 12 ++-
 .../components/ft-select/ft-select.js         |  8 ++
 .../components/ft-select/ft-select.vue        |  7 +-
 .../ft-share-button/ft-share-button.scss      |  4 +-
 .../ft-sponsor-block-category.js              |  6 +-
 .../ft-sponsor-block-category.vue             | 11 ++-
 .../ft-video-player/ft-video-player.vue       |  3 +
 .../side-nav-more-options.js                  |  6 --
 .../side-nav-more-options.vue                 | 75 ++++++++++++-------
 src/renderer/components/side-nav/side-nav.vue |  1 +
 .../theme-settings/theme-settings.vue         | 70 +++++++++--------
 src/renderer/components/top-nav/top-nav.scss  |  6 +-
 .../watch-video-chapters.vue                  |  1 +
 .../watch-video-info/watch-video-info.vue     |  1 +
 .../watch-video-live-chat.css                 |  3 +-
 src/renderer/scss-partials/_ft-list-item.scss |  3 +-
 src/renderer/views/About/About.vue            |  1 +
 src/renderer/views/Channel/Channel.css        |  3 +-
 .../SubscribedChannels/SubscribedChannels.vue |  2 +
 25 files changed, 199 insertions(+), 110 deletions(-)
 create mode 100644 .vscode/extensions.json
 create mode 100644 .vscode/settings.json
 create mode 100644 jsconfig.json

diff --git a/.stylelintrc.json b/.stylelintrc.json
index ea45b8ebd083..bf2da3b109ee 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -13,22 +13,21 @@
     {
       "files": ["**/*.css"],
       "rules": {
-        "a11y/media-prefers-reduced-motion": true,
-        "a11y/no-outline-none": true,
-        "a11y/selector-pseudo-class-focus": true,
-        "a11y/font-size-is-readable": true
       }
     }
   ],
   "rules": {
     "selector-class-pattern": null,
     "selector-id-pattern": null,
-    "plugin/no-low-performance-animation-properties": true,
+    "plugin/no-low-performance-animation-properties": null,
     "selector-pseudo-class-no-unknown": [
       true,
       {
         "ignorePseudoClasses": ["deep"]
       }
-    ]
+    ],
+    "a11y/no-outline-none": true,
+    "a11y/selector-pseudo-class-focus": true,
+    "a11y/font-size-is-readable": true
   }
 }
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 000000000000..5dc5d72c0a43
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,11 @@
+{
+  "recommendations": [
+    "editorconfig.editorconfig",
+    "dbaeumer.vscode-eslint",
+    "stylelint.vscode-stylelint",
+    "syler.sass-indented",
+    "redhat.vscode-yaml",
+    "vue.volar",
+    "eamodio.gitlens"
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000000..a48f03e30aeb
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,16 @@
+{
+  "stylelint.packageManager": "yarn",
+  "stylelint.snippet": [
+      "css",
+      "less",
+      "postcss",
+      "sass",
+      "scss"
+  ],
+  "stylelint.validate": [
+      "css",
+      "less",
+      "postcss",
+      "scss"
+  ]
+}
diff --git a/jsconfig.json b/jsconfig.json
new file mode 100644
index 000000000000..8f5ea8a228e3
--- /dev/null
+++ b/jsconfig.json
@@ -0,0 +1,5 @@
+{
+  "vueCompilerOptions": {
+    "target": 2.7
+  }
+}
diff --git a/src/renderer/components/external-player-settings/external-player-settings.vue b/src/renderer/components/external-player-settings/external-player-settings.vue
index a09da588a6b6..b3b98862d7da 100644
--- a/src/renderer/components/external-player-settings/external-player-settings.vue
+++ b/src/renderer/components/external-player-settings/external-player-settings.vue
@@ -2,28 +2,26 @@
   <ft-settings-section
     :title="$t('Settings.External Player Settings.External Player Settings')"
   >
-    <div class="switchColumnGrid">
-      <div class="switchColumn">
-        <ft-select
-          :placeholder="$t('Settings.External Player Settings.External Player')"
-          :value="externalPlayer"
-          :select-names="externalPlayerNames"
-          :select-values="externalPlayerValues"
-          :tooltip="$t('Tooltips.External Player Settings.External Player')"
-          @change="updateExternalPlayer"
-        />
-      </div>
-      <div class="switchColumn">
-        <ft-toggle-switch
-          :label="$t('Settings.External Player Settings.Ignore Unsupported Action Warnings')"
-          :default-value="externalPlayerIgnoreWarnings"
-          :disabled="externalPlayer===''"
-          :compact="true"
-          :tooltip="$t('Tooltips.External Player Settings.Ignore Warnings')"
-          @change="updateExternalPlayerIgnoreWarnings"
-        />
-      </div>
-    </div>
+    <ft-flex-box>
+      <ft-select
+        :placeholder="$t('Settings.External Player Settings.External Player')"
+        :value="externalPlayer"
+        :select-names="externalPlayerNames"
+        :select-values="externalPlayerValues"
+        :tooltip="$t('Tooltips.External Player Settings.External Player')"
+        @change="updateExternalPlayer"
+      />
+    </ft-flex-box>
+    <ft-flex-box>
+      <ft-toggle-switch
+        :label="$t('Settings.External Player Settings.Ignore Unsupported Action Warnings')"
+        :default-value="externalPlayerIgnoreWarnings"
+        :disabled="externalPlayer===''"
+        :compact="true"
+        :tooltip="$t('Tooltips.External Player Settings.Ignore Warnings')"
+        @change="updateExternalPlayerIgnoreWarnings"
+      />
+    </ft-flex-box>
     <ft-flex-box
       v-if="externalPlayer !== ''"
       class="settingsFlexStart460px"
diff --git a/src/renderer/components/ft-channel-bubble/ft-channel-bubble.vue b/src/renderer/components/ft-channel-bubble/ft-channel-bubble.vue
index 0f6563d4accd..278d96ff343c 100644
--- a/src/renderer/components/ft-channel-bubble/ft-channel-bubble.vue
+++ b/src/renderer/components/ft-channel-bubble/ft-channel-bubble.vue
@@ -9,6 +9,7 @@
     <img
       class="bubble"
       :src="channelThumbnail"
+      alt=""
     >
     <div
       v-if="selected"
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.scss b/src/renderer/components/ft-icon-button/ft-icon-button.scss
index ce73f8a22fea..769c55957345 100644
--- a/src/renderer/components/ft-icon-button/ft-icon-button.scss
+++ b/src/renderer/components/ft-icon-button/ft-icon-button.scss
@@ -21,7 +21,8 @@
     background-color: var(--card-bg-color);
     color: var(--primary-text-color);
 
-    &:hover {
+    &:hover,
+    &:focus {
       background-color: var(--side-nav-hover-color);
     }
 
@@ -31,7 +32,8 @@
   }
 
   &.base-no-default {
-    &:hover {
+    &:hover,
+    &:focus {
       background-color: var(--side-nav-hover-color);
     }
 
@@ -44,7 +46,8 @@
     background-color: var(--primary-color);
     color: var(--text-with-main-color);
 
-    &:hover {
+    &:hover,
+    &:focus {
       background-color: var(--primary-color-hover);
     }
 
@@ -57,7 +60,8 @@
     background-color: var(--accent-color);
     color: var(--text-with-accent-color);
 
-    &:hover {
+    &:hover,
+    &:focus {
       background-color: var(--accent-color-hover);
     }
 
diff --git a/src/renderer/components/ft-select/ft-select.js b/src/renderer/components/ft-select/ft-select.js
index f8cab906fb71..120a0e55a3fa 100644
--- a/src/renderer/components/ft-select/ft-select.js
+++ b/src/renderer/components/ft-select/ft-select.js
@@ -31,6 +31,14 @@ export default Vue.extend({
     disabled: {
       type: Boolean,
       default: false
+    },
+    sanitizedId: {
+      type: String,
+      default: null
+    },
+    describeById: {
+      type: String,
+      default: null
     }
   },
   computed: {
diff --git a/src/renderer/components/ft-select/ft-select.vue b/src/renderer/components/ft-select/ft-select.vue
index 1d172cb3b67f..b935405f2f7a 100644
--- a/src/renderer/components/ft-select/ft-select.vue
+++ b/src/renderer/components/ft-select/ft-select.vue
@@ -1,11 +1,12 @@
 <template>
   <div class="select">
     <select
-      :id="sanitizedPlaceholder"
+      :id="sanitizedId ?? sanitizedPlaceholder"
+      :describe-by-id="describeById"
       class="select-text"
       :class="{disabled: disabled}"
       :value="value"
-      :name="sanitizedPlaceholder"
+      :name="sanitizedId ?? sanitizedPlaceholder"
       :disabled="disabled"
       @change="$emit('change', $event.target.value)"
     >
@@ -25,7 +26,7 @@
     <span class="select-bar" />
     <label
       class="select-label"
-      :for="sanitizedPlaceholder"
+      :for="sanitizedId ?? sanitizedPlaceholder"
       :hidden="disabled"
     >
       {{ placeholder }}
diff --git a/src/renderer/components/ft-share-button/ft-share-button.scss b/src/renderer/components/ft-share-button/ft-share-button.scss
index 03e54f4d3b58..ead1c516ae2e 100644
--- a/src/renderer/components/ft-share-button/ft-share-button.scss
+++ b/src/renderer/components/ft-share-button/ft-share-button.scss
@@ -69,12 +69,12 @@
         .dracula &,
         .CatppuccinMocha &,
         .system[data-system-theme*='dark'] & {
-          background-image: url(../../assets/img/invidious-logo-dark.svg);
+          background-image: url('../../assets/img/invidious-logo-dark.svg');
         }
 
         .light &,
         .system[data-system-theme*='light'] & {
-          background-image: url(../../assets/img/invidious-logo-light.svg);
+          background-image: url('../../assets/img/invidious-logo-light.svg');
         }
       }
     }
diff --git a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
index 59d51cefa4f9..96b6290fd554 100644
--- a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
+++ b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import { mapActions } from 'vuex'
 import { colors } from '../../helpers/colors'
 import FtSelect from '../ft-select/ft-select.vue'
-
+import { sanitizeForHtmlId } from '../../helpers/accessibility'
 export default Vue.extend({
   name: 'FtSponsorBlockCategory',
   components: {
@@ -70,6 +70,10 @@ export default Vue.extend({
       return sponsorVal
     },
 
+    sanitizedId: function() {
+      return sanitizeForHtmlId(this.categoryName)
+    },
+
     skipNames: function() {
       return [
         this.$t('Settings.SponsorBlock Settings.Skip Options.Auto Skip'),
diff --git a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue
index a0cd6d758a52..7ec5479c5b7f 100644
--- a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue
+++ b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.vue
@@ -1,9 +1,14 @@
 <template>
   <div class="sponsorBlockCategory">
-    <div class="sponsorTitle">
-      {{ $t("Video.Sponsor Block category."+categoryName) }}
+    <div
+      :id="sanitizedId"
+      class="sponsorTitle"
+    >
+      {{ $t("Video.Sponsor Block category." + categoryName) }}
     </div>
     <ft-select
+      :sanitized-id="sanitizedId + 'categoryColor'"
+      :describe-by-id="sanitizedId"
       :placeholder="$t('Settings.SponsorBlock Settings.Category Color')"
       :value="sponsorBlockValues.color"
       :select-names="colorNames"
@@ -11,6 +16,8 @@
       @change="updateColor"
     />
     <ft-select
+      :sanitized-id="sanitizedId + 'skipOption'"
+      :describe-by-id="sanitizedId"
       :placeholder="$t('Settings.SponsorBlock Settings.Skip Options.Skip Option')"
       :value="sponsorBlockValues.skip"
       :select-names="skipNames"
diff --git a/src/renderer/components/ft-video-player/ft-video-player.vue b/src/renderer/components/ft-video-player/ft-video-player.vue
index 2685e9b8eb1e..b04c64d70e70 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.vue
+++ b/src/renderer/components/ft-video-player/ft-video-player.vue
@@ -1,3 +1,6 @@
+<!-- eslint-disable vuejs-accessibility/mouse-events-have-key-events -->
+<!-- eslint-disable vuejs-accessibility/media-has-caption -->
+
 <template>
   <div
     class="relative"
diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.js b/src/renderer/components/side-nav-more-options/side-nav-more-options.js
index e9f7fa02df29..0a943afae66f 100644
--- a/src/renderer/components/side-nav-more-options/side-nav-more-options.js
+++ b/src/renderer/components/side-nav-more-options/side-nav-more-options.js
@@ -28,11 +28,5 @@ export default Vue.extend({
         navIconExpand: this.hideLabelsSideBar
       }
     }
-  },
-  methods: {
-    navigate: function (route) {
-      this.openMoreOptions = false
-      this.$router.push('/' + route)
-    }
   }
 })
diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.vue b/src/renderer/components/side-nav-more-options/side-nav-more-options.vue
index 328cb9b759a9..6541150f21a3 100644
--- a/src/renderer/components/side-nav-more-options/side-nav-more-options.vue
+++ b/src/renderer/components/side-nav-more-options/side-nav-more-options.vue
@@ -2,8 +2,13 @@
   <div class="sideNavMoreOptions">
     <div
       class="navOption moreOptionNav"
+      tabindex="0"
+      role="button"
+      aria-labelledby="moreNavLabel"
       :title="$t('More')"
       @click="openMoreOptions = !openMoreOptions"
+      @keydown.space.prevent="openMoreOptions = !openMoreOptions"
+      @keydown.enter.prevent="openMoreOptions = !openMoreOptions"
     >
       <font-awesome-icon
         :icon="['fas', 'ellipsis-h']"
@@ -12,6 +17,7 @@
       />
       <p
         v-if="!hideLabelsSideBar"
+        id="moreNavLabel"
         class="navLabel"
       >
         {{ $t("More") }}
@@ -21,12 +27,11 @@
       v-if="openMoreOptions"
       class="moreOptionContainer"
     >
-      <div
+      <router-link
         class="navOption mobileHidden"
-        role="button"
-        tabindex="0"
         :title="$t('Channels.Channels')"
-        @click="navigate('subscribedchannels')"
+        :aria-label="hideLabelsSideBar ? $t('Channels.Channels') : null"
+        to="/subscribedchannels"
       >
         <div
           class="thumbnailContainer"
@@ -39,17 +44,18 @@
           />
         </div>
         <p
+          id="channelLabel"
           class="navLabel"
         >
           {{ $t("Channels.Channels") }}
         </p>
-      </div>
-      <div
+      </router-link>
+      <router-link
         v-if="!hideTrendingVideos"
         class="navOption"
         :title="$t('Trending.Trending')"
-
-        @click="navigate('trending')"
+        :aria-label="hideLabelsSideBar ? $t('Trending.Trending') : null"
+        to="/trending"
       >
         <font-awesome-icon
           :icon="['fas', 'fire']"
@@ -58,16 +64,18 @@
         />
         <p
           v-if="!hideLabelsSideBar"
+          id="trendingNavLabel"
           class="navLabel"
         >
           {{ $t("Trending.Trending") }}
         </p>
-      </div>
-      <div
+      </router-link>
+      <router-link
         v-if="!hidePopularVideos && (backendFallback || backendPreference === 'invidious')"
         class="navOption"
         :title="$t('Most Popular')"
-        @click="navigate('popular')"
+        :aria-label="hideLabelsSideBar ? $t('Most Popular') : null"
+        to="/popular"
       >
         <font-awesome-icon
           :icon="['fas', 'users']"
@@ -76,15 +84,17 @@
         />
         <p
           v-if="!hideLabelsSideBar"
+          id="mostPopularNavLabel"
           class="navLabel"
         >
           {{ $t("Most Popular") }}
         </p>
-      </div>
-      <div
+      </router-link>
+      <router-link
         class="navOption"
         :title="$t('About.About')"
-        @click="navigate('about')"
+        :aria-label="hideLabelsSideBar ? $t('About.About') : null"
+        to="/about"
       >
         <font-awesome-icon
           :icon="['fas', 'info-circle']"
@@ -93,42 +103,55 @@
         />
         <p
           v-if="!hideLabelsSideBar"
+          id="aboutNavLabel"
           class="navLabel"
         >
           {{ $t("About.About") }}
         </p>
-      </div>
+      </router-link>
     </div>
-    <div
+    <router-link
       class="navOption mobileShow"
-      @click="navigate('history')"
+      :title="$t('History.History')"
+      :aria-label="hideLabelsSideBar ? $t('History.History'): null"
+      to="/history"
     >
       <font-awesome-icon
         :icon="['fas', 'history']"
         class="navIcon"
         :class="applyNavIconExpand"
       />
-      <p class="navLabel">
+      <p
+        id="historyNavLabel"
+        class="navLabel"
+      >
         {{ $t("History.History") }}
       </p>
-    </div>
+    </router-link>
     <hr>
-    <div
+    <router-link
       class="navOption mobileShow"
-      @click="navigate('settings')"
+      :title="$t('Settings.Settings')"
+      :aria-label="hideLabelsSideBar ? $t('Settings.Settings') : null"
+      to="/settings"
     >
       <font-awesome-icon
         :icon="['fas', 'sliders-h']"
         class="navIcon"
         :class="applyNavIconExpand"
       />
-      <p class="navLabel">
+      <p
+        id="settingsNavLabel"
+        class="navLabel"
+      >
         {{ $t("Settings.Settings") }}
       </p>
-    </div>
-    <div
+    </router-link>
+    <router-link
       class="navOption mobileHidden"
-      @click="navigate('about')"
+      :title="$t('About.About')"
+      to="/about"
+      :aria-label="hideLabelsSideBar ? $t('About.About') : null"
     >
       <font-awesome-icon
         :icon="['fas', 'info-circle']"
@@ -141,7 +164,7 @@
       >
         {{ $t("About.About") }}
       </p>
-    </div>
+    </router-link>
   </div>
 </template>
 
diff --git a/src/renderer/components/side-nav/side-nav.vue b/src/renderer/components/side-nav/side-nav.vue
index f3e256c06c89..269cd5a287b6 100644
--- a/src/renderer/components/side-nav/side-nav.vue
+++ b/src/renderer/components/side-nav/side-nav.vue
@@ -215,6 +215,7 @@
             <img
               class="channelThumbnail"
               :src="channel.thumbnail"
+              :alt="isOpen ? '' : channel.name"
             >
           </div>
           <p
diff --git a/src/renderer/components/theme-settings/theme-settings.vue b/src/renderer/components/theme-settings/theme-settings.vue
index 06d40bafa7ef..4244f20aafed 100644
--- a/src/renderer/components/theme-settings/theme-settings.vue
+++ b/src/renderer/components/theme-settings/theme-settings.vue
@@ -2,39 +2,43 @@
   <ft-settings-section
     :title="$t('Settings.Theme Settings.Theme Settings')"
   >
-    <ft-flex-box>
-      <ft-toggle-switch
-        :label="$t('Settings.Theme Settings.Match Top Bar with Main Color')"
-        :compact="true"
-        :default-value="barColor"
-        @change="updateBarColor"
-      />
-      <ft-toggle-switch
-        :label="$t('Settings.Theme Settings.Expand Side Bar by Default')"
-        :compact="true"
-        :default-value="expandSideBar"
-        @change="handleExpandSideBar"
-      />
-      <ft-toggle-switch
-        v-if="usingElectron"
-        :label="$t('Settings.Theme Settings.Disable Smooth Scrolling')"
-        :compact="true"
-        :default-value="disableSmoothScrollingToggleValue"
-        @change="handleRestartPrompt"
-      />
-      <ft-toggle-switch
-        :label="$t('Settings.Theme Settings.Hide Side Bar Labels')"
-        :compact="true"
-        :default-value="hideLabelsSideBar"
-        @change="updateHideLabelsSideBar"
-      />
-      <ft-toggle-switch
-        :label="$t('Settings.Theme Settings.Hide FreeTube Header Logo')"
-        :compact="true"
-        :default-value="hideHeaderLogo"
-        @change="updateHideHeaderLogo"
-      />
-    </ft-flex-box>
+    <div class="switchColumnGrid">
+      <div class="switchColumn">
+        <ft-toggle-switch
+          :label="$t('Settings.Theme Settings.Match Top Bar with Main Color')"
+          :compact="true"
+          :default-value="barColor"
+          @change="updateBarColor"
+        />
+        <ft-toggle-switch
+          :label="$t('Settings.Theme Settings.Expand Side Bar by Default')"
+          :compact="true"
+          :default-value="expandSideBar"
+          @change="handleExpandSideBar"
+        />
+        <ft-toggle-switch
+          v-if="usingElectron"
+          :label="$t('Settings.Theme Settings.Disable Smooth Scrolling')"
+          :compact="true"
+          :default-value="disableSmoothScrollingToggleValue"
+          @change="handleRestartPrompt"
+        />
+      </div>
+      <div class="switchColumn">
+        <ft-toggle-switch
+          :label="$t('Settings.Theme Settings.Hide Side Bar Labels')"
+          :compact="true"
+          :default-value="hideLabelsSideBar"
+          @change="updateHideLabelsSideBar"
+        />
+        <ft-toggle-switch
+          :label="$t('Settings.Theme Settings.Hide FreeTube Header Logo')"
+          :compact="true"
+          :default-value="hideHeaderLogo"
+          @change="updateHideHeaderLogo"
+        />
+      </div>
+    </div>
     <ft-flex-box>
       <ft-slider
         :label="$t('Settings.Theme Settings.UI Scale')"
diff --git a/src/renderer/components/top-nav/top-nav.scss b/src/renderer/components/top-nav/top-nav.scss
index a734b381669d..eb94f0c4a232 100644
--- a/src/renderer/components/top-nav/top-nav.scss
+++ b/src/renderer/components/top-nav/top-nav.scss
@@ -55,7 +55,8 @@
   @include top-nav-is-colored {
     color: var(--text-with-main-color);
 
-    &:hover {
+    &:hover,
+    &:focus {
       background-color: var(--primary-color-hover);
     }
   }
@@ -68,7 +69,8 @@
     user-select: none;
   }
 
-  &:hover {
+  &:hover,
+  &:focus {
     background-color: var(--side-nav-hover-color);
     transition: background 0.2s ease-in;
   }
diff --git a/src/renderer/components/watch-video-chapters/watch-video-chapters.vue b/src/renderer/components/watch-video-chapters/watch-video-chapters.vue
index 7554d78fa4c1..be5b4e334abd 100644
--- a/src/renderer/components/watch-video-chapters/watch-video-chapters.vue
+++ b/src/renderer/components/watch-video-chapters/watch-video-chapters.vue
@@ -47,6 +47,7 @@
       >
         <img
           v-if="!compact"
+          alt=""
           aria-hidden="true"
           class="chapterThumbnail"
           :src="chapter.thumbnail"
diff --git a/src/renderer/components/watch-video-info/watch-video-info.vue b/src/renderer/components/watch-video-info/watch-video-info.vue
index 3363551af568..5e554af42e79 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.vue
+++ b/src/renderer/components/watch-video-info/watch-video-info.vue
@@ -19,6 +19,7 @@
               <img
                 :src="channelThumbnail"
                 class="channelThumbnail"
+                alt=""
               >
             </router-link>
           </div>
diff --git a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.css b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.css
index af30151f000c..f4bab297e2ea 100644
--- a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.css
+++ b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.css
@@ -210,7 +210,8 @@
   transition: background 0.2s ease-out;
 }
 
-.scrollToBottom:hover {
+.scrollToBottom:hover,
+.scrollToBottom:focus {
   background-color: var(--accent-color-light);
   transition: background 0.2s ease-in;
 }
diff --git a/src/renderer/scss-partials/_ft-list-item.scss b/src/renderer/scss-partials/_ft-list-item.scss
index 0e0c100737cb..ce5236e1d3f4 100644
--- a/src/renderer/scss-partials/_ft-list-item.scss
+++ b/src/renderer/scss-partials/_ft-list-item.scss
@@ -64,7 +64,8 @@ $watched-transition-duration: 0.5s;
       transition-duration: $watched-transition-duration;
     }
 
-    &:hover .thumbnailImage {
+    &:hover .thumbnailImage,
+    &:focus .thumbnailImage {
       opacity: 1;
       transition-duration: $watched-transition-duration;
     }
diff --git a/src/renderer/views/About/About.vue b/src/renderer/views/About/About.vue
index 4c7ba06731c0..4812fcb55458 100644
--- a/src/renderer/views/About/About.vue
+++ b/src/renderer/views/About/About.vue
@@ -8,6 +8,7 @@
         <img
           src="../../../../_icons/logoColor.png"
           class="logo"
+          alt=""
         >
         <div class="version">
           {{ versionNumber }} {{ $t("About.Beta") }}
diff --git a/src/renderer/views/Channel/Channel.css b/src/renderer/views/Channel/Channel.css
index e0f1ca39294d..051fb1b72882 100644
--- a/src/renderer/views/Channel/Channel.css
+++ b/src/renderer/views/Channel/Channel.css
@@ -109,7 +109,8 @@
   border-bottom: 3px solid transparent;
 }
 
-.tab:hover {
+.tab:hover,
+.tab:focus {
   font-weight: bold;
   border-bottom: 3px solid var(--tertiary-text-color);
 }
diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.vue b/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
index 1250607ac94e..f82f6b3e511e 100644
--- a/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
+++ b/src/renderer/views/SubscribedChannels/SubscribedChannels.vue
@@ -30,12 +30,14 @@
             class="channel"
           >
             <router-link
+              tabindex="-1"
               class="thumbnailContainer"
               :to="`/channel/${channel.id}`"
             >
               <img
                 class="channelThumbnail"
                 :src="thumbnailURL(channel.thumbnail)"
+                alt=""
                 @error.once="updateThumbnail(channel)"
               >
             </router-link>

From c1462dc3d14b1d48502bb4de673f179b8480f80a Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <salamanderking79@gmail.com>
Date: Thu, 12 Jan 2023 13:30:51 +0000
Subject: [PATCH 262/301] Translated using Weblate (English (United Kingdom))

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/en_GB/
---
 static/locales/en_GB.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/static/locales/en_GB.yaml b/static/locales/en_GB.yaml
index f9ae758c303a..b8db2ff1bd79 100644
--- a/static/locales/en_GB.yaml
+++ b/static/locales/en_GB.yaml
@@ -398,6 +398,8 @@ Settings:
     Hide Chapters: Hide chapters
     Hide Channels: Hide videos from channels
     Hide Channels Placeholder: Channel name or ID
+    Display Titles Without Excessive Capitalisation: Display Titles Without Excessive
+      Capitalisation
   The app needs to restart for changes to take effect. Restart and apply change?: The
     app needs to restart for changes to take effect. Do you want to restart and apply
     the changes?
@@ -714,6 +716,7 @@ Video:
   Premieres: Premieres
   Show Super Chat Comment: Show Super Chat comment
   Scroll to Bottom: Scroll to bottom
+  Upcoming: Upcoming
 Videos:
   #& Sort By
   Sort By:

From 7becd3612069281054d44636236212e13a1c5111 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Fri, 13 Jan 2023 17:54:05 +0100
Subject: [PATCH 263/301] Add an IS_ELECTRON_MAIN define instead of runtime
 detection (#3056)

---
 _scripts/webpack.main.config.js     | 7 ++++++-
 _scripts/webpack.renderer.config.js | 1 +
 _scripts/webpack.web.config.js      | 3 ++-
 src/datastores/index.js             | 3 +--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/_scripts/webpack.main.config.js b/_scripts/webpack.main.config.js
index c787cf02b474..0f3c706c6a97 100644
--- a/_scripts/webpack.main.config.js
+++ b/_scripts/webpack.main.config.js
@@ -1,4 +1,5 @@
 const path = require('path')
+const webpack = require('webpack')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const JsonMinimizerPlugin = require('json-minimizer-webpack-plugin')
 
@@ -33,7 +34,11 @@ const config = {
     __dirname: isDevMode,
     __filename: isDevMode
   },
-  plugins: [],
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env.IS_ELECTRON_MAIN': true
+    })
+  ],
   output: {
     filename: '[name].js',
     libraryTarget: 'commonjs2',
diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
index 21258d9e4a80..950d421ea46b 100644
--- a/_scripts/webpack.renderer.config.js
+++ b/_scripts/webpack.renderer.config.js
@@ -112,6 +112,7 @@ const config = {
     processLocalesPlugin,
     new webpack.DefinePlugin({
       'process.env.IS_ELECTRON': true,
+      'process.env.IS_ELECTRON_MAIN': false,
       'process.env.LOCALE_NAMES': JSON.stringify(processLocalesPlugin.localeNames)
     }),
     new HtmlWebpackPlugin({
diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
index a61bdbc2d1f0..64e21f2e2513 100644
--- a/_scripts/webpack.web.config.js
+++ b/_scripts/webpack.web.config.js
@@ -114,7 +114,8 @@ const config = {
   },
   plugins: [
     new webpack.DefinePlugin({
-      'process.env.IS_ELECTRON': false
+      'process.env.IS_ELECTRON': false,
+      'process.env.IS_ELECTRON_MAIN': false
     }),
     new webpack.ProvidePlugin({
       process: 'process/browser',
diff --git a/src/datastores/index.js b/src/datastores/index.js
index 713a0ea30464..a54fd0b4ad3c 100644
--- a/src/datastores/index.js
+++ b/src/datastores/index.js
@@ -2,8 +2,7 @@ import Datastore from 'nedb-promises'
 
 let dbPath = null
 
-const isElectronMain = !!process?.versions?.electron
-if (isElectronMain) {
+if (process.env.IS_ELECTRON_MAIN) {
   const { app } = require('electron')
   const { join } = require('path')
   const userDataPath = app.getPath('userData') // This is based on the user's OS

From ae50ec72056d2ba56d9ea4188acf7a0fa5cf87f5 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Fri, 13 Jan 2023 17:54:22 +0100
Subject: [PATCH 264/301] Migrate live chat to YouTube.js (#3054)

---
 package.json                                  |   3 +-
 .../watch-video-live-chat.js                  | 207 +++++++++++-------
 .../watch-video-live-chat.vue                 |  50 ++---
 src/renderer/helpers/api/local.js             | 119 ++++++----
 src/renderer/views/Watch/Watch.js             |   9 +-
 src/renderer/views/Watch/Watch.vue            |   5 +-
 yarn.lock                                     |  30 +--
 7 files changed, 238 insertions(+), 185 deletions(-)

diff --git a/package.json b/package.json
index 423c712bea09..1081eff67d99 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,6 @@
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
     "@fortawesome/vue-fontawesome": "^2.0.9",
-    "@freetube/youtube-chat": "^1.1.2",
     "@freetube/yt-comment-scraper": "^6.2.0",
     "@silvermine/videojs-quality-selector": "^1.2.5",
     "autolinker": "^4.0.0",
@@ -77,7 +76,7 @@
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
-    "youtubei.js": "^2.8.0",
+    "youtubei.js": "^2.9.0",
     "yt-channel-info": "^3.2.1"
   },
   "devDependencies": {
diff --git a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js
index aef8590a68d1..11f55815303e 100644
--- a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js
+++ b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js
@@ -4,9 +4,8 @@ import FtCard from '../ft-card/ft-card.vue'
 import FtButton from '../ft-button/ft-button.vue'
 
 import autolinker from 'autolinker'
-import { LiveChat } from '@freetube/youtube-chat'
 import { getRandomColorClass } from '../../helpers/colors'
-import { stripHTML } from '../../helpers/utils'
+import { getLocalVideoInfo, parseLocalTextRuns } from '../../helpers/api/local'
 
 export default Vue.extend({
   name: 'WatchVideoLiveChat',
@@ -15,23 +14,23 @@ export default Vue.extend({
     'ft-card': FtCard,
     'ft-button': FtButton
   },
-  beforeRouteLeave: function () {
-    this.liveChat.stop()
-    this.hasEnded = true
-  },
   props: {
+    liveChat: {
+      type: EventTarget,
+      default: null
+    },
     videoId: {
       type: String,
       required: true
     },
-    channelName: {
+    channelId: {
       type: String,
       required: true
     }
   },
   data: function () {
     return {
-      liveChat: null,
+      liveChatInstance: null,
       isLoading: true,
       hasError: false,
       hasEnded: false,
@@ -43,15 +42,15 @@ export default Vue.extend({
       comments: [],
       superChatComments: [],
       superChat: {
+        id: '',
         author: {
           name: '',
-          thumbnail: ''
+          thumbnailUrl: ''
         },
-        message: [
-          ''
-        ],
+        message: '',
         superChat: {
-          amount: ''
+          amount: '',
+          colorClass: ''
         }
       }
     }
@@ -73,14 +72,15 @@ export default Vue.extend({
       }
     },
 
-    hideLiveChat: function () {
-      return this.$store.getters.getHideLiveChat
-    },
-
     scrollingBehaviour: function () {
       return this.$store.getters.getDisableSmoothScrolling ? 'auto' : 'smooth'
     }
   },
+  beforeDestroy: function () {
+    this.hasEnded = true
+    this.liveChatInstance?.stop()
+    this.liveChatInstance = null
+  },
   created: function () {
     if (!process.env.IS_ELECTRON) {
       this.hasError = true
@@ -88,7 +88,8 @@ export default Vue.extend({
     } else {
       switch (this.backendPreference) {
         case 'local':
-          this.getLiveChatLocal()
+          this.liveChatInstance = this.liveChat
+          this.startLiveChatLocal()
           break
         case 'invidious':
           if (this.backendFallback) {
@@ -111,95 +112,137 @@ export default Vue.extend({
       this.getLiveChatLocal()
     },
 
-    getLiveChatLocal: function () {
-      this.liveChat = new LiveChat({ liveId: this.videoId })
+    getLiveChatLocal: async function () {
+      const videoInfo = await getLocalVideoInfo(this.videoId)
+      this.liveChatInstance = videoInfo.getLiveChat()
 
-      this.isLoading = false
+      this.startLiveChatLocal()
+    },
+
+    startLiveChatLocal: function () {
+      this.liveChatInstance.once('start', initialData => {
+        /**
+         * @type {import ('youtubei.js/dist/src/parser/index').LiveChatContinuation}
+         */
+        const liveChatContinuation = initialData
+
+        const actions = liveChatContinuation.actions.filter(action => action.type === 'AddChatItemAction')
+
+        for (const { item } of actions) {
+          switch (item.type) {
+            case 'LiveChatTextMessage':
+              this.parseLiveChatComment(item)
+              break
+            case 'LiveChatPaidMessage':
+              this.parseLiveChatSuperChat(item)
+          }
+        }
 
-      this.liveChat.on('start', (liveId) => {
         this.isLoading = false
+
+        setTimeout(() => {
+          this.$refs.liveChatComments?.scrollTo({
+            top: this.$refs.liveChatComments.scrollHeight,
+            behavior: 'instant'
+          })
+        })
       })
 
-      this.liveChat.on('end', (reason) => {
-        console.error('Live chat has ended')
-        console.error(reason)
-        this.hasError = true
-        this.showEnableChat = false
-        this.errorMessage = this.$t('Video["Chat is disabled or the Live Stream has ended."]')
+      this.liveChatInstance.on('chat-update', action => {
+        if (this.hasEnded) {
+          return
+        }
+        if (action.type === 'AddChatItemAction') {
+          switch (action.item.type) {
+            case 'LiveChatTextMessage':
+              this.parseLiveChatComment(action.item)
+              break
+            case 'LiveChatPaidMessage':
+              this.parseLiveChatSuperChat(action.item)
+              break
+          }
+        }
       })
 
-      this.liveChat.on('error', (err) => {
-        this.hasError = true
-        this.errorMessage = err
-        this.showEnableChat = false
+      this.liveChatInstance.once('end', () => {
+        this.hasEnded = true
+        this.liveChatInstance = null
       })
 
-      this.liveChat.on('comment', (comment) => {
-        this.parseLiveChatComment(comment)
+      this.liveChatInstance.once('error', error => {
+        this.liveChatInstance.stop()
+        this.liveChatInstance = null
+        console.error(error)
+        this.errorMessage = error
+        this.hasError = true
+        this.isLoading = false
+        this.hasEnded = true
       })
 
-      this.liveChat.start()
+      this.liveChatInstance.start()
     },
 
+    /**
+     * @param {import('youtubei.js/dist/src/parser/classes/livechat/items/LiveChatTextMessage').default} comment
+     */
     parseLiveChatComment: function (comment) {
-      if (this.hasEnded) {
-        return
+      /**
+       * can also be undefined if there is no badge
+       * @type {import('youtubei.js/dist/src/parser/classes/LiveChatAuthorBadge').default}
+       */
+      const badge = comment.author.badges.find(badge => badge.type === 'LiveChatAuthorBadge' && badge.custom_thumbnail)
+
+      const parsedComment = {
+        message: autolinker.link(parseLocalTextRuns(comment.message.runs, 20)),
+        author: {
+          name: comment.author.name.text,
+          thumbnailUrl: comment.author.thumbnails.at(-1).url,
+          isOwner: comment.author.id === this.channelId,
+          isModerator: comment.author.is_moderator,
+          isMember: !!badge
+        }
       }
 
-      comment.messageHtml = ''
-
-      comment.message.forEach((text) => {
-        if (typeof text === 'undefined') return
-
-        if (typeof (text.navigationEndpoint) !== 'undefined') {
-          if (typeof (text.navigationEndpoint.watchEndpoint) !== 'undefined') {
-            const htmlRef = `<a href="https://www.youtube.com/watch?v=${text.navigationEndpoint.watchEndpoint.videoId}">${text.text}</a>`
-            comment.messageHtml = stripHTML(comment.messageHtml) + htmlRef
-          } else {
-            comment.messageHtml = stripHTML(comment.messageHtml + text.text)
-          }
-        } else if (typeof (text.alt) !== 'undefined') {
-          const htmlImg = `<img src="${text.url}" alt="${text.alt}" class="liveChatEmoji" height="24" width="24" />`
-          comment.messageHtml = stripHTML(comment.messageHtml) + htmlImg
-        } else {
-          comment.messageHtml = stripHTML(comment.messageHtml + text.text)
+      if (badge) {
+        parsedComment.badge = {
+          url: badge.custom_thumbnail.at(-1).url,
+          tooltip: badge.tooltip ?? ''
         }
-      })
-
-      comment.messageHtml = autolinker.link(comment.messageHtml)
-
-      if (typeof this.$refs.liveChatComments === 'undefined' && typeof this.$refs.liveChatMessage === 'undefined') {
-        console.error("Can't find chat object.  Stopping chat connection")
-        this.liveChat.stop()
-        return
       }
 
-      this.comments.push(comment)
-
-      if (typeof (comment.superchat) !== 'undefined') {
-        comment.superchat.colorClass = getRandomColorClass()
-
-        this.superChatComments.unshift(comment)
-
-        setTimeout(() => {
-          this.removeFromSuperChat(comment.id)
-        }, 120000)
-      }
+      this.pushComment(parsedComment)
+    },
 
-      if (comment.author.name[0] === 'Ge' || comment.author.name[0] === 'Ne') {
-        comment.superChat = {
-          amount: '$5.00',
+    /**
+     * @param {import('youtubei.js/dist/src/parser/classes/livechat/items/LiveChatPaidMessage').default} superChat
+     */
+    parseLiveChatSuperChat: function (superChat) {
+      const parsedComment = {
+        id: superChat.id,
+        message: autolinker.link(parseLocalTextRuns(superChat.message.runs, 20)),
+        author: {
+          name: superChat.author.name.text,
+          thumbnailUrl: superChat.author.thumbnails[0].url
+        },
+        superChat: {
+          amount: superChat.purchase_amount,
           colorClass: getRandomColorClass()
         }
+      }
 
-        this.superChatComments.unshift(comment)
+      this.superChatComments.unshift(parsedComment)
 
-        setTimeout(() => {
-          this.removeFromSuperChat(comment.id)
-        }, 120000)
-      }
+      setTimeout(() => {
+        this.removeFromSuperChat(parsedComment.id)
+      }, 120000)
+
+      this.pushComment(parsedComment)
+    },
+
+    pushComment: function (comment) {
+      this.comments.push(comment)
 
-      if (this.stayAtBottom) {
+      if (!this.isLoading && this.stayAtBottom) {
         setTimeout(() => {
           this.$refs.liveChatComments?.scrollTo({
             top: this.$refs.liveChatComments.scrollHeight,
diff --git a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue
index 67c915b90f02..4c9888a41c28 100644
--- a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue
+++ b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.vue
@@ -1,6 +1,5 @@
 <template>
   <ft-card
-    v-if="!hideLiveChat"
     class="relative"
   >
     <ft-loader
@@ -52,7 +51,7 @@
           :aria-label="$t('Video.Show Super Chat Comment')"
           :style="{ backgroundColor: 'var(--primary-color)' }"
           class="superChat"
-          :class="comment.superchat.colorClass"
+          :class="comment.superChat.colorClass"
           role="button"
           tabindex="0"
           @click="showSuperChatComment(comment)"
@@ -60,7 +59,7 @@
           @keydown.enter.prevent="showSuperChatComment(comment)"
         >
           <img
-            :src="comment.author.thumbnail.url"
+            :src="comment.author.thumbnailUrl"
             class="channelThumbnail"
             alt=""
           >
@@ -70,7 +69,7 @@
             <span
               class="donationAmount"
             >
-              {{ comment.superchat.amount }}
+              {{ comment.superChat.amount }}
             </span>
           </p>
         </div>
@@ -78,7 +77,7 @@
       <div
         v-if="showSuperChat"
         class="openedSuperChat"
-        :class="superChat.superchat.colorClass"
+        :class="superChat.superChat.colorClass"
         role="button"
         tabindex="0"
         @click="showSuperChat = false"
@@ -93,7 +92,7 @@
             class="upperSuperChatMessage"
           >
             <img
-              :src="superChat.author.thumbnail.url"
+              :src="superChat.author.thumbnailUrl"
               class="channelThumbnail"
               alt=""
             >
@@ -105,13 +104,12 @@
             <p
               class="donationAmount"
             >
-              {{ superChat.superchat.amount }}
+              {{ superChat.superChat.amount }}
             </p>
           </div>
           <p
-            v-if="superChat.message.length > 0"
             class="chatMessage"
-            v-html="superChat.messageHtml"
+            v-html="superChat.message"
           />
         </div>
       </div>
@@ -125,17 +123,16 @@
           v-for="(comment, index) in comments"
           :key="index"
           class="comment"
-          :class="{ superChatMessage: typeof (comment.superchat) !== 'undefined' }"
+          :class="comment.superChat ? `superChatMessage ${comment.superChat.colorClass}` : ''"
         >
-          <div
-            v-if="typeof (comment.superchat) !== 'undefined'"
-            :class="comment.superchat.colorClass"
+          <template
+            v-if="comment.superChat"
           >
             <div
               class="upperSuperChatMessage"
             >
               <img
-                :src="comment.author.thumbnail.url"
+                :src="comment.author.thumbnailUrl"
                 class="channelThumbnail"
                 alt=""
               >
@@ -147,20 +144,20 @@
               <p
                 class="donationAmount"
               >
-                {{ comment.superchat.amount }}
+                {{ comment.superChat.amount }}
               </p>
             </div>
             <p
-              v-if="comment.message.length > 0"
+              v-if="comment.message"
               class="chatMessage"
-              v-html="comment.messageHtml"
+              v-html="comment.message"
             />
-          </div>
+          </template>
           <template
             v-else
           >
             <img
-              :src="comment.author.thumbnail.url"
+              :src="comment.author.thumbnailUrl"
               class="channelThumbnail"
               alt=""
             >
@@ -170,28 +167,27 @@
               <span
                 class="channelName"
                 :class="{
-                  member: typeof (comment.author.badge) !== 'undefined' || comment.membership,
-                  moderator: comment.isOwner,
-                  owner: comment.author.name === channelName
+                  member: comment.author.isMember,
+                  moderator: comment.author.isModerator,
+                  owner: comment.author.isOwner
                 }"
               >
                 {{ comment.author.name }}
               </span>
               <span
-                v-if="typeof (comment.author.badge) !== 'undefined'"
+                v-if="comment.author.badge"
                 class="badge"
               >
                 <img
-                  :src="comment.author.badge.thumbnail.url"
+                  :src="comment.author.badge.url"
                   alt=""
-                  :title="comment.author.badge.thumbnail.alt"
+                  :title="comment.author.badge.tooltip"
                   class="badgeImage"
                 >
               </span>
               <span
-                v-if="comment.message.length > 0"
                 class="chatMessage"
-                v-html="comment.messageHtml"
+                v-html="comment.message"
               />
             </p>
           </template>
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 66494a533974..94915cd8e53f 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -1,5 +1,6 @@
 import { Innertube } from 'youtubei.js'
 import { ClientType } from 'youtubei.js/dist/src/core/Session'
+import EmojiRun from 'youtubei.js/dist/src/parser/classes/misc/EmojiRun'
 import { join } from 'path'
 
 import { PlayerCache } from './PlayerCache'
@@ -305,63 +306,89 @@ function convertSearchFilters(filters) {
  */
 
 /**
- * @param {TextRun[]} textRuns
+ * @param {(TextRun|EmojiRun)[]} runs
+ * @param {number} emojiSize
  */
-export function parseLocalTextRuns(textRuns) {
-  if (!Array.isArray(textRuns)) {
+export function parseLocalTextRuns(runs, emojiSize = 16) {
+  if (!Array.isArray(runs)) {
     throw new Error('not an array of text runs')
   }
 
   const timestampRegex = /^(?:\d+:){1,2}\d+$/
-  const runs = []
-
-  for (const { text, endpoint } of textRuns) {
-    if (endpoint && !text.startsWith('#')) {
-      switch (endpoint.metadata.page_type) {
-        case 'WEB_PAGE_TYPE_WATCH':
-          if (timestampRegex.test(text)) {
-            runs.push(text)
-          } else {
-            runs.push(`https://www.youtube.com${endpoint.metadata.url}`)
-          }
-          break
-        case 'WEB_PAGE_TYPE_CHANNEL':
-          if (text.startsWith('@')) {
-            runs.push(`<a href="https://www.youtube.com/channel/${endpoint.payload.browseId}">${text}</a>`)
-          } else {
-            runs.push(`https://www.youtube.com${endpoint.metadata.url}`)
-          }
-          break
-        case 'WEB_PAGE_TYPE_PLAYLIST':
-          runs.push(`https://www.youtube.com${endpoint.metadata.url}`)
-          break
-        case 'WEB_PAGE_TYPE_UNKNOWN':
-        default: {
-          const url = new URL(endpoint.payload.url)
-          if (url.hostname === 'www.youtube.com' && url.pathname === '/redirect' && url.searchParams.has('q')) {
-            // remove utm tracking parameters
-            const realURL = new URL(url.searchParams.get('q'))
-
-            realURL.searchParams.delete('utm_source')
-            realURL.searchParams.delete('utm_medium')
-            realURL.searchParams.delete('utm_campaign')
-            realURL.searchParams.delete('utm_term')
-            realURL.searchParams.delete('utm_content')
-
-            runs.push(realURL.toString())
-          } else {
-            // this is probably a special YouTube URL like http://www.youtube.com/approachingnirvana
-            runs.push(endpoint.payload.url)
-          }
-          break
+  const parsedRuns = []
+
+  for (const run of runs) {
+    if (run instanceof EmojiRun) {
+      const { emoji, text } = run
+
+      let altText
+
+      if (emoji.is_custom) {
+        if (emoji.shortcuts.length > 0) {
+          altText = emoji.shortcuts[0]
+        } else if (emoji.search_terms.length > 0) {
+          altText = emoji.search_terms.join(', ')
+        } else {
+          altText = 'Custom emoji'
         }
+      } else {
+        altText = text
       }
+
+      // lazy load the emoji image so it doesn't delay rendering of the text
+      // by defining a height and width, that space is reserved until the image is loaded
+      // that way we avoid layout shifts when it loads
+      parsedRuns.push(`<img src="${emoji.image[0].url}" alt="${altText}" width="${emojiSize}" height="${emojiSize}" loading="lazy" style="vertical-align: middle">`)
     } else {
-      runs.push(text)
+      const { text, endpoint } = run
+
+      if (endpoint && !text.startsWith('#')) {
+        switch (endpoint.metadata.page_type) {
+          case 'WEB_PAGE_TYPE_WATCH':
+            if (timestampRegex.test(text)) {
+              parsedRuns.push(text)
+            } else {
+              parsedRuns.push(`https://www.youtube.com${endpoint.metadata.url}`)
+            }
+            break
+          case 'WEB_PAGE_TYPE_CHANNEL':
+            if (text.startsWith('@')) {
+              parsedRuns.push(`<a href="https://www.youtube.com/channel/${endpoint.payload.browseId}">${text}</a>`)
+            } else {
+              parsedRuns.push(`https://www.youtube.com${endpoint.metadata.url}`)
+            }
+            break
+          case 'WEB_PAGE_TYPE_PLAYLIST':
+            parsedRuns.push(`https://www.youtube.com${endpoint.metadata.url}`)
+            break
+          case 'WEB_PAGE_TYPE_UNKNOWN':
+          default: {
+            const url = new URL(endpoint.payload.url)
+            if (url.hostname === 'www.youtube.com' && url.pathname === '/redirect' && url.searchParams.has('q')) {
+              // remove utm tracking parameters
+              const realURL = new URL(url.searchParams.get('q'))
+
+              realURL.searchParams.delete('utm_source')
+              realURL.searchParams.delete('utm_medium')
+              realURL.searchParams.delete('utm_campaign')
+              realURL.searchParams.delete('utm_term')
+              realURL.searchParams.delete('utm_content')
+
+              parsedRuns.push(realURL.toString())
+            } else {
+              // this is probably a special YouTube URL like http://www.youtube.com/approachingnirvana
+              parsedRuns.push(endpoint.payload.url)
+            }
+            break
+          }
+        }
+      } else {
+        parsedRuns.push(text)
+      }
     }
   }
 
-  return runs.join('')
+  return parsedRuns.join('')
 }
 
 /**
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 395c7da5c93b..29523610ffa5 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -59,6 +59,7 @@ export default Vue.extend({
       hidePlayer: false,
       isFamilyFriendly: false,
       isLive: false,
+      liveChat: null,
       isLiveContent: false,
       isUpcoming: false,
       upcomingTimestamp: null,
@@ -304,7 +305,7 @@ export default Vue.extend({
           channelId: this.channelId
         })
 
-        this.videoPublished = new Date(result.primary_info.published.text.replace('-', '/')).getTime()
+        this.videoPublished = new Date(result.page[0].microformat.publish_date.replace('-', '/')).getTime()
 
         if (result.secondary_info?.description.runs) {
           try {
@@ -410,6 +411,12 @@ export default Vue.extend({
 
         this.videoChapters = chapters
 
+        if (!this.hideLiveChat && this.isLive && this.isLiveContent && result.livechat) {
+          this.liveChat = result.getLiveChat()
+        } else {
+          this.liveChat = null
+        }
+
         // the bypassed result is missing some of the info that we extract in the code above
         // so we only overwrite the result here
         // we need the bypassed result for the streaming data and the subtitles
diff --git a/src/renderer/views/Watch/Watch.vue b/src/renderer/views/Watch/Watch.vue
index 879a1db26607..567805e32c7b 100644
--- a/src/renderer/views/Watch/Watch.vue
+++ b/src/renderer/views/Watch/Watch.vue
@@ -153,9 +153,10 @@
       class="sidebarArea"
     >
       <watch-video-live-chat
-        v-if="!isLoading && isLive"
+        v-if="!isLoading && !hideLiveChat && isLive"
+        :live-chat="liveChat"
         :video-id="videoId"
-        :channel-name="channelName"
+        :channel-id="channelId"
         class="watchVideoSideBar watchVideoPlaylist"
         :class="{ theatrePlaylist: useTheatreMode }"
       />
diff --git a/yarn.lock b/yarn.lock
index 788c41027b88..be8a57b3335b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1058,14 +1058,6 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.9.tgz#7df35818135be54fd87568f16ec7b998a3d0cce8"
   integrity sha512-tUmO92PFHbLOplitjHNBVGMJm6S57vp16tBXJVPKSI/6CfjrgLycqKxEpC6f7qsOqUdoXs5nIv4HLUfrOMHzuw==
 
-"@freetube/youtube-chat@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@freetube/youtube-chat/-/youtube-chat-1.1.2.tgz#29e8e1fc94a278e2da38c1241fb611a744a3a0a6"
-  integrity sha512-VT/00nshjwf5WC7cZ9EV5lGMo83DDyC0XYnoNwmSk34sWCco8h8/EXKnCDTG82clZrS2mJHYlYRfXN/6FWd6ig==
-  dependencies:
-    axios "^0.21.1"
-    tslib "^1.11.1"
-
 "@freetube/yt-comment-scraper@^6.2.0":
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/@freetube/yt-comment-scraper/-/yt-comment-scraper-6.2.0.tgz#ed11d65111d03076ff842eb9c3eb25413f8632ab"
@@ -2078,13 +2070,6 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
   integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
-axios@^0.21.1:
-  version "0.21.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
-  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
-  dependencies:
-    follow-redirects "^1.14.0"
-
 axios@^0.27.2:
   version "0.27.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
@@ -4361,7 +4346,7 @@ flatted@^3.1.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
   integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
 
-follow-redirects@^1.0.0, follow-redirects@^1.14.0:
+follow-redirects@^1.0.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.0.tgz#06441868281c86d0dda4ad8bdaead2d02dca89d4"
   integrity sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==
@@ -8414,11 +8399,6 @@ tsconfig-paths@^3.14.1:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^1.11.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
 tslib@^2.0.3, tslib@^2.3.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
@@ -9174,10 +9154,10 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
-youtubei.js@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-2.8.0.tgz#f0170f390791cde733facf615f3cf0e2470c31de"
-  integrity sha512-UEH3wP1Wmrmnh2wJohhg+rAq94bF2EqGnlnph2z91kZ+I1tQzlZD09Zc7QNqCYV0t2G4Cl2Lu+DqXrdhf1/SoQ==
+youtubei.js@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-2.9.0.tgz#17426dfb0555169cddede509d50d3db62c102270"
+  integrity sha512-paxfeQGwxGw0oPeKdC96jNalS0OnYQ5xdJY27k3J+vamzVcwX6Ky+idALW6Ej9aUC7FISbchBsEVg0Wa7wgGyA==
   dependencies:
     "@protobuf-ts/runtime" "^2.7.0"
     jintr "^0.3.1"

From 97cb339ec55c94595efed82cbd5e0adc49ef581b Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sat, 14 Jan 2023 08:11:08 +0100
Subject: [PATCH 265/301] Decipher format URLs with the local API (#3053)

---
 src/renderer/helpers/api/local.js | 32 +++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 94915cd8e53f..b0d67d2d2a9c 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -116,14 +116,42 @@ export async function getLocalSearchContinuation(continuationData) {
 }
 
 export async function getLocalVideoInfo(id, attemptBypass = false) {
+  let info
+  let player
+
   if (attemptBypass) {
     const innertube = await createInnertube({ withPlayer: true, clientType: ClientType.TV_EMBEDDED })
+    player = innertube.actions.session.player
+
     // the second request that getInfo makes 404s with the bypass, so we use getBasicInfo instead
     // that's fine as we have most of the information from the original getInfo request
-    return await innertube.getBasicInfo(id, 'TV_EMBEDDED')
+    info = await innertube.getBasicInfo(id, 'TV_EMBEDDED')
   } else {
     const innertube = await createInnertube({ withPlayer: true })
-    return await innertube.getInfo(id)
+    player = innertube.actions.session.player
+
+    info = await innertube.getInfo(id)
+  }
+
+  if (info.streaming_data) {
+    decipherFormats(info.streaming_data.adaptive_formats, player)
+    decipherFormats(info.streaming_data.formats, player)
+  }
+
+  return info
+}
+
+/**
+ * @param {import('youtubei.js/dist/src/parser/classes/misc/Format').default[]} formats
+ * @param {import('youtubei.js/dist/index').Player} player
+ */
+function decipherFormats(formats, player) {
+  for (const format of formats) {
+    format.url = format.decipher(player)
+
+    // set these to undefined so that toDash doesn't try to decipher them again, throwing an error
+    format.cipher = undefined
+    format.signature_cipher = undefined
   }
 }
 

From 67b9a74ae3d794a80f57174a8bc419b9b6c0e8cd Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Sat, 14 Jan 2023 23:01:12 +0800
Subject: [PATCH 266/301] ! Fix code for getting event.key lowercase value
 (#3061)

---
 src/renderer/components/ft-video-player/ft-video-player.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
index 5e648bf608f7..3ccb0f7db872 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -1823,7 +1823,7 @@ export default Vue.extend({
       }
 
       // allow copying text
-      if ((event.ctrlKey || event.metaKey) && event.key.lowercase() === 'c') {
+      if ((event.ctrlKey || event.metaKey) && event.key.toLowerCase() === 'c') {
         return
       }
 

From 3e80e96a0c2edc591f4402b132e5a540d6c3c897 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sat, 14 Jan 2023 16:01:27 +0100
Subject: [PATCH 267/301] Use ES6 classes for video.js components instead of
 videojs.extend (#3060)

---
 .../ft-video-player/ft-video-player.js        | 105 +++++++++---------
 1 file changed, 55 insertions(+), 50 deletions(-)

diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
index 3ccb0f7db872..54bae15707c8 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -1196,27 +1196,28 @@ export default Vue.extend({
     },
 
     createLoopButton: function () {
+      const toggleVideoLoop = this.toggleVideoLoop
+
       const VjsButton = videojs.getComponent('Button')
-      const loopButton = videojs.extend(VjsButton, {
-        constructor: function(player, options) {
-          VjsButton.call(this, player, options)
-        },
-        handleClick: () => {
-          this.toggleVideoLoop()
-        },
-        createControlTextEl: function (button) {
+      class loopButton extends VjsButton {
+        handleClick() {
+          toggleVideoLoop()
+        }
+
+        createControlTextEl(button) {
           button.title = 'Toggle Loop'
 
           const div = document.createElement('div')
 
           div.id = 'loopButton'
-          div.className = 'vjs-icon-loop loop-white vjs-button loopWhite'
+          div.className = 'vjs-icon-loop loop-white vjs-button'
 
           button.appendChild(div)
 
           return div
         }
-      })
+      }
+
       videojs.registerComponent('loopButton', loopButton)
     },
 
@@ -1247,15 +1248,15 @@ export default Vue.extend({
     },
 
     createFullWindowButton: function () {
+      const toggleFullWindow = this.toggleFullWindow
+
       const VjsButton = videojs.getComponent('Button')
-      const fullWindowButton = videojs.extend(VjsButton, {
-        constructor: function(player, options) {
-          VjsButton.call(this, player, options)
-        },
-        handleClick: () => {
-          this.toggleFullWindow()
-        },
-        createControlTextEl: function (button) {
+      class fullWindowButton extends VjsButton {
+        handleClick() {
+          toggleFullWindow()
+        }
+
+        createControlTextEl (button) {
           // Add class name to button to be able to target it with CSS selector
           button.classList.add('vjs-button-fullwindow')
           button.title = 'Full Window'
@@ -1268,7 +1269,8 @@ export default Vue.extend({
 
           return div
         }
-      })
+      }
+
       videojs.registerComponent('fullWindowButton', fullWindowButton)
     },
 
@@ -1279,15 +1281,15 @@ export default Vue.extend({
 
       const theatreModeActive = this.$parent.useTheatreMode ? ' vjs-icon-theatre-active' : ''
 
+      const toggleTheatreMode = this.toggleTheatreMode
+
       const VjsButton = videojs.getComponent('Button')
-      const toggleTheatreModeButton = videojs.extend(VjsButton, {
-        constructor: function(player, options) {
-          VjsButton.call(this, player, options)
-        },
-        handleClick: () => {
-          this.toggleTheatreMode()
-        },
-        createControlTextEl: function (button) {
+      class toggleTheatreModeButton extends VjsButton {
+        handleClick() {
+          toggleTheatreMode()
+        }
+
+        createControlTextEl(button) {
           button.classList.add('vjs-button-theatre')
           button.title = 'Toggle Theatre Mode'
 
@@ -1299,7 +1301,7 @@ export default Vue.extend({
 
           return button
         }
-      })
+      }
 
       videojs.registerComponent('toggleTheatreModeButton', toggleTheatreModeButton)
     },
@@ -1317,19 +1319,19 @@ export default Vue.extend({
       this.$parent.toggleTheatreMode()
     },
 
-    createScreenshotButton: function() {
+    createScreenshotButton: function () {
+      const takeScreenshot = this.takeScreenshot
+
       const VjsButton = videojs.getComponent('Button')
-      const screenshotButton = videojs.extend(VjsButton, {
-        constructor: function(player, options) {
-          VjsButton.call(this, player, options)
-        },
-        handleClick: () => {
-          this.takeScreenshot()
+      class screenshotButton extends VjsButton {
+        handleClick() {
+          takeScreenshot()
           const video = document.getElementsByTagName('video')[0]
           video.focus()
           video.blur()
-        },
-        createControlTextEl: function (button) {
+        }
+
+        createControlTextEl(button) {
           button.classList.add('vjs-hidden')
           button.title = 'Screenshot'
 
@@ -1341,7 +1343,7 @@ export default Vue.extend({
 
           return div
         }
-      })
+      }
 
       videojs.registerComponent('screenshotButton', screenshotButton)
     },
@@ -1484,17 +1486,19 @@ export default Vue.extend({
         }, 200)
         return
       }
+      const adaptiveFormats = this.adaptiveFormats
+      const activeAdaptiveFormats = this.activeAdaptiveFormats
+      const setDashQualityLevel = this.setDashQualityLevel
+
       const VjsButton = videojs.getComponent('Button')
-      const dashQualitySelector = videojs.extend(VjsButton, {
-        constructor: function(player, options) {
-          VjsButton.call(this, player, options)
-        },
-        handleClick: (event) => {
+      class dashQualitySelector extends VjsButton {
+        handleClick(event) {
           const selectedQuality = event.target.innerText
           const bitrate = selectedQuality === 'auto' ? 'auto' : parseInt(event.target.attributes.bitrate.value)
-          this.setDashQualityLevel(bitrate)
-        },
-        createControlTextEl: (button) => {
+          setDashQualityLevel(bitrate)
+        }
+
+        createControlTextEl(button) {
           const beginningHtml = `<div class="vjs-quality-level-value">
            <span id="vjs-current-quality">1080p</span>
           </div>
@@ -1518,8 +1522,8 @@ export default Vue.extend({
             let qualityLabel
             let bitrate
 
-            if (typeof this.adaptiveFormats !== 'undefined' && this.adaptiveFormats.length > 0) {
-              const adaptiveFormat = this.adaptiveFormats.find((format) => {
+            if (typeof adaptiveFormats !== 'undefined' && adaptiveFormats.length > 0) {
+              const adaptiveFormat = adaptiveFormats.find((format) => {
                 return format.bitrate === quality.bitrate
               })
 
@@ -1527,7 +1531,7 @@ export default Vue.extend({
                 return
               }
 
-              this.activeAdaptiveFormats.push(adaptiveFormat)
+              activeAdaptiveFormats.push(adaptiveFormat)
 
               fps = adaptiveFormat.fps ? adaptiveFormat.fps : 30
               qualityLabel = adaptiveFormat.qualityLabel ? adaptiveFormat.qualityLabel : quality.height + 'p'
@@ -1563,7 +1567,8 @@ export default Vue.extend({
 
           return button.children[0]
         }
-      })
+      }
+
       videojs.registerComponent('dashQualitySelector', dashQualitySelector)
       this.player.controlBar.addChild('dashQualitySelector', {}, this.player.controlBar.children_.length - 1)
       this.determineDefaultQualityDash()

From 5f522d5635ea56e3f71e66cf125c14c3b5d4e93c Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Sat, 14 Jan 2023 23:01:45 +0800
Subject: [PATCH 268/301] ! Fix searching in channel view broken (#3062)

---
 src/renderer/views/Channel/Channel.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index f5a668f76baa..c740e2e28f1c 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -682,13 +682,14 @@ export default Vue.extend({
       }
 
       const currentTabNode = document.querySelector('.tabs > .tab[aria-selected="true"]')
+      // `newTabNode` can be `null` when `tab` === "search"
       const newTabNode = document.getElementById(`${tab}Tab`)
       document.querySelector('.tabs > .tab[tabindex="0"]').setAttribute('tabindex', '-1')
-      newTabNode.setAttribute('tabindex', '0')
+      newTabNode?.setAttribute('tabindex', '0')
       currentTabNode.setAttribute('aria-selected', 'false')
-      newTabNode.setAttribute('aria-selected', 'true')
+      newTabNode?.setAttribute('aria-selected', 'true')
       this.currentTab = tab
-      newTabNode.focus({ focusVisible: true })
+      newTabNode?.focus({ focusVisible: true })
     },
 
     newSearch: function (query) {

From d8e6c3e42209d6b89ded56565fc9d4fc1d4ea7eb Mon Sep 17 00:00:00 2001
From: Sandyran <sandyran@protonmail.com>
Date: Sat, 14 Jan 2023 16:25:45 +0000
Subject: [PATCH 269/301] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 91.9% (606 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/nn/
---
 static/locales/nn.yaml | 177 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 159 insertions(+), 18 deletions(-)

diff --git a/static/locales/nn.yaml b/static/locales/nn.yaml
index 22aed88c295f..4c2b262ed41a 100644
--- a/static/locales/nn.yaml
+++ b/static/locales/nn.yaml
@@ -85,13 +85,17 @@ Subscriptions:
   'Getting Subscriptions. Please wait.': 'Henter abonnement. Ver venleg og vent.'
   Refresh Subscriptions: 'Oppdater abonnement'
   Load More Videos: 'Last inn fleire videoar'
+  Error Channels: Kanalar med feil
+  Disabled Automatic Fetching: Du har deaktivert automatisk henting av abonnement.
+    Oppdater abonnement for å sjå dei her.
+  Empty Channels: Kanalane du abonnerer på har ingen videoar for augeblikket.
 Trending:
   Trending: 'På veg opp'
   Music: Musikk
   Trending Tabs: På veg opp
   Movies: Filmar
   Gaming: Dataspel
-  Default: Forval
+  Default: Standard
 Most Popular: 'Mest populært'
 Playlists: 'Spelelister'
 User Playlists:
@@ -102,11 +106,17 @@ User Playlists:
   Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: 'Du
     har ingen lagra videoar for augeblikket. Klikk på "Lagre"-knappen i hjørnet av
     ein video slik at den bli oppført her'
+  Search bar placeholder: Søk i speleliste
+  Empty Search Message: Det er ingen videoar i denne spelelista som samsvarar med
+    søket ditt
 History:
   # On History Page
   History: 'Historikk'
   Watch History: 'Visingshistorikk'
   Your history list is currently empty.: 'Historikken din er tom for augeblikket.'
+  Empty Search Message: Det er ingen videoar i historikken din som samsvarer med søket
+    ditt
+  Search bar placeholder: Søk i historikk
 Settings:
   # On Settings Page
   Settings: 'Innstillingar'
@@ -120,7 +130,7 @@ Settings:
     Fallback to Non-Preferred Backend on Failure: 'Tilbakefall til ikkje-føretrekte
       backend ved feil'
     Enable Search Suggestions: 'Slå på søkeforslag'
-    Default Landing Page: 'Forvalt landingsside'
+    Default Landing Page: 'Standardlandingside'
     Locale Preference: 'Språkinnstilling'
     Preferred API Backend:
       Preferred API Backend: 'Føretrekte API-backend'
@@ -132,7 +142,7 @@ Settings:
       List: 'Liste'
     Thumbnail Preference:
       Thumbnail Preference: 'Miniatyrbiletepreferanse'
-      Default: 'Forval'
+      Default: 'Standard'
       Beginning: 'Begynning'
       Middle: 'Mellom'
       End: 'Slutt'
@@ -141,17 +151,25 @@ Settings:
     View all Invidious instance information: 'Vis informasjon om alle Invidious-førekomstar'
     Region for Trending: 'Region for "På veg opp"'
         #! List countries
-    System Default: Systemforval
+    System Default: Systemstandard
     External Link Handling:
       External Link Handling: Handtering av eksterne lenker
       Open Link: Opne lenke
       Ask Before Opening Link: Spør før opning av lenke
       No Action: Ingen handling
+    Current instance will be randomized on startup: Gjeldande førekomst vil bli satt
+      tilfeldig ved oppstart
+    Current Invidious Instance: Gjeldande Invidious-førekomstar
+    Set Current Instance as Default: Sett gjeldande førekomst som standardførekomst
+    Clear Default Instance: Tilbakestill standardførekomst
+    No default instance has been set: Ingen standardførekomst har blitt satt
+    The currently set default instance is {instance}: Gjeldande standardførekomst
+      er {instance}
   Theme Settings:
     Theme Settings: 'Temainnstillingar'
     Match Top Bar with Main Color: 'Tilpass topplinja slik at den har same farge som
       hovudfargen'
-    Expand Side Bar by Default: 'Utvid sidefeltet som forval'
+    Expand Side Bar by Default: 'Utvid sidefeltet som standard'
     Disable Smooth Scrolling: 'Slå av jamn rulling'
     UI Scale: 'Skalering av brukargrensesnitt'
     Base Theme:
@@ -160,6 +178,8 @@ Settings:
       Dark: 'Mørk'
       Light: 'Lys'
       Dracula: 'Dracula'
+      System Default: Systemstandard
+      Catppuccin Mocha: ''
     Main Color Theme:
       Main Color Theme: 'Hovudfargetema'
       Red: 'Raud'
@@ -187,15 +207,17 @@ Settings:
       Dracula Yellow: 'Dracula Gul'
     Secondary Color Theme: 'Sekundærfargetema'
         #* Main Color Theme
+    Hide Side Bar Labels: Skjul sidefeltetikettar
+    Hide FreeTube Header Logo: Skjul FreeTube-tittellogo
   Player Settings:
     Player Settings: 'Videoavspelingsinnstillingar'
     Force Local Backend for Legacy Formats: 'Påtving lokal bakende for forelda format'
     Play Next Video: 'Spel av neste video'
-    Turn on Subtitles by Default: 'Slå på undertekst som forval'
+    Turn on Subtitles by Default: 'Slå på undertekst som standard'
     Autoplay Videos: 'Spel av videoar automatisk'
     Proxy Videos Through Invidious: 'Mellomten videoar gjennom Invidious'
     Autoplay Playlists: 'Spel av spelelister automatisk'
-    Enable Theatre Mode by Default: 'Kinomodus som forval'
+    Enable Theatre Mode by Default: 'Kinomodus som standard'
     Default Volume: 'Standardvolum'
     Default Playback Rate: 'Avspelingshastigheit'
     Default Video Format:
@@ -218,6 +240,17 @@ Settings:
     Next Video Interval: Tid mellom videoar
     Display Play Button In Video Player: Vis videoavspelingsknappen i videoavspelaren
     Scroll Volume Over Video Player: Juster volum ved å bla på video
+    Screenshot:
+      Ask Path: Spør om kvar ting skal lagrast
+      Error:
+        Forbidden Characters: Forbodne teikn
+        Empty File Name: Tomt filnamn
+      Format Label: Skjermbileteformat
+      Enable: Aktiver skjermbilete
+      Folder Label: Skjermbiletemappe
+      Folder Button: Vel mappe
+      Quality Label: Skjermbiletekvalitet
+      File Name Label: Filnamnmøster
   Privacy Settings:
     Privacy Settings: 'Personvernsinnstillingar'
     Remember History: 'Husk historikk'
@@ -240,6 +273,7 @@ Settings:
     Hide Videos on Watch: 'Skjul sette videoar'
     Fetch Feeds from RSS: 'Hent informasjonskanalar frå RSS'
     Manage Subscriptions: 'Behandle abonnement'
+    Fetch Automatically: Hent informasjonkanalar automatisk
   Distraction Free Settings:
     Distraction Free Settings: 'Distraksjonsfri-instillingar'
     Hide Video Views: 'Skjul videovisingar'
@@ -252,6 +286,16 @@ Settings:
     Hide Live Chat: 'Skjul direktechat'
     Hide Active Subscriptions: 'Skjul aktive abonnement'
     Hide Playlists: Skjul spelelister
+    Hide Upcoming Premieres: Skjul komande premierar
+    Hide Sharing Actions: Skjul delehandlingar
+    Hide Comments: Skjul kommentarar
+    Hide Live Streams: Skjul direktesendingar
+    Hide Video Description: Skjul videobeskriving
+    Hide Chapters: Skjul kapittel
+    Display Titles Without Excessive Capitalisation: Vis titlar utan overdriven bruk
+      av store bokstavar
+    Hide Channels: Skjul videoar frå kanalar
+    Hide Channels Placeholder: Kanalnamn eller kanal-ID
   Data Settings:
     Data Settings: 'Datainnstillingar'
     Select Import Type: 'Vel importtype'
@@ -290,6 +334,17 @@ Settings:
     Unknown data key: 'Ukjent datanøkkel'
     How do I import my subscriptions?: 'Korleis importerer eg abonnementa mine?'
     Manage Subscriptions: 'Behandle abonnement'
+    Import Playlists: Importer spelelister
+    Subscription File: Abonnementfil
+    History File: Historikkfil
+    Playlist insufficient data: Utilstrekkeleg data for "{playlist}" speleliste, hopper
+      over element
+    All playlists has been successfully exported: Alle spelelister har blitt vellykka
+      eksportert
+    Export Playlists: Eksporter spelelister
+    All playlists has been successfully imported: Alle spelelister har blitt vellykka
+      importert
+    Playlist File: Spelelistefil
   Proxy Settings:
     Proxy Settings: 'Mellomtenarinnstillingar'
     Enable Tor / Proxy: 'Skru på Tor/mellomtenar'
@@ -308,16 +363,54 @@ Settings:
       ikkje hente nettverksinformasjon. Er mellomtenaren din konfigurert skikkeleg?'
   SponsorBlock Settings:
     'SponsorBlock API Url (Default is https://sponsor.ajay.app)': SponsorBlock-API-nettadresse
-      (forvalet er https://sponsor.ajay.app)
+      (standard er https://sponsor.ajay.app)
     Enable SponsorBlock: Skru på SponsorBlock
     SponsorBlock Settings: SponsorBlock-innstillingar
     Notify when sponsor segment is skipped: Gi beskjed når sponsordelen blir hoppa
       over
+    Skip Options:
+      Skip Option: Alternativ for å hoppe over
+      Auto Skip: Hopp over automatisk
+      Show In Seek Bar: Vis i søkefelt
+      Prompt To Skip: Spør om å hoppe over
+      Do Nothing: Ikkje gjer noko
+    Category Color: Kategorifarge
   External Player Settings:
     External Player Settings: Innstillingar for ekstern avspelar
     Custom External Player Executable: Eigendefinert køyrbar fil for ekstern avspelar
     Custom External Player Arguments: Eigendefinerte argument for ekstern avspelar
     External Player: Ekstern avspelar
+    Ignore Unsupported Action Warnings: Ignorer handlingvarslar som ikkje støttast
+    Players:
+      None:
+        Name: Ingen
+  Experimental Settings:
+    Replace HTTP Cache: Erstatt HTTP-hurtiglager
+    Experimental Settings: Eksperimentelle innstillingar
+    Warning: Desse innstillingane er eksperimentelle, og dei kan forårsake krasjar
+      mens dei er aktivert. Det anbefalast å ta tryggleikskopiar. Bruk på eiget ansvar.
+  Download Settings:
+    Download Settings: Nedlastinginnstillingar
+    Choose Path: Vel bane
+    Download Behavior: Nedlastingåtferd
+    Ask Download Path: Spør om nedlastingbane
+    Open in web browser: Opne i nettlesar
+    Download in app: Last ned i program
+  Parental Control Settings:
+    Hide Search Bar: Skjul søkefelt
+    Hide Unsubscribe Button: Skjul knapp for oppheving av abonnement
+    Parental Control Settings: Foreldrekontrollinnstillingar
+    Show Family Friendly Only: Vis kun familevenleg
+  Password Dialog:
+    Enter Password To Unlock: Skriv inn passord for å låse opp innstillingar
+    Password: Passord
+    Unlock: Lås opp
+    Password Incorrect: Feil passord
+  Password Settings:
+    Set Password To Prevent Access: Angi eit passord for å forhindre tilgang til innstillingane
+    Password Settings: Passordinnstillingar
+    Set Password: Angi passord
+    Remove Password: Fjern passord
 About:
   #On About page
   About: 'Om'
@@ -358,7 +451,7 @@ Profile:
   Profile Preview: 'Forhandsvising av profil'
   Create Profile: 'Lag profil'
   Update Profile: 'Oppdater profil'
-  Make Default Profile: 'Angi som forvalt profil'
+  Make Default Profile: 'Angi som standardprofil'
   Delete Profile: 'Fjern profil'
   Are you sure you want to delete this profile?: 'Er du sikker på at du vil fjerne
     denne profilet?'
@@ -367,10 +460,10 @@ Profile:
   Your profile name cannot be empty: 'Profilnamnet ditt kan ikkje vere tomt'
   Profile has been created: 'Profilet har blitt laga'
   Profile has been updated: 'Profilet har blitt oppdatert'
-  Your default profile has been set to {profile}: 'Ditt forvalte profil har blitt
-    satt til {profile}'
+  Your default profile has been set to {profile}: 'Ditt standardprofil har blitt satt
+    til {profile}'
   Removed {profile} from your profiles: 'Fjerna {profile} frå profila dine'
-  Your default profile has been changed to your primary profile: 'Ditt forvalte profil
+  Your default profile has been changed to your primary profile: 'Ditt standardprofil
     har blitt endra til ditt hovudprofil'
   '{profile} is now the active profile': '{profile} er no det aktive profilet'
   Subscription List: 'Abonnementliste'
@@ -507,6 +600,7 @@ Video:
     Years: 'År'
     Ago: 'Sidan'
     Upcoming: 'Har premiere på'
+    In less than a minute: Om mindre enn eit minutt
   Published on: 'Publisert på'
   Streamed on: 'Strauma på'
   Started streaming on: 'Begynte å straume på'
@@ -520,6 +614,8 @@ Video:
     sponsor: sponsor
     music offtopic: musikk (utanfor tema)
     self-promotion: eigenpromotering
+    recap: Oppsummering
+    filler: Fyllstoff
   Skipped segment: Overhoppa del
   External Player:
     video: video
@@ -530,6 +626,18 @@ Video:
     Unsupported Actions:
       opening playlists: Opner spelelister
       setting a playback rate: set ein avspelingshastigheit
+  Premieres on: Har premiere
+  Stats:
+    Volume: Lydstyrke
+    Bandwidth: Bandbreidde
+    Player Dimensions: Avspelarstorleik
+    Bitrate: Bithastigheit
+    Resolution: Oppløysing
+    Buffered: Mellomlagra
+  Show Super Chat Comment: Vis super-chat-kommentar
+  Premieres: Premiere
+  Scroll to Bottom: Rull til botn
+  Upcoming: Komande
 Videos:
   #& Sort By
   Sort By:
@@ -583,6 +691,7 @@ Share:
     utklippstavle'
   YouTube Channel URL copied to clipboard: 'YouTube-kanalnettadresse kopiert til utklippstavle'
 
+  Share Channel: Del kanal
 Mini Player: 'Miniavspelar'
 Comments:
   Comments: 'Kommentarar'
@@ -605,6 +714,12 @@ Comments:
   Load More Comments: 'Last inn fleire kommentarar'
   No more comments available: 'Ingen fleire kommentarar tilgjengeleg'
   Show More Replies: Vis fleire svar
+  Pinned by: Festa av
+  And others: og andre
+  From {channelName}: frå {channelName}
+  Member: Medlem
+  Hearted: Likt
+  View {replyCount} replies: Vis {replyCount} svar
 Up Next: 'Neste'
 
 #Tooltips
@@ -617,7 +732,7 @@ Tooltips:
       problem, vil FreeTube prøve å automatisk bruke ditt ikkje-føretrekte API som
       ein tilbakefallingsmetode dersom det er aktivert.'
     Thumbnail Preference: 'Alle miniatyrbilete i FreeTube vil bli erstatta av eit
-      bilete av videoen i staden for forvalt miniatyrbiletet'
+      bilete av videoen i staden for standardminiatyrbiletet'
     Invidious Instance: 'Invidious-førekomsten som FreeTube vil kople til for API-kall.
       Fjern den gjeldene førekomsten for å sjå ei liste over offentlege førekomstar
       å velje mellom'
@@ -625,7 +740,7 @@ Tooltips:
       du ynskjer å vise. Ikkje alle land som visast støttast av YouTube.'
   Player Settings:
     Force Local Backend for Legacy Formats: 'Fungerer berre med Invidious-API-et som
-      forval. Når det er påslått, vil det lokale API-et køyre og bruke dei forelda
+      standard. Når det er påslått, vil det lokale API-et køyre og bruke dei forelda
       formata som returnerast derifrå, i staden for dei som blir returnert av Invidious.
       Dette hjelper når videoar som blir returnert av Invidious, ikkje kan spelast
       av som følgje av regionsavgrensingar.'
@@ -635,16 +750,16 @@ Tooltips:
       kan spele høgare kvalitet. Forelda format er avgrensa til maks 720p, men bruker
       mindre bandbreidde. Lydformat er berre for lydstraumar.'
   Subscription Settings:
-    Fetch Feeds from RSS: 'Bruk RSS i staden for FreeTube sin forvalte metode for
-      innhenting av din abonnementsstraum. RSS er raskaren og forhindrar IP-blokkering,
-      men manglar noko informasjon som videovarigheit og sanntidsstatus.'
+    Fetch Feeds from RSS: 'Bruk RSS i staden for FreeTube sin standardmetode for innhenting
+      av din abonnementsstraum. RSS er raskaren og forhindrar IP-blokkering, men manglar
+      noko informasjon som videovarigheit og sanntidsstatus.'
 
 # Toast Messages
   Privacy Settings:
     Remove Video Meta Files: Viss denne innstillinga er på, vil FreeTube automatisk
       slette metadata generert under videoavspeling når du lukker avspelingsida.
   External Player Settings:
-    DefaultCustomArgumentsTemplate: "(Forval: '{defaultCustomArguments}')"
+    DefaultCustomArgumentsTemplate: "(Standard: '{defaultCustomArguments}')"
 Local API Error (Click to copy): 'Lokal API-feil (Klikk her for å kopiere)'
 Invidious API Error (Click to copy): 'Invidious-API-feil (Klikk her for å kopiere)'
 Falling back to Invidious API: 'Faller tilbake til Invidious-API-et'
@@ -683,3 +798,29 @@ Search Bar:
 Are you sure you want to open this link?: Er du sikker på at du vil opne denne lenka?
 New Window: Nytt Vindauga
 Preferences: Innstillingar
+Channels:
+  Channels: Kanalar
+  Title: Kanalliste
+  Search bar placeholder: Søk etter kanalar
+  Count: Fant {number} kanal(ar).
+  Empty: Kanallista di er tom.
+  Unsubscribed: '{channelName} blei fjerna frå dine abonnement'
+  Unsubscribe Prompt: Er du sikker på at du vil avslutte abonnementet på "{channelName}"?
+  Unsubscribe: Opphev abonnement
+Screenshot Success: Lagra skjermbilete som "{filePath}"
+Age Restricted:
+  This {videoOrPlaylist} is age restricted: Denne {videoOrPlaylist} er alderavgrensa
+  Type:
+    Video: Video
+    Channel: Kanal
+Screenshot Error: Skjermbilete feila. {error}
+Downloading has completed: Nedlastinga av "{videoTitle}" er fullført
+Ok: OK
+Clipboard:
+  Cannot access clipboard without a secure connection: Får ikkje tilgang til utklipptavla
+    utan ei sikker forbinding
+  Copy failed: Kopiering til utklipptavle feila
+Chapters:
+  Chapters: Kapittel
+Starting download: Starter nedlastinga av "{videoTitle}"
+Downloading failed: Det oppstod eit problem under nedlastinga av "{videoTitle}"

From a95314237776aa596c958c367c08f055ee715734 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 15 Jan 2023 02:03:16 +0100
Subject: [PATCH 270/301] Import store modules with ES6 imports instead of
 dynamically (#3064)

---
 src/renderer/store/modules/index.js | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/renderer/store/modules/index.js b/src/renderer/store/modules/index.js
index 33063f6f3990..d556d9571d6e 100644
--- a/src/renderer/store/modules/index.js
+++ b/src/renderer/store/modules/index.js
@@ -1,14 +1,22 @@
 /**
  * The file enables `@/store/index.js` to import all vuex modules
- * in a one-shot manner. There should not be any reason to edit this file.
+ * in a one-shot manner.
  */
 
-const files = require.context('.', false, /\.js$/)
-const modules = {}
+import history from './history'
+import invidious from './invidious'
+import playlists from './playlists'
+import profiles from './profiles'
+import settings from './settings'
+import subscriptions from './subscriptions'
+import utils from './utils'
 
-files.keys().forEach(key => {
-  if (key === './index.js') return
-  modules[key.replaceAll(/(\.\/|\.js)/g, '')] = files(key).default
-})
-
-export default modules
+export default {
+  history,
+  invidious,
+  playlists,
+  profiles,
+  settings,
+  subscriptions,
+  utils
+}

From 3d6d379b6bbcd4811f8d4ed6519b7ee094d4ad04 Mon Sep 17 00:00:00 2001
From: Sandyran <sandyran@protonmail.com>
Date: Sun, 15 Jan 2023 01:34:12 +0000
Subject: [PATCH 271/301] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 89.8% (592 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/nb_NO/
---
 static/locales/nb_NO.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/static/locales/nb_NO.yaml b/static/locales/nb_NO.yaml
index eff27360f966..22fa11df95d9 100644
--- a/static/locales/nb_NO.yaml
+++ b/static/locales/nb_NO.yaml
@@ -402,6 +402,8 @@ Settings:
     Hide Sharing Actions: Skjul delingshandlinger
     Hide Upcoming Premieres: Skjul kommende premièrer
     Hide Video Description: Skjul videobeskrivelse
+    Display Titles Without Excessive Capitalisation: Vis titler uten overdrevet bruk
+      av store bokstaver
   The app needs to restart for changes to take effect. Restart and apply change?: Start
     programmet på ny for å ta i bruk endringene?
   SponsorBlock Settings:
@@ -665,6 +667,7 @@ Video:
   Scroll to Bottom: Rull til bunnen
   Premieres on: Har première
   Premieres: Première
+  Upcoming: Kommende
 Videos:
   #& Sort By
   Sort By:

From 7be8c123e7594a661bccf22c2ea5eba754554323 Mon Sep 17 00:00:00 2001
From: Sandyran <sandyran@protonmail.com>
Date: Sun, 15 Jan 2023 01:19:03 +0000
Subject: [PATCH 272/301] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 95.4% (629 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/nn/
---
 static/locales/nn.yaml | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/static/locales/nn.yaml b/static/locales/nn.yaml
index 4c2b262ed41a..2020c36aa122 100644
--- a/static/locales/nn.yaml
+++ b/static/locales/nn.yaml
@@ -179,7 +179,7 @@ Settings:
       Light: 'Lys'
       Dracula: 'Dracula'
       System Default: Systemstandard
-      Catppuccin Mocha: ''
+      Catppuccin Mocha: 'Catppuccin-mokka'
     Main Color Theme:
       Main Color Theme: 'Hovudfargetema'
       Red: 'Raud'
@@ -205,6 +205,20 @@ Settings:
       Dracula Purple: 'Dracula Lilla'
       Dracula Red: 'Dracula Raud'
       Dracula Yellow: 'Dracula Gul'
+      Catppuccin Mocha Mauve: Catppuccin-mokkalilla
+      Catppuccin Mocha Red: Catppuccin-mokkarød
+      Catppuccin Mocha Maroon: Catppuccin-mokkakastanjebrun
+      Catppuccin Mocha Peach: Catppuccin-mokkafersken
+      Catppuccin Mocha Green: Catppuccin-mokkagrøn
+      Catppuccin Mocha Teal: Catppuccin-mokkablågrøn
+      Catppuccin Mocha Sky: Catppuccin-mokkahimmelblå
+      Catppuccin Mocha Flamingo: Catppuccin-mokka-flamingo
+      Catppuccin Mocha Rosewater: Catppuccin-mokkarosevann
+      Catppuccin Mocha Pink: Catppuccin-mokkarosa
+      Catppuccin Mocha Yellow: Catppuccin-mokkagul
+      Catppuccin Mocha Sapphire: Catppuccin-mokkasafir
+      Catppuccin Mocha Blue: Catppuccin-mokkablå
+      Catppuccin Mocha Lavender: Catppuccin-mokkalavendel
     Secondary Color Theme: 'Sekundærfargetema'
         #* Main Color Theme
     Hide Side Bar Labels: Skjul sidefeltetikettar
@@ -251,6 +265,11 @@ Settings:
       Folder Button: Vel mappe
       Quality Label: Skjermbiletekvalitet
       File Name Label: Filnamnmøster
+    Fast-Forward / Rewind Interval: Intervall for framover- og bakoverspoling
+    Skip by Scrolling Over Video Player: Hopp over ved å blad over videoavspelaren
+    Scroll Playback Rate Over Video Player: Blaavspelingshastigheit over videoavspelar
+    Video Playback Rate Interval: Intervall for videoavspelinghastigheit
+    Enter Fullscreen on Display Rotate: Bytt til fullskjerm ved skjermrotasjon
   Privacy Settings:
     Privacy Settings: 'Personvernsinnstillingar'
     Remember History: 'Husk historikk'
@@ -824,3 +843,9 @@ Chapters:
   Chapters: Kapittel
 Starting download: Starter nedlastinga av "{videoTitle}"
 Downloading failed: Det oppstod eit problem under nedlastinga av "{videoTitle}"
+Default Invidious instance has been cleared: Standard-Invidious-førekomst har blitt
+  tilbakestilt
+Default Invidious instance has been set to {instance}: Standard-Invidious-førekomst
+  har blitt satt til {instance}
+External link opening has been disabled in the general settings: Opening av eksterne
+  lenker har blitt deaktivert i innstillingane

From 523235f74c49d5bc2d2d447985ed07ef8dd9f2b0 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 15 Jan 2023 11:43:29 +0100
Subject: [PATCH 273/301] Add a formatNumber helper and other i18n cleanup
 (#3055)

* Add a formatNumber helper and other i18n cleanup

* Fix import order
---
 .../ft-list-channel/ft-list-channel.js           | 11 ++++-------
 .../components/ft-list-video/ft-list-video.js    | 10 +++-------
 .../components/playlist-info/playlist-info.js    | 10 +++-------
 .../watch-video-info/watch-video-info.js         | 16 ++++++----------
 src/renderer/helpers/utils.js                    |  4 ++++
 src/renderer/views/Channel/Channel.js            |  9 ++-------
 src/renderer/views/Playlist/Playlist.js          |  3 +--
 src/renderer/views/Watch/Watch.js                |  5 +++--
 8 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/src/renderer/components/ft-list-channel/ft-list-channel.js b/src/renderer/components/ft-list-channel/ft-list-channel.js
index 4ea0bec01220..09e33e2fe5b2 100644
--- a/src/renderer/components/ft-list-channel/ft-list-channel.js
+++ b/src/renderer/components/ft-list-channel/ft-list-channel.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
-import i18n from '../../i18n/index'
 import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
+import { formatNumber } from '../../helpers/utils'
 
 export default Vue.extend({
   name: 'FtListChannel',
@@ -35,9 +35,6 @@ export default Vue.extend({
     },
     hideChannelSubscriptions: function () {
       return this.$store.getters.getHideChannelSubscriptions
-    },
-    currentLocale: function () {
-      return i18n.locale.replace('_', '-')
     }
   },
   mounted: function () {
@@ -65,7 +62,7 @@ export default Vue.extend({
       if (this.data.videos === null) {
         this.videoCount = 0
       } else {
-        this.videoCount = Intl.NumberFormat(this.currentLocale).format(this.data.videos)
+        this.videoCount = formatNumber(this.data.videos)
       }
 
       if (this.data.handle) {
@@ -86,9 +83,9 @@ export default Vue.extend({
       if (this.hideChannelSubscriptions) {
         this.subscriberCount = null
       } else {
-        this.subscriberCount = Intl.NumberFormat(this.currentLocale).format(this.data.subCount)
+        this.subscriberCount = formatNumber(this.data.subCount)
       }
-      this.videoCount = Intl.NumberFormat(this.currentLocale).format(this.data.videoCount)
+      this.videoCount = formatNumber(this.data.videoCount)
       this.description = this.data.description
     }
   }
diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js
index 5f8042769000..40b12e9ba1d3 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.js
+++ b/src/renderer/components/ft-list-video/ft-list-video.js
@@ -1,15 +1,14 @@
 import Vue from 'vue'
 import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
 import { mapActions } from 'vuex'
-import i18n from '../../i18n/index'
 import {
   copyToClipboard,
   formatDurationAsTimestamp,
+  formatNumber,
   openExternalLink,
   showToast,
   toLocalePublicationString,
-  toDistractionFreeTitle,
-
+  toDistractionFreeTitle
 } from '../../helpers/utils'
 
 export default Vue.extend({
@@ -282,9 +281,6 @@ export default Vue.extend({
       return this.$store.getters.getSaveWatchedProgress
     },
 
-    currentLocale: function () {
-      return i18n.locale.replace('_', '-')
-    },
     showDistractionFreeTitles: function () {
       return this.$store.getters.getShowDistractionFreeTitles
     },
@@ -406,7 +402,7 @@ export default Vue.extend({
       if (this.hideVideoViews) {
         this.hideViews = true
       } else if (typeof (this.data.viewCount) !== 'undefined' && this.data.viewCount !== null) {
-        this.parsedViewCount = Intl.NumberFormat(this.currentLocale).format(this.data.viewCount)
+        this.parsedViewCount = formatNumber(this.data.viewCount)
       } else if (typeof (this.data.viewCountText) !== 'undefined') {
         this.parsedViewCount = this.data.viewCountText.replace(' views', '')
       } else {
diff --git a/src/renderer/components/playlist-info/playlist-info.js b/src/renderer/components/playlist-info/playlist-info.js
index a29d96b8ec11..bf421ae1f073 100644
--- a/src/renderer/components/playlist-info/playlist-info.js
+++ b/src/renderer/components/playlist-info/playlist-info.js
@@ -1,7 +1,6 @@
 import Vue from 'vue'
 import FtListDropdown from '../ft-list-dropdown/ft-list-dropdown.vue'
-import i18n from '../../i18n/index'
-import { copyToClipboard, openExternalLink } from '../../helpers/utils'
+import { copyToClipboard, formatNumber, openExternalLink } from '../../helpers/utils'
 
 export default Vue.extend({
   name: 'PlaylistInfo',
@@ -76,9 +75,6 @@ export default Vue.extend({
         default:
           return `https://i.ytimg.com/vi/${this.firstVideoId}/mqdefault.jpg`
       }
-    },
-    currentLocale: function () {
-      return i18n.locale.replace('_', '-')
     }
   },
   mounted: function () {
@@ -94,11 +90,11 @@ export default Vue.extend({
 
     // Causes errors if not put inside of a check
     if (typeof (this.data.viewCount) !== 'undefined' && !isNaN(this.data.viewCount)) {
-      this.viewCount = this.hideViews ? null : Intl.NumberFormat(this.currentLocale).format(this.data.viewCount)
+      this.viewCount = this.hideViews ? null : formatNumber(this.data.viewCount)
     }
 
     if (typeof (this.data.videoCount) !== 'undefined' && !isNaN(this.data.videoCount)) {
-      this.videoCount = Intl.NumberFormat(this.currentLocale).format(this.data.videoCount)
+      this.videoCount = formatNumber(this.data.videoCount)
     }
 
     this.lastUpdated = this.data.lastUpdated
diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js
index a1c10f4f16f7..44ac81aa82ab 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.js
+++ b/src/renderer/components/watch-video-info/watch-video-info.js
@@ -5,8 +5,7 @@ import FtButton from '../ft-button/ft-button.vue'
 import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
 import FtShareButton from '../ft-share-button/ft-share-button.vue'
 import { MAIN_PROFILE_ID } from '../../../constants'
-import i18n from '../../i18n/index'
-import { openExternalLink, showToast } from '../../helpers/utils'
+import { formatNumber, openExternalLink, showToast } from '../../helpers/utils'
 
 export default Vue.extend({
   name: 'WatchVideoInfo',
@@ -133,7 +132,7 @@ export default Vue.extend({
     },
 
     currentLocale: function () {
-      return i18n.locale.replace('_', '-')
+      return this.$i18n.locale.replace('_', '-')
     },
 
     profileList: function () {
@@ -215,8 +214,7 @@ export default Vue.extend({
         return null
       }
 
-      const locale = this.currentLocale.replace('_', '-')
-      return this.likeCount.toLocaleString([locale, 'en'])
+      return formatNumber(this.likeCount)
     },
 
     parsedDislikeCount: function () {
@@ -224,8 +222,7 @@ export default Vue.extend({
         return null
       }
 
-      const locale = this.currentLocale.replace('_', '-')
-      return this.dislikeCount.toLocaleString([locale, 'en'])
+      return formatNumber(this.dislikeCount)
     },
 
     likePercentageRatio: function () {
@@ -236,7 +233,7 @@ export default Vue.extend({
       if (this.hideVideoViews) {
         return null
       }
-      return Intl.NumberFormat(this.currentLocale).format(this.viewCount) + ` ${this.$t('Video.Views').toLowerCase()}`
+      return formatNumber(this.viewCount) + ` ${this.$t('Video.Views').toLowerCase()}`
     },
 
     isSubscribed: function () {
@@ -261,8 +258,7 @@ export default Vue.extend({
 
     dateString() {
       const date = new Date(this.published)
-      const locale = this.currentLocale.replace('_', '-')
-      const localeDateString = new Intl.DateTimeFormat([locale, 'en'], { dateStyle: 'medium' }).format(date)
+      const localeDateString = new Intl.DateTimeFormat([this.currentLocale, 'en'], { dateStyle: 'medium' }).format(date)
       // replace spaces with no break spaces to make the date act as a single entity while wrapping
       return `${localeDateString}`.replaceAll(' ', '\u00A0')
     },
diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index e759cf3ce85f..506389761a28 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -606,3 +606,7 @@ export function toDistractionFreeTitle(title, minUpperCase = 3) {
   const reg = RegExp(`[\\p{Lu}|']{${minUpperCase},}`, 'ug')
   return title.replace(reg, x => capitalizedWord(x.toLowerCase()))
 }
+
+export function formatNumber(number, options = undefined) {
+  return Intl.NumberFormat([i18n.locale.replace('_', '-'), 'en'], options).format(number)
+}
diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index c740e2e28f1c..ecc5ed23cc75 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -14,8 +14,7 @@ import FtShareButton from '../../components/ft-share-button/ft-share-button.vue'
 import ytch from 'yt-channel-info'
 import autolinker from 'autolinker'
 import { MAIN_PROFILE_ID } from '../../../constants'
-import i18n from '../../i18n/index'
-import { copyToClipboard, showToast } from '../../helpers/utils'
+import { copyToClipboard, formatNumber, showToast } from '../../helpers/utils'
 import packageDetails from '../../../../package.json'
 import { invidiousAPICall, invidiousGetChannelInfo, youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 
@@ -143,15 +142,11 @@ export default Vue.extend({
       ]
     },
 
-    currentLocale: function () {
-      return i18n.locale.replace('_', '-')
-    },
-
     formattedSubCount: function () {
       if (this.hideChannelSubscriptions) {
         return null
       }
-      return Intl.NumberFormat(this.currentLocale).format(this.subCount)
+      return formatNumber(this.subCount)
     },
 
     showFetchMoreButton: function () {
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index f1ef1662a482..bba96d2ca109 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -6,7 +6,6 @@ import PlaylistInfo from '../../components/playlist-info/playlist-info.vue'
 import FtListVideoLazy from '../../components/ft-list-video-lazy/ft-list-video-lazy.vue'
 import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
 import FtButton from '../../components/ft-button/ft-button.vue'
-import i18n from '../../i18n/index'
 import { getLocalPlaylist, parseLocalPlaylistVideo } from '../../helpers/api/local'
 import { extractNumberFromString } from '../../helpers/utils'
 import { invidiousGetPlaylistInfo, youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
@@ -55,7 +54,7 @@ export default Vue.extend({
       return this.$store.getters.getCurrentInvidiousInstance
     },
     currentLocale: function () {
-      return i18n.locale.replace('_', '-')
+      return this.$i18n.locale.replace('_', '-')
     }
   },
   watch: {
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 29523610ffa5..4857448540d4 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -17,6 +17,7 @@ import {
   copyToClipboard,
   extractNumberFromString,
   formatDurationAsTimestamp,
+  formatNumber,
   getFormatsFromHLSManifest,
   getUserDataPath,
   showToast
@@ -372,9 +373,9 @@ export default Vue.extend({
 
           if (!isNaN(subCount)) {
             if (subCount >= 10000) {
-              this.channelSubscriptionCountText = Intl.NumberFormat([this.currentLocale, 'en'], { notation: 'compact' }).format(subCount)
+              this.channelSubscriptionCountText = formatNumber(subCount, { notation: 'compact' })
             } else {
-              this.channelSubscriptionCountText = Intl.NumberFormat([this.currentLocale, 'en']).format(subCount)
+              this.channelSubscriptionCountText = formatNumber(subCount)
             }
           } else {
             this.channelSubscriptionCountText = ''

From 8db8ca2992711285309d83d3df30b9953ae2ebb9 Mon Sep 17 00:00:00 2001
From: The Cats <philosoph@snopyta.org>
Date: Sun, 15 Jan 2023 17:00:22 +0000
Subject: [PATCH 274/301] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pt_BR/
---
 static/locales/pt-BR.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/locales/pt-BR.yaml b/static/locales/pt-BR.yaml
index 2a53ea0f3eaa..d018b9c4f5ab 100644
--- a/static/locales/pt-BR.yaml
+++ b/static/locales/pt-BR.yaml
@@ -697,6 +697,7 @@ Video:
   Premieres: Estreia
   Scroll to Bottom: Rolar para o final
   Show Super Chat Comment: Mostrar Comentários do Super Chat
+  Upcoming: Em breve
 Videos:
   #& Sort By
   Sort By:

From 458dd62ba081ef99a5953f8ef81a05d25e1f51b6 Mon Sep 17 00:00:00 2001
From: Sandyran <sandyran@protonmail.com>
Date: Mon, 16 Jan 2023 08:49:18 +0000
Subject: [PATCH 275/301] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 97.1% (640 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/nn/
---
 static/locales/nn.yaml | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/static/locales/nn.yaml b/static/locales/nn.yaml
index 2020c36aa122..7f59e34c9864 100644
--- a/static/locales/nn.yaml
+++ b/static/locales/nn.yaml
@@ -270,14 +270,15 @@ Settings:
     Scroll Playback Rate Over Video Player: Blaavspelingshastigheit over videoavspelar
     Video Playback Rate Interval: Intervall for videoavspelinghastigheit
     Enter Fullscreen on Display Rotate: Bytt til fullskjerm ved skjermrotasjon
+    Max Video Playback Rate: Maksimal videoavspelinghastigheit
   Privacy Settings:
     Privacy Settings: 'Personvernsinnstillingar'
     Remember History: 'Husk historikk'
     Save Watched Progress: 'Lagre framgangsdrift'
-    Clear Search Cache: 'Slett søkebuffer'
+    Clear Search Cache: 'Slett søkehurtiglager'
     Are you sure you want to clear out your search cache?: 'Er du sikker på at du
-      vil slette søkebufferen?'
-    Search cache has been cleared: 'Søkebufferen har blitt sletta'
+      vil slette søkehurtiglageret?'
+    Search cache has been cleared: 'Søkehurtiglageret har blitt tømt'
     Remove Watch History: 'Slett visingshistorikk'
     Are you sure you want to remove your entire watch history?: 'Er du sikker på at
       du vil fjerne heile visingshistorikken din?'
@@ -369,7 +370,7 @@ Settings:
     Enable Tor / Proxy: 'Skru på Tor/mellomtenar'
     Proxy Protocol: 'Mellomtenarprotokoll'
     Proxy Host: 'Mellomtenarvert'
-    Proxy Port Number: 'Mellomtenar-portnummer'
+    Proxy Port Number: 'Mellomtenarportnummer'
     Clicking on Test Proxy will send a request to: 'Viss du klikker på "Test mellomtenar"
       sender me ein førespurnad til'
     Test Proxy: 'Test mellomtenar'
@@ -643,8 +644,10 @@ Video:
     OpeningTemplate: Opner {videoOrPlaylist} om {externalPlayer} ...
     OpenInTemplate: Opne i {externalPlayer}
     Unsupported Actions:
-      opening playlists: Opner spelelister
+      opening playlists: opner spelelister
       setting a playback rate: set ein avspelingshastigheit
+      shuffling playlists: sorterer spelelister i tilfeldig rekkefølgje
+      looping playlists: gjentar spelelister
   Premieres on: Har premiere
   Stats:
     Volume: Lydstyrke
@@ -652,7 +655,9 @@ Video:
     Player Dimensions: Avspelarstorleik
     Bitrate: Bithastigheit
     Resolution: Oppløysing
-    Buffered: Mellomlagra
+    Buffered: Hurtiglagra
+    Video ID: Video-ID
+    Mimetype: Medietype
   Show Super Chat Comment: Vis super-chat-kommentar
   Premieres: Premiere
   Scroll to Bottom: Rull til botn
@@ -752,11 +757,12 @@ Tooltips:
       ein tilbakefallingsmetode dersom det er aktivert.'
     Thumbnail Preference: 'Alle miniatyrbilete i FreeTube vil bli erstatta av eit
       bilete av videoen i staden for standardminiatyrbiletet'
-    Invidious Instance: 'Invidious-førekomsten som FreeTube vil kople til for API-kall.
-      Fjern den gjeldene førekomsten for å sjå ei liste over offentlege førekomstar
-      å velje mellom'
+    Invidious Instance: 'Invidious-førekomsten som FreeTube vil kople til for API-kall.'
     Region for Trending: 'Trendsregionen lar deg enkelt velje kva lands populære videoar
       du ynskjer å vise. Ikkje alle land som visast støttast av YouTube.'
+    External Link Handling: "Vel kva FreeTube skal gjer, når ein trykker på ei lenke,\
+      \ som ikkje kan bli opna av FreeTube. \nFreeTube vil vanlegvis opne lenka i\
+      \ din standardnettlesar.\n"
   Player Settings:
     Force Local Backend for Legacy Formats: 'Fungerer berre med Invidious-API-et som
       standard. Når det er påslått, vil det lokale API-et køyre og bruke dei forelda
@@ -768,6 +774,7 @@ Tooltips:
     Default Video Format: 'Sett format som blir brukt når ein video spelast. DASH-format
       kan spele høgare kvalitet. Forelda format er avgrensa til maks 720p, men bruker
       mindre bandbreidde. Lydformat er berre for lydstraumar.'
+    Skip by Scrolling Over Video Player: Bla for å hoppe deg gjennom videoen i MPV-stil.
   Subscription Settings:
     Fetch Feeds from RSS: 'Bruk RSS i staden for FreeTube sin standardmetode for innhenting
       av din abonnementsstraum. RSS er raskaren og forhindrar IP-blokkering, men manglar
@@ -779,6 +786,10 @@ Tooltips:
       slette metadata generert under videoavspeling når du lukker avspelingsida.
   External Player Settings:
     DefaultCustomArgumentsTemplate: "(Standard: '{defaultCustomArguments}')"
+  Experimental Settings:
+    Replace HTTP Cache: Deaktiver Electrons diskbaserte HTTP-hurtiglager og aktiver
+      eit spesialtilpassa biletehurtiglager i minnet. Dette vil føre til ei auking
+      i minnebruk.
 Local API Error (Click to copy): 'Lokal API-feil (Klikk her for å kopiere)'
 Invidious API Error (Click to copy): 'Invidious-API-feil (Klikk her for å kopiere)'
 Falling back to Invidious API: 'Faller tilbake til Invidious-API-et'
@@ -841,6 +852,10 @@ Clipboard:
   Copy failed: Kopiering til utklipptavle feila
 Chapters:
   Chapters: Kapittel
+  'Chapters list hidden, current chapter: {chapterName}': 'Kapittelliste skjult. Gjeldande
+    kapittel: {chapterName}'
+  'Chapters list visible, current chapter: {chapterName}': 'Kapittelliste synleg.
+    Gjeldande kapittel: {chapterName}'
 Starting download: Starter nedlastinga av "{videoTitle}"
 Downloading failed: Det oppstod eit problem under nedlastinga av "{videoTitle}"
 Default Invidious instance has been cleared: Standard-Invidious-førekomst har blitt

From 27e926b87c9ee44ffd3d29ddc67e3aa42b850151 Mon Sep 17 00:00:00 2001
From: Austin Mckee <amazingatm101@gmail.com>
Date: Mon, 16 Jan 2023 22:03:09 +0000
Subject: [PATCH 276/301] Translated using Weblate (Spanish (Mexico))

Currently translated at 84.2% (555 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/es_MX/
---
 static/locales/es-MX.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/static/locales/es-MX.yaml b/static/locales/es-MX.yaml
index e193ba36940d..c885167f797b 100644
--- a/static/locales/es-MX.yaml
+++ b/static/locales/es-MX.yaml
@@ -77,6 +77,7 @@ Subscriptions:
   This profile has a large number of subscriptions.  Forcing RSS to avoid rate limiting: Este
     perfil tiene un gran número de suscripciones. Forzando RSS para evitar limitaciones
   Error Channels: Canales con errores
+  Empty Channels: Sus canales suscritos no tienen ningún video actualmente.
 Trending:
   Trending: 'Tendencias'
   Default: Predeterminado
@@ -830,3 +831,7 @@ Playing Next Video Interval: El próximo video se abrirá inmediatamente. Haga c
   segundos. Haga clic aquí para cancelar.
 New Window: Nueva ventana
 Preferences: Preferencias
+Channels:
+  Channels: Canales
+  Title: Lista de Canales
+  Search bar placeholder: Buscar Canales

From 5b701dd8702543504fecf1af9a31b67b9b1e66cd Mon Sep 17 00:00:00 2001
From: Sandyran <sandyran@protonmail.com>
Date: Mon, 16 Jan 2023 21:13:05 +0000
Subject: [PATCH 277/301] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 98.7% (651 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/nn/
---
 static/locales/nn.yaml | 43 ++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/static/locales/nn.yaml b/static/locales/nn.yaml
index 7f59e34c9864..33de38f7a3a3 100644
--- a/static/locales/nn.yaml
+++ b/static/locales/nn.yaml
@@ -225,7 +225,7 @@ Settings:
     Hide FreeTube Header Logo: Skjul FreeTube-tittellogo
   Player Settings:
     Player Settings: 'Videoavspelingsinnstillingar'
-    Force Local Backend for Legacy Formats: 'Påtving lokal bakende for forelda format'
+    Force Local Backend for Legacy Formats: 'Påtving lokal bakende for utdaterte format'
     Play Next Video: 'Spel av neste video'
     Turn on Subtitles by Default: 'Slå på undertekst som standard'
     Autoplay Videos: 'Spel av videoar automatisk'
@@ -237,7 +237,7 @@ Settings:
     Default Video Format:
       Default Video Format: 'Videoformat'
       Dash Formats: 'DASH-format'
-      Legacy Formats: 'Eldre format'
+      Legacy Formats: 'Utdaterte format'
       Audio Formats: 'Lydformat'
     Default Quality:
       Default Quality: 'Kvalitetsinnstilling'
@@ -265,6 +265,12 @@ Settings:
       Folder Button: Vel mappe
       Quality Label: Skjermbiletekvalitet
       File Name Label: Filnamnmøster
+      File Name Tooltip: Du kan bruke variablane nedanfor. %Y for år, med fire siffer.
+        %M for månad, med to siffer. %D for dag, med to siffer. %H for time, med to
+        siffer. %N for minutt, med to siffer. %S for sekund, med to siffer. %T for
+        millisekund, med tre siffer. %s for videosekund. %t for videomillisekund,
+        med tre siffer. %i for Video-ID. Du kan òg bruke "\" eller "/" for å lage
+        undermapper.
     Fast-Forward / Rewind Interval: Intervall for framover- og bakoverspoling
     Skip by Scrolling Over Video Player: Hopp over ved å blad over videoavspelaren
     Scroll Playback Rate Over Video Player: Blaavspelingshastigheit over videoavspelar
@@ -272,7 +278,7 @@ Settings:
     Enter Fullscreen on Display Rotate: Bytt til fullskjerm ved skjermrotasjon
     Max Video Playback Rate: Maksimal videoavspelinghastigheit
   Privacy Settings:
-    Privacy Settings: 'Personvernsinnstillingar'
+    Privacy Settings: 'Personverninnstillingar'
     Remember History: 'Husk historikk'
     Save Watched Progress: 'Lagre framgangsdrift'
     Clear Search Cache: 'Slett søkehurtiglager'
@@ -291,11 +297,11 @@ Settings:
   Subscription Settings:
     Subscription Settings: 'Abonnementinnstillingar'
     Hide Videos on Watch: 'Skjul sette videoar'
-    Fetch Feeds from RSS: 'Hent informasjonskanalar frå RSS'
+    Fetch Feeds from RSS: 'Hent informasjonkanalar frå RSS'
     Manage Subscriptions: 'Behandle abonnement'
     Fetch Automatically: Hent informasjonkanalar automatisk
   Distraction Free Settings:
-    Distraction Free Settings: 'Distraksjonsfri-instillingar'
+    Distraction Free Settings: '"Ikkje forstyrr"-innstillingar'
     Hide Video Views: 'Skjul videovisingar'
     Hide Video Likes And Dislikes: 'Skjul videogunst'
     Hide Channel Subscribers: 'Skjul kanalabonnement'
@@ -324,7 +330,7 @@ Settings:
     Import FreeTube: 'Importer FreeTube'
     Import YouTube: 'Importer YouTube'
     Import NewPipe: 'Importer NewPipe'
-    Check for Legacy Subscriptions: 'Sjå etter forelda abonnement'
+    Check for Legacy Subscriptions: 'Sjå etter utdaterte abonnement'
     Export Subscriptions: 'Eksporter abonnement'
     Export FreeTube: 'Eksporter FreeTube'
     Export YouTube: 'Eksporter YouTube'
@@ -628,12 +634,12 @@ Video:
 #& Videos
   translated from English: omsett frå engelsk
   Sponsor Block category:
-    outro: utgang
-    interaction: samhandling
-    intro: introduksjon
-    sponsor: sponsor
-    music offtopic: musikk (utanfor tema)
-    self-promotion: eigenpromotering
+    outro: Avslutting
+    interaction: Samhandling
+    intro: Introduksjon
+    sponsor: Sponsor
+    music offtopic: Musikk utanfor tema
+    self-promotion: Eigenpromotering
     recap: Oppsummering
     filler: Fyllstoff
   Skipped segment: Overhoppa del
@@ -648,6 +654,8 @@ Video:
       setting a playback rate: set ein avspelingshastigheit
       shuffling playlists: sorterer spelelister i tilfeldig rekkefølgje
       looping playlists: gjentar spelelister
+      starting video at offset: starter video ved punktet
+      reversing playlists: speler av spelelister baklengs
   Premieres on: Har premiere
   Stats:
     Volume: Lydstyrke
@@ -658,6 +666,9 @@ Video:
     Buffered: Hurtiglagra
     Video ID: Video-ID
     Mimetype: Medietype
+    Video statistics are not available for legacy videos: Videostatestikk er ikkje
+      tilgjengeleg for utdaterte videoar
+    Dropped / Total Frames: Redusert/total mengd bilete
   Show Super Chat Comment: Vis super-chat-kommentar
   Premieres: Premiere
   Scroll to Bottom: Rull til botn
@@ -691,7 +702,7 @@ Toggle Theatre Mode: 'Veksle teatermodus'
 Change Format:
   Change Media Formats: 'Endre videoformat'
   Use Dash Formats: 'Bruk DASH-format'
-  Use Legacy Formats: 'Bruk forelda format'
+  Use Legacy Formats: 'Bruk utdaterte format'
   Use Audio Formats: 'Bruk lydformat'
   Dash formats are not available for this video: 'DASH-format er ikkje tilgjengeleg
     for denne videoen'
@@ -765,14 +776,14 @@ Tooltips:
       \ din standardnettlesar.\n"
   Player Settings:
     Force Local Backend for Legacy Formats: 'Fungerer berre med Invidious-API-et som
-      standard. Når det er påslått, vil det lokale API-et køyre og bruke dei forelda
+      standard. Når det er påslått, vil det lokale API-et køyre og bruke dei utdaterte
       formata som returnerast derifrå, i staden for dei som blir returnert av Invidious.
       Dette hjelper når videoar som blir returnert av Invidious, ikkje kan spelast
       av som følgje av regionsavgrensingar.'
     Proxy Videos Through Invidious: 'Koplar til Invidious for å servere videoar i
       staden for å kople direkte til YouTube. Overstyrar API-innstillingar.'
     Default Video Format: 'Sett format som blir brukt når ein video spelast. DASH-format
-      kan spele høgare kvalitet. Forelda format er avgrensa til maks 720p, men bruker
+      kan spele høgare kvalitet. Utdaterte format er avgrensa til maks 720p, men bruker
       mindre bandbreidde. Lydformat er berre for lydstraumar.'
     Skip by Scrolling Over Video Player: Bla for å hoppe deg gjennom videoen i MPV-stil.
   Subscription Settings:
@@ -826,7 +837,7 @@ Hashtags have not yet been implemented, try again later: Emneknaggar er ikkje im
 Search Bar:
   Clear Input: Tøm inndata
 Are you sure you want to open this link?: Er du sikker på at du vil opne denne lenka?
-New Window: Nytt Vindauga
+New Window: Nytt vindauge
 Preferences: Innstillingar
 Channels:
   Channels: Kanalar

From 005b473ccd2a0882040574d047c7eaad9b843f8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Jan 2023 21:20:14 -0500
Subject: [PATCH 278/301] Bump prettier from 2.8.2 to 2.8.3 (#3085)

Bumps [prettier](https://github.com/prettier/prettier) from 2.8.2 to 2.8.3.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.8.2...2.8.3)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1081eff67d99..1702db81114c 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,7 @@
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.21",
     "postcss-scss": "^4.0.6",
-    "prettier": "^2.8.2",
+    "prettier": "^2.8.3",
     "rimraf": "^3.0.2",
     "sass": "^1.57.1",
     "sass-loader": "^13.2.0",
diff --git a/yarn.lock b/yarn.lock
index be8a57b3335b..81592ae98aab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7012,10 +7012,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-"prettier@^1.18.2 || ^2.0.0", prettier@^2.8.2:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.2.tgz#c4ea1b5b454d7c4b59966db2e06ed7eec5dfd160"
-  integrity sha512-BtRV9BcncDyI2tsuS19zzhzoxD8Dh8LiCx7j7tHzrkz8GFXAexeWFdi22mjE1d16dftH2qNaytVxqiRTGlMfpw==
+"prettier@^1.18.2 || ^2.0.0", prettier@^2.8.3:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.3.tgz#ab697b1d3dd46fb4626fbe2f543afe0cc98d8632"
+  integrity sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==
 
 pretty-error@^4.0.0:
   version "4.0.0"

From f69cc47aa94496372de55b51f7519dbd47bbd5af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Jan 2023 21:20:35 -0500
Subject: [PATCH 279/301] Bump marked from 4.2.5 to 4.2.12 (#3076)

Bumps [marked](https://github.com/markedjs/marked) from 4.2.5 to 4.2.12.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v4.2.5...v4.2.12)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1702db81114c..4d68654910bb 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "browserify-zlib": "^0.2.0",
     "electron-context-menu": "^3.6.1",
     "lodash.debounce": "^4.0.8",
-    "marked": "^4.2.5",
+    "marked": "^4.2.12",
     "nedb-promises": "^6.2.1",
     "process": "^0.11.10",
     "video.js": "7.20.3",
diff --git a/yarn.lock b/yarn.lock
index 81592ae98aab..1347fabb1e7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5913,10 +5913,10 @@ map-obj@^4.0.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
-marked@^4.2.5:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.5.tgz#979813dfc1252cc123a79b71b095759a32f42a5d"
-  integrity sha512-jPueVhumq7idETHkb203WDD4fMA3yV9emQ5vLwop58lu8bTclMghBWcYAavlDqIEMaisADinV1TooIFCfqOsYQ==
+marked@^4.2.12:
+  version "4.2.12"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz#d69a64e21d71b06250da995dcd065c11083bebb5"
+  integrity sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw==
 
 matcher@^3.0.0:
   version "3.0.0"

From 0a66a0f1e125f7e4539af87758ad3763f9a2a71b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Jan 2023 21:21:10 -0500
Subject: [PATCH 280/301] Bump eslint-plugin-vue from 9.8.0 to 9.9.0 (#3077)

Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 9.8.0 to 9.9.0.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v9.8.0...v9.9.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-vue
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 4d68654910bb..c095ca0d74e3 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-unicorn": "^45.0.2",
-    "eslint-plugin-vue": "^9.8.0",
+    "eslint-plugin-vue": "^9.9.0",
     "eslint-plugin-vuejs-accessibility": "^2.0.0",
     "html-webpack-plugin": "^5.3.2",
     "js-yaml": "^4.1.0",
diff --git a/yarn.lock b/yarn.lock
index 1347fabb1e7f..13ec303c23a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3914,10 +3914,10 @@ eslint-plugin-unicorn@^45.0.2:
     semver "^7.3.8"
     strip-indent "^3.0.0"
 
-eslint-plugin-vue@^9.8.0:
-  version "9.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.8.0.tgz#91de2aabbee8cdbef078ccd4f650a9ecfa445f4f"
-  integrity sha512-E/AXwcTzunyzM83C2QqDHxepMzvI2y6x+mmeYHbVDQlKFqmKYvRrhaVixEeeG27uI44p9oKDFiyCRw4XxgtfHA==
+eslint-plugin-vue@^9.9.0:
+  version "9.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.9.0.tgz#ac788ebccd2eb94d846a507df55da50693b80c91"
+  integrity sha512-YbubS7eK0J7DCf0U2LxvVP7LMfs6rC6UltihIgval3azO3gyDwEGVgsCMe1TmDiEkl6GdMKfRpaME6QxIYtzDQ==
   dependencies:
     eslint-utils "^3.0.0"
     natural-compare "^1.4.0"
@@ -6942,7 +6942,7 @@ postcss-scss@^4.0.2, postcss-scss@^4.0.6:
   resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.6.tgz#5d62a574b950a6ae12f2aa89b60d63d9e4432bfd"
   integrity sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==
 
-postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.6:
+postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9:
   version "6.0.11"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
   integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
@@ -6950,14 +6950,6 @@ postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.6:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
-  version "6.0.10"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
-  integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
-  dependencies:
-    cssesc "^3.0.0"
-    util-deprecate "^1.0.2"
-
 postcss-sorting@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-7.0.1.tgz#923b5268451cf2d93ebf8835e17a6537757049a5"

From b58444638e668a32f0e5b88f455d6191d18cde1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Jan 2023 21:22:33 -0500
Subject: [PATCH 281/301] Bump eslint-plugin-import from 2.26.0 to 2.27.4
 (#3081)

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.26.0 to 2.27.4.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.26.0...v2.27.4)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 266 ++++++++++++++++++++++++++++++---------------------
 2 files changed, 158 insertions(+), 110 deletions(-)

diff --git a/package.json b/package.json
index c095ca0d74e3..680868cd3fdf 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "eslint": "^8.31.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-import": "^2.27.4",
     "eslint-plugin-jsonc": "^2.6.0",
     "eslint-plugin-n": "^15.6.0",
     "eslint-plugin-prettier": "^4.2.1",
diff --git a/yarn.lock b/yarn.lock
index 13ec303c23a2..95da31919a92 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1950,15 +1950,15 @@ array-flatten@^2.1.2:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.1.4:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb"
-  integrity sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==
+array-includes@^3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
+  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.4"
-    es-abstract "^1.19.5"
-    get-intrinsic "^1.1.1"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
     is-string "^1.0.7"
 
 array-union@^2.1.0:
@@ -1966,14 +1966,24 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array.prototype.flat@^1.2.5:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b"
-  integrity sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==
+array.prototype.flat@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
+  integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+
+array.prototype.flatmap@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
+  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
     es-shim-unscopables "^1.0.0"
 
 arrify@^1.0.1:
@@ -3174,7 +3184,7 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-debug@2.6.9, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -3680,7 +3690,7 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5:
+es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.5:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.0.tgz#b2d526489cceca004588296334726329e0a6bfb6"
   integrity sha512-URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA==
@@ -3739,6 +3749,45 @@ es-abstract@^1.20.0:
     string.prototype.trimstart "^1.0.5"
     unbox-primitive "^1.0.2"
 
+es-abstract@^1.20.4:
+  version "1.21.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6"
+  integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    es-set-tostringtag "^2.0.1"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    function.prototype.name "^1.1.5"
+    get-intrinsic "^1.1.3"
+    get-symbol-description "^1.0.0"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
+    has "^1.0.3"
+    has-property-descriptors "^1.0.0"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.4"
+    is-array-buffer "^3.0.1"
+    is-callable "^1.2.7"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-typed-array "^1.1.10"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.2"
+    object-keys "^1.1.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.4.3"
+    safe-regex-test "^1.0.0"
+    string.prototype.trimend "^1.0.6"
+    string.prototype.trimstart "^1.0.6"
+    typed-array-length "^1.0.4"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.9"
+
 es-get-iterator@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz#9234c54aba713486d7ebde0220864af5e2b283f7"
@@ -3758,6 +3807,15 @@ es-module-lexer@^0.9.0:
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
   integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
+es-set-tostringtag@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8"
+  integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==
+  dependencies:
+    get-intrinsic "^1.1.3"
+    has "^1.0.3"
+    has-tostringtag "^1.0.0"
+
 es-shim-unscopables@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
@@ -3814,21 +3872,21 @@ eslint-config-standard@^17.0.0:
   resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz#fd5b6cf1dcf6ba8d29f200c461de2e19069888cf"
   integrity sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==
 
-eslint-import-resolver-node@^0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
-  integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
+eslint-import-resolver-node@^0.3.7:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
+  integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
   dependencies:
     debug "^3.2.7"
-    resolve "^1.20.0"
+    is-core-module "^2.11.0"
+    resolve "^1.22.1"
 
-eslint-module-utils@^2.7.3:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
-  integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
+eslint-module-utils@^2.7.4:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"
+  integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
   dependencies:
     debug "^3.2.7"
-    find-up "^2.1.0"
 
 eslint-plugin-es@^4.1.0:
   version "4.1.0"
@@ -3838,23 +3896,25 @@ eslint-plugin-es@^4.1.0:
     eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
-eslint-plugin-import@^2.26.0:
-  version "2.26.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
-  integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
+eslint-plugin-import@^2.27.4:
+  version "2.27.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.4.tgz#319c2f6f6580e1678d674a258ee5e981c10cc25b"
+  integrity sha512-Z1jVt1EGKia1X9CnBCkpAOhWy8FgQ7OmJ/IblEkT82yrFU/xJaxwujaTzLWqigewwynRQ9mmHfX9MtAfhxm0sA==
   dependencies:
-    array-includes "^3.1.4"
-    array.prototype.flat "^1.2.5"
-    debug "^2.6.9"
+    array-includes "^3.1.6"
+    array.prototype.flat "^1.3.1"
+    array.prototype.flatmap "^1.3.0"
+    debug "^3.2.7"
     doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.6"
-    eslint-module-utils "^2.7.3"
+    eslint-import-resolver-node "^0.3.7"
+    eslint-module-utils "^2.7.4"
     has "^1.0.3"
-    is-core-module "^2.8.1"
+    is-core-module "^2.11.0"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
-    object.values "^1.1.5"
-    resolve "^1.22.0"
+    object.values "^1.1.6"
+    resolve "^1.22.1"
+    semver "^6.3.0"
     tsconfig-paths "^3.14.1"
 
 eslint-plugin-jsonc@^2.6.0:
@@ -4310,13 +4370,6 @@ find-cache-dir@^3.3.2:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
-  dependencies:
-    locate-path "^2.0.0"
-
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -4622,7 +4675,7 @@ globals@^13.19.0:
   dependencies:
     type-fest "^0.20.2"
 
-globalthis@^1.0.1:
+globalthis@^1.0.1, globalthis@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
   integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
@@ -4741,6 +4794,11 @@ has-property-descriptors@^1.0.0:
   dependencies:
     get-intrinsic "^1.1.1"
 
+has-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
+  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+
 has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
@@ -5130,6 +5188,15 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
+internal-slot@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3"
+  integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==
+  dependencies:
+    get-intrinsic "^1.1.3"
+    has "^1.0.3"
+    side-channel "^1.0.4"
+
 interpret@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
@@ -5153,6 +5220,15 @@ is-arguments@^1.0.4, is-arguments@^1.1.0, is-arguments@^1.1.1:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-array-buffer@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.1.tgz#deb1db4fcae48308d54ef2442706c0393997052a"
+  integrity sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-typed-array "^1.1.10"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -5192,7 +5268,7 @@ is-builtin-module@^3.2.0:
   dependencies:
     builtin-modules "^3.3.0"
 
-is-callable@^1.1.3, is-callable@^1.2.6:
+is-callable@^1.1.3, is-callable@^1.2.6, is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
@@ -5209,27 +5285,13 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.11.0, is-core-module@^2.5.0:
+is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.9.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
   integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
   dependencies:
     has "^1.0.3"
 
-is-core-module@^2.8.1:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
-  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
-  dependencies:
-    has "^1.0.3"
-
-is-core-module@^2.9.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
-  integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
-  dependencies:
-    has "^1.0.3"
-
 is-date-object@^1.0.1, is-date-object@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
@@ -5796,14 +5858,6 @@ localforage@^1.9.0:
   dependencies:
     lie "3.1.1"
 
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -6382,14 +6436,14 @@ object.assign@^4.1.4:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.values@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
-  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
+object.values@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
+  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
@@ -6453,13 +6507,6 @@ p-cancelable@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
   integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
 
-p-limit@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
-  dependencies:
-    p-try "^1.0.0"
-
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -6474,13 +6521,6 @@ p-limit@^3.0.2:
   dependencies:
     yocto-queue "^0.1.0"
 
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
-  dependencies:
-    p-limit "^1.1.0"
-
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
@@ -6503,11 +6543,6 @@ p-retry@^4.5.0:
     "@types/retry" "0.12.0"
     retry "^0.13.1"
 
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
-
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -6587,11 +6622,6 @@ path-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
   integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
 
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -7431,7 +7461,7 @@ resolve-from@^5.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve@^1.1.4, resolve@^1.17.0, resolve@^1.22.1, resolve@^1.4.0:
+resolve@^1.1.4, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.4.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -7440,15 +7470,6 @@ resolve@^1.1.4, resolve@^1.17.0, resolve@^1.22.1, resolve@^1.4.0:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
-  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
-  dependencies:
-    is-core-module "^2.8.1"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
 responselike@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
@@ -8009,6 +8030,15 @@ string.prototype.trimend@^1.0.5:
     define-properties "^1.1.4"
     es-abstract "^1.19.5"
 
+string.prototype.trimend@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
+  integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
 string.prototype.trimstart@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
@@ -8018,6 +8048,15 @@ string.prototype.trimstart@^1.0.5:
     define-properties "^1.1.4"
     es-abstract "^1.19.5"
 
+string.prototype.trimstart@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
+  integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -8453,6 +8492,15 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typed-array-length@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
+  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    is-typed-array "^1.1.9"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -9002,7 +9050,7 @@ which-typed-array@^1.1.2:
     has-tostringtag "^1.0.0"
     is-typed-array "^1.1.9"
 
-which-typed-array@^1.1.8:
+which-typed-array@^1.1.8, which-typed-array@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
   integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==

From 59788a8b5585571e57aa4b0cebf174fcaa546c87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Jan 2023 21:23:23 -0500
Subject: [PATCH 282/301] Bump lefthook from 1.2.6 to 1.2.7 (#3078)

Bumps [lefthook](https://github.com/evilmartians/lefthook) from 1.2.6 to 1.2.7.
- [Release notes](https://github.com/evilmartians/lefthook/releases)
- [Changelog](https://github.com/evilmartians/lefthook/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evilmartians/lefthook/compare/v1.2.6...v1.2.7)

---
updated-dependencies:
- dependency-name: lefthook
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |   2 +-
 yarn.lock    | 104 +++++++++++++++++++++++++--------------------------
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/package.json b/package.json
index 680868cd3fdf..b0af4f9bb80f 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "html-webpack-plugin": "^5.3.2",
     "js-yaml": "^4.1.0",
     "json-minimizer-webpack-plugin": "^4.0.0",
-    "lefthook": "^1.2.6",
+    "lefthook": "^1.2.7",
     "mini-css-extract-plugin": "^2.7.2",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.21",
diff --git a/yarn.lock b/yarn.lock
index 95da31919a92..2e198a54282a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5737,59 +5737,59 @@ lazy-val@^1.0.4, lazy-val@^1.0.5:
   resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d"
   integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==
 
-lefthook-darwin-arm64@1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.2.6.tgz#31f7c41e3028b9edf9a909ae2b4f903a5fff706b"
-  integrity sha512-RlSzms0h859l74Nlz8oj7ZKXUysO998WhpqABX0uKdsK6QOuDjAMFmwvGx2MzcO7z8SGSlqkgqay4nFULGtvhw==
-
-lefthook-darwin-x64@1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/lefthook-darwin-x64/-/lefthook-darwin-x64-1.2.6.tgz#98bbb033c183a1bad7a7ddb38a84531274561364"
-  integrity sha512-9aWcuaM69ypAJCpNbF2CyDXwwi8EwQj/vqrPrLh0Nis5kheyRuBAgNSVslEE99ZGGZViNPWPx9hARsWK0ZxQAQ==
-
-lefthook-freebsd-arm64@1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.2.6.tgz#c5654d3da6df38819d01753a93d2c3aa10b039c7"
-  integrity sha512-PaY/OreTfNrSQBTl7GuggAKFT0U5p9re0ryjDJMWlkGD3UZfRosnyg5ZRH3HOjBchx2iXDrAeJBfg7a45sIc+A==
-
-lefthook-freebsd-x64@1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.2.6.tgz#3221e11c17dfe8f22dad56cc8bc373ecbceeaa6c"
-  integrity sha512-Ex5ehsPmXThN2eyckHeB6AbKCmxgV2wl27U5p16NH3bzJyXpWPlq6Sg1j2wkx1xLYIrMFwxgy9JVuR4EzOB96w==
-
-lefthook-linux-arm64@1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/lefthook-linux-arm64/-/lefthook-linux-arm64-1.2.6.tgz#f097663b37b5d3d87bc7ce15e70982d2d08a0c35"
-  integrity sha512-CUdw7PIi14LVHmPUDeNHQAcExpcuXrUP6GfnWyf2uQ/5nFSrDwtF0tSCEAtgJgm8Wh38dt5Qyyaxoz4WoGGvZA==
-
-lefthook-linux-x64@1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/lefthook-linux-x64/-/lefthook-linux-x64-1.2.6.tgz#ecbcda500d41a746265d84f615017fe447bc0658"
-  integrity sha512-UXyn2qLKfUQgHipoTYnvHWNagOMOdqyj0oqpIbEuE98/+7AR9OrQF6t7mpL+KDA4IRO8Ba6CcS1nYNxpBKN8kw==
-
-lefthook-windows-arm64@1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/lefthook-windows-arm64/-/lefthook-windows-arm64-1.2.6.tgz#466d7691c71888b8e1ba6347210788e3f6243878"
-  integrity sha512-gAwVbWdSKixxsixnMxfCqYXZ0NNW5sP87evmTvY6hezsYRFqjEgKsxCB1kf/epjlkZPQcN1s81uOYQLy4WKe1g==
-
-lefthook-windows-x64@1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/lefthook-windows-x64/-/lefthook-windows-x64-1.2.6.tgz#85a019ec04355345c8a6941ad4eb497130642860"
-  integrity sha512-F0JCXgTBfyfCQ7HegVvGVsijWXd2J7LA4iY5fsBNV4stPRMXHnr8RGUbxViprmKudUjcuog1xuGjqNWja8rfNA==
-
-lefthook@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/lefthook/-/lefthook-1.2.6.tgz#9739a83cd21d89329339c73ad347002e0e86d550"
-  integrity sha512-vv3w6gDmFXID89wvrOGMHKbE47UmUVQN0aG4u2UMHGZ0rB8at7glMFnpuWT9361DciBz3lEFGYD4MK5APLoH2Q==
+lefthook-darwin-arm64@1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/lefthook-darwin-arm64/-/lefthook-darwin-arm64-1.2.7.tgz#b2789bd127a17d359be44489cc2ba0149a0f852d"
+  integrity sha512-ku+4wxcFJZC/Ey2AUAVo1+6LG1Pk1TglINuAv/1BuOHEJwTA/orb6RWDaRhGF2YyUVw0Y5hEgZolOBNrqGfC/Q==
+
+lefthook-darwin-x64@1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/lefthook-darwin-x64/-/lefthook-darwin-x64-1.2.7.tgz#8872767c7754ceaea9c338d2f53959ad553e4bfa"
+  integrity sha512-URkg0MEAJQ9lwVBFaEZxCz0iwMpiGicoeRwbBQIfcD1BKDdaK0hSG6FY18bvFcXHXqBgw8uxBEd3xvkpJTn6LA==
+
+lefthook-freebsd-arm64@1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/lefthook-freebsd-arm64/-/lefthook-freebsd-arm64-1.2.7.tgz#e1e798f27302660145cd2487e5959b411aca7bf1"
+  integrity sha512-FCUlH9Uv7PN2VYmovEqBED//w+fYJdp+akfNmp7bDTVxlRb+YjkQfIwFn7ombIrxsMtb4AnWuEhoZoNmAOpViA==
+
+lefthook-freebsd-x64@1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/lefthook-freebsd-x64/-/lefthook-freebsd-x64-1.2.7.tgz#ff4e5a5025d2d5e11af49ef0b10c14ac3848ea37"
+  integrity sha512-CNsan6wnbVRvPHJXjxtpd/5Ftyvw7z/UDr5PC1g82s5IV0nlRkm8DvN76mD+S6hUf1KStx/nYCvgHdZnKcCGwg==
+
+lefthook-linux-arm64@1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/lefthook-linux-arm64/-/lefthook-linux-arm64-1.2.7.tgz#ba48ddee21eb9108b44b122a412832427ee2c9a1"
+  integrity sha512-ciBM0lm1xDshDJfuwYLkkQMr58aO/8HBunpMGosGdyvBmKfWhUoNYlMM16ghNpi/dDNZHdarooPZmXAYwxlq9Q==
+
+lefthook-linux-x64@1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/lefthook-linux-x64/-/lefthook-linux-x64-1.2.7.tgz#4f55bc51f73e919500c52d9cd54ef2b9cd49d797"
+  integrity sha512-1VRWPZyddmJzrkOI+JXV0rV8vr2U+JShJLEyzTWs/b46aQxEfkq0VbiWtJ3mKb5OpCqu19W+1Xd2/ahhhT8f2g==
+
+lefthook-windows-arm64@1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/lefthook-windows-arm64/-/lefthook-windows-arm64-1.2.7.tgz#37c9834ed8973bc184bb67afc9d22f39e7a2d95a"
+  integrity sha512-ylIapeQ487IqHYvsCP9Pa1C2Q4np1A/xXgARC/l2E3jhGdZe71R54pTJK+v4HryITDRRT13yTdHJWKcGJRClfg==
+
+lefthook-windows-x64@1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/lefthook-windows-x64/-/lefthook-windows-x64-1.2.7.tgz#324f6ab6ac320548b21748c2d6fc105daac0627c"
+  integrity sha512-hQsq5lK6c4zLm8ScdGJFFG3QODsvaO68YA8jcSLhMngJVRwQ7XOl877udWD+WZ151EB4RY9rG+rKq9lYnwsbaA==
+
+lefthook@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/lefthook/-/lefthook-1.2.7.tgz#47d2f53e906a08ec218243929b70ea29e19048be"
+  integrity sha512-6QEeP78IAuonzH+D7p00sga6meePVUj5ap113x+uBKSpBDhgK6iVeeNE0D18L8oVJhNk00tDVAZV1AQAn80Low==
   optionalDependencies:
-    lefthook-darwin-arm64 "1.2.6"
-    lefthook-darwin-x64 "1.2.6"
-    lefthook-freebsd-arm64 "1.2.6"
-    lefthook-freebsd-x64 "1.2.6"
-    lefthook-linux-arm64 "1.2.6"
-    lefthook-linux-x64 "1.2.6"
-    lefthook-windows-arm64 "1.2.6"
-    lefthook-windows-x64 "1.2.6"
+    lefthook-darwin-arm64 "1.2.7"
+    lefthook-darwin-x64 "1.2.7"
+    lefthook-freebsd-arm64 "1.2.7"
+    lefthook-freebsd-x64 "1.2.7"
+    lefthook-linux-arm64 "1.2.7"
+    lefthook-linux-x64 "1.2.7"
+    lefthook-windows-arm64 "1.2.7"
+    lefthook-windows-x64 "1.2.7"
 
 levn@^0.4.1:
   version "0.4.1"

From 200bb88a72ee8dade4407e2ed6b87e31e490cb0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Jan 2023 05:41:03 +0000
Subject: [PATCH 283/301] Bump rimraf from 3.0.2 to 4.1.0 (#3088)

Bumps [rimraf](https://github.com/isaacs/rimraf) from 3.0.2 to 4.1.0.
- [Release notes](https://github.com/isaacs/rimraf/releases)
- [Changelog](https://github.com/isaacs/rimraf/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/rimraf/compare/v3.0.2...v4.1.0)

---
updated-dependencies:
- dependency-name: rimraf
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index b0af4f9bb80f..13961ccd02c7 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "postcss": "^8.4.21",
     "postcss-scss": "^4.0.6",
     "prettier": "^2.8.3",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.1.0",
     "sass": "^1.57.1",
     "sass-loader": "^13.2.0",
     "stylelint": "^14.16.1",
diff --git a/yarn.lock b/yarn.lock
index 2e198a54282a..091744763bd3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4603,7 +4603,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.1.0:
+glob@^7.1.0, glob@^7.1.3, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -4615,18 +4615,6 @@ glob@^7.1.0:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.3, glob@^7.1.6:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.2.tgz#29deb38e1ef90f132d5958abe9c3ee8e87f3c318"
-  integrity sha512-NzDgHDiJwKYByLrL5lONmQFpK/2G78SMMfo+E9CuGlX4IkvfKDsiQSNPwAYxEy+e6p7ZQ3uslSLlwlJcqezBmQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 global-agent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
@@ -7494,6 +7482,11 @@ rimraf@^3.0.0, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rimraf@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-4.1.0.tgz#c503e3b75b0da4e276846b45cace9a93d16a4903"
+  integrity sha512-ZJdkUR5/dRrRJHdcSKJLrpRn6tVjl9ALxd4yrTCxFsMpjQNzwHF6GLqMsuEzEYIXxHlFPDSk21Vr8VPuFBEz0g==
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"

From fb1a62b6f623f9d8414917a5272c0fedf3b74c44 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Jan 2023 21:32:50 +0800
Subject: [PATCH 284/301] Bump eslint-plugin-n from 15.6.0 to 15.6.1 (#3080)

Bumps [eslint-plugin-n](https://github.com/eslint-community/eslint-plugin-n) from 15.6.0 to 15.6.1.
- [Release notes](https://github.com/eslint-community/eslint-plugin-n/releases)
- [Commits](https://github.com/eslint-community/eslint-plugin-n/compare/15.6.0...15.6.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-n
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 13961ccd02c7..73edae4c1d78 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.27.4",
     "eslint-plugin-jsonc": "^2.6.0",
-    "eslint-plugin-n": "^15.6.0",
+    "eslint-plugin-n": "^15.6.1",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-unicorn": "^45.0.2",
diff --git a/yarn.lock b/yarn.lock
index 091744763bd3..b836ee2ce212 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3926,10 +3926,10 @@ eslint-plugin-jsonc@^2.6.0:
     jsonc-eslint-parser "^2.0.4"
     natural-compare "^1.4.0"
 
-eslint-plugin-n@^15.6.0:
-  version "15.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-15.6.0.tgz#cfb1d2e2e427d620eb9008f8b3b5a40de0c84120"
-  integrity sha512-Hd/F7wz4Mj44Jp0H6Jtty13NcE69GNTY0rVlgTIj1XBnGGVI6UTdDrpE6vqu3AHo07bygq/N+7OH/lgz1emUJw==
+eslint-plugin-n@^15.6.1:
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-15.6.1.tgz#f7e77f24abb92a550115cf11e29695da122c398c"
+  integrity sha512-R9xw9OtCRxxaxaszTQmQAlPgM+RdGjaL1akWuY/Fv9fRAi8Wj4CUKc6iYVG8QNRjRuo8/BqVYIpfqberJUEacA==
   dependencies:
     builtins "^5.0.1"
     eslint-plugin-es "^4.1.0"
@@ -5060,12 +5060,7 @@ ieee754@^1.1.13, ieee754@^1.1.4:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.1.1, ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
-
-ignore@^5.2.1:
+ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.1:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==

From faf019e6b1e320ea02fe4bda0d42418781d38ee9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Jan 2023 21:33:07 +0800
Subject: [PATCH 285/301] Bump eslint-plugin-vuejs-accessibility from 2.0.0 to
 2.1.0 (#3082)

Bumps [eslint-plugin-vuejs-accessibility](https://github.com/vue-a11y/eslint-plugin-vuejs-accessibility) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/vue-a11y/eslint-plugin-vuejs-accessibility/releases)
- [Changelog](https://github.com/vue-a11y/eslint-plugin-vuejs-accessibility/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vue-a11y/eslint-plugin-vuejs-accessibility/compare/v2.0.0...v2.1.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-vuejs-accessibility
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 73edae4c1d78..febdd1a64ae8 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-unicorn": "^45.0.2",
     "eslint-plugin-vue": "^9.9.0",
-    "eslint-plugin-vuejs-accessibility": "^2.0.0",
+    "eslint-plugin-vuejs-accessibility": "^2.1.0",
     "html-webpack-plugin": "^5.3.2",
     "js-yaml": "^4.1.0",
     "json-minimizer-webpack-plugin": "^4.0.0",
diff --git a/yarn.lock b/yarn.lock
index b836ee2ce212..1a6a33428393 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3987,10 +3987,10 @@ eslint-plugin-vue@^9.9.0:
     vue-eslint-parser "^9.0.1"
     xml-name-validator "^4.0.0"
 
-eslint-plugin-vuejs-accessibility@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vuejs-accessibility/-/eslint-plugin-vuejs-accessibility-2.0.0.tgz#29d1e96cce4d73a0a74bb6fb65b05e3ba4e8af1f"
-  integrity sha512-mjbXnncDT9+5K+/QXXhOVWhEU6OOJck/JNlC6tewo3R+Kzsbaecyq3ylN1NqmyKo78vsgun34JLd+vGdxSPFWQ==
+eslint-plugin-vuejs-accessibility@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vuejs-accessibility/-/eslint-plugin-vuejs-accessibility-2.1.0.tgz#4ea331d509b84f68f161a66ff03c0dbddd79bd4a"
+  integrity sha512-TM0JWrpOUOmka3v83QkH5uYkwUUNWg2RPa6imnBU1El2kRv0Ws1e9N84VPW2HLLTW+Fo+XsdKmiKLXwtIhCqsg==
   dependencies:
     aria-query ">=5.0.0"
     emoji-regex "^10.0.0"

From 860cf5ad394fab2b2919820a2cc32f5804225482 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Jan 2023 21:33:52 +0800
Subject: [PATCH 286/301] Bump electron from 22.0.0 to 22.0.2 (#3084)

Bumps [electron](https://github.com/electron/electron) from 22.0.0 to 22.0.2.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v22.0.0...v22.0.2)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index febdd1a64ae8..8bfa80ee2479 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.7.3",
     "css-minimizer-webpack-plugin": "^4.2.2",
-    "electron": "^22.0.0",
+    "electron": "^22.0.2",
     "electron-builder": "^23.6.0",
     "eslint": "^8.31.0",
     "eslint-config-prettier": "^8.6.0",
diff --git a/yarn.lock b/yarn.lock
index 1a6a33428393..5e42d9755d43 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3606,10 +3606,10 @@ electron-to-chromium@^1.4.251:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
   integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
 
-electron@^22.0.0:
-  version "22.0.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.0.tgz#ef84ab9cf23aa3f8c2f42a1e8e000ad7fd941058"
-  integrity sha512-cgRc4wjyM+81A0E8UGv1HNJjL1HBI5cWNh/DUIjzYvoUuiEM0SS0hAH/zaFQ18xOz2ced6Yih8SybpOiOYJhdg==
+electron@^22.0.2:
+  version "22.0.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-22.0.2.tgz#256c3f7749bcab5d68dc0ba4ae86c1b60852f0b3"
+  integrity sha512-NdJlA2+FMgDJBhQFKMPyWJY8ng/tWpFlrRsW2JkZgSzYPXOnIu9muO3b83YHGoDn+GTyS8ghPsgcAwPMXtxirA==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^16.11.26"

From 647343288729ea36be0580289a23b83171a28ba7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Jan 2023 16:17:39 -0500
Subject: [PATCH 287/301] Bump eslint from 8.31.0 to 8.32.0 (#3083)

Bumps [eslint](https://github.com/eslint/eslint) from 8.31.0 to 8.32.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.31.0...v8.32.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 19 +++++--------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 8bfa80ee2479..1f8709bece42 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "css-minimizer-webpack-plugin": "^4.2.2",
     "electron": "^22.0.2",
     "electron-builder": "^23.6.0",
-    "eslint": "^8.31.0",
+    "eslint": "^8.32.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.27.4",
diff --git a/yarn.lock b/yarn.lock
index 5e42d9755d43..1fe22a32a913 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4041,10 +4041,10 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@^8.31.0:
-  version "8.31.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.31.0.tgz#75028e77cbcff102a9feae1d718135931532d524"
-  integrity sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==
+eslint@^8.32.0:
+  version "8.32.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.32.0.tgz#d9690056bb6f1a302bd991e7090f5b68fbaea861"
+  integrity sha512-nETVXpnthqKPFyuY2FNjz/bEd6nbosRgKbkgS/y1C7LJop96gYHWpiguLecMHQ2XCPxn77DS0P+68WzG6vkZSQ==
   dependencies:
     "@eslint/eslintrc" "^1.4.1"
     "@humanwhocodes/config-array" "^0.11.8"
@@ -4086,7 +4086,7 @@ eslint@^8.31.0:
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
-espree@^9.0.0, espree@^9.4.0:
+espree@^9.0.0, espree@^9.3.1, espree@^9.4.0:
   version "9.4.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd"
   integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==
@@ -4095,15 +4095,6 @@ espree@^9.0.0, espree@^9.4.0:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
-espree@^9.3.1:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a"
-  integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==
-  dependencies:
-    acorn "^8.8.0"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
-
 esquery@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"

From 1e94d01ab207b31b460ce8cf43e6fe263f34edb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Grzegorz=20W=C3=B3jcicki?= <terkaz@gmx.com>
Date: Tue, 17 Jan 2023 21:52:49 +0000
Subject: [PATCH 288/301] Translated using Weblate (Polish)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/pl/
---
 static/locales/pl.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml
index b2091af88f4f..b75f2dc2067d 100644
--- a/static/locales/pl.yaml
+++ b/static/locales/pl.yaml
@@ -270,7 +270,7 @@ Settings:
       Enable: Włącz zrzuty ekranu
     Enter Fullscreen on Display Rotate: Przyłącz na tryb pełnoekranowy przy zmianie
       orientacji ekranu
-    Skip by Scrolling Over Video Player: Przewijaj film, kręcąc kółkiem myszy na obszarze
+    Skip by Scrolling Over Video Player: Przewijaj film kółkiem myszy na obszarze
       odtwarzacza
   Subscription Settings:
     Subscription Settings: 'Ustawienia subskrypcji'

From 2cd8f0f2d3e949c46bd5d87eb4ed507a194c8a60 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Wed, 18 Jan 2023 08:50:02 +0100
Subject: [PATCH 289/301] Switch from Vue.extend to defineComponent (#3066)

---
 src/renderer/App.js                                       | 4 ++--
 src/renderer/components/data-settings/data-settings.js    | 4 ++--
 .../distraction-settings/distraction-settings.js          | 4 ++--
 .../components/download-settings/download-settings.js     | 4 ++--
 .../experimental-settings/experimental-settings.js        | 4 ++--
 .../external-player-settings/external-player-settings.js  | 4 ++--
 .../components/ft-age-restricted/ft-age-restricted.js     | 4 ++--
 src/renderer/components/ft-auto-grid/ft-auto-grid.js      | 4 ++--
 src/renderer/components/ft-button/ft-button.js            | 4 ++--
 src/renderer/components/ft-card/ft-card.js                | 4 ++--
 .../components/ft-channel-bubble/ft-channel-bubble.js     | 4 ++--
 .../components/ft-element-list/ft-element-list.js         | 4 ++--
 src/renderer/components/ft-flex-box/ft-flex-box.js        | 4 ++--
 src/renderer/components/ft-icon-button/ft-icon-button.js  | 4 ++--
 src/renderer/components/ft-input-tags/ft-input-tags.js    | 4 ++--
 src/renderer/components/ft-input/ft-input.js              | 4 ++--
 .../components/ft-list-channel/ft-list-channel.js         | 4 ++--
 .../components/ft-list-dropdown/ft-list-dropdown.js       | 5 +++--
 .../ft-list-lazy-wrapper/ft-list-lazy-wrapper.js          | 4 ++--
 .../components/ft-list-playlist/ft-list-playlist.js       | 4 ++--
 .../components/ft-list-video-lazy/ft-list-video-lazy.js   | 4 ++--
 src/renderer/components/ft-list-video/ft-list-video.js    | 4 ++--
 src/renderer/components/ft-loader/ft-loader.js            | 4 ++--
 .../ft-notification-banner/ft-notification-banner.js      | 4 ++--
 .../components/ft-profile-bubble/ft-profile-bubble.js     | 4 ++--
 .../ft-profile-channel-list/ft-profile-channel-list.js    | 4 ++--
 .../components/ft-profile-edit/ft-profile-edit.js         | 4 ++--
 .../ft-profile-filter-channels-list.js                    | 4 ++--
 .../components/ft-profile-selector/ft-profile-selector.js | 4 ++--
 .../components/ft-progress-bar/ft-progress-bar.js         | 4 ++--
 src/renderer/components/ft-prompt/ft-prompt.js            | 4 ++--
 .../components/ft-radio-button/ft-radio-button.js         | 4 ++--
 .../components/ft-search-filters/ft-search-filters.js     | 4 ++--
 src/renderer/components/ft-select/ft-select.js            | 4 ++--
 .../components/ft-settings-section/ft-settings-section.js | 4 ++--
 .../components/ft-share-button/ft-share-button.js         | 5 ++---
 src/renderer/components/ft-slider/ft-slider.js            | 4 ++--
 .../ft-sponsor-block-category.js                          | 5 +++--
 .../ft-timestamp-catcher/ft-timestamp-catcher.js          | 4 ++--
 src/renderer/components/ft-toast/ft-toast.js              | 4 ++--
 .../components/ft-toggle-switch/ft-toggle-switch.js       | 4 ++--
 src/renderer/components/ft-tooltip/ft-tooltip.js          | 4 ++--
 .../components/ft-video-player/ft-video-player.js         | 4 ++--
 .../components/general-settings/general-settings.js       | 4 ++--
 .../parental-control-settings.js                          | 4 ++--
 .../components/password-dialog/password-dialog.js         | 4 ++--
 .../components/password-settings/password-settings.js     | 4 ++--
 .../components/player-settings/player-settings.js         | 4 ++--
 src/renderer/components/playlist-info/playlist-info.js    | 4 ++--
 .../components/privacy-settings/privacy-settings.js       | 4 ++--
 src/renderer/components/proxy-settings/proxy-settings.js  | 4 ++--
 .../side-nav-more-options/side-nav-more-options.js        | 4 ++--
 src/renderer/components/side-nav/side-nav.js              | 4 ++--
 .../sponsor-block-settings/sponsor-block-settings.js      | 4 ++--
 .../subscription-settings/subscription-settings.js        | 4 ++--
 src/renderer/components/theme-settings/theme-settings.js  | 4 ++--
 src/renderer/components/top-nav/top-nav.js                | 4 ++--
 .../watch-video-chapters/watch-video-chapters.js          | 4 ++--
 .../watch-video-comments/watch-video-comments.js          | 4 ++--
 .../watch-video-description/watch-video-description.js    | 4 ++--
 .../components/watch-video-info/watch-video-info.js       | 4 ++--
 .../watch-video-live-chat/watch-video-live-chat.js        | 4 ++--
 .../watch-video-playlist/watch-video-playlist.js          | 4 ++--
 .../watch-video-recommendations.js                        | 4 ++--
 src/renderer/views/About/About.js                         | 4 ++--
 src/renderer/views/Channel/Channel.js                     | 4 ++--
 src/renderer/views/History/History.js                     | 8 ++++----
 src/renderer/views/Playlist/Playlist.js                   | 4 ++--
 src/renderer/views/Popular/Popular.js                     | 4 ++--
 src/renderer/views/ProfileEdit/ProfileEdit.js             | 4 ++--
 src/renderer/views/ProfileSettings/ProfileSettings.js     | 4 ++--
 src/renderer/views/Search/Search.js                       | 4 ++--
 src/renderer/views/Settings/Settings.js                   | 4 ++--
 .../views/SubscribedChannels/SubscribedChannels.js        | 4 ++--
 src/renderer/views/Subscriptions/Subscriptions.js         | 4 ++--
 src/renderer/views/Trending/Trending.js                   | 4 ++--
 src/renderer/views/UserPlaylists/UserPlaylists.js         | 8 ++++----
 src/renderer/views/Watch/Watch.js                         | 4 ++--
 78 files changed, 162 insertions(+), 161 deletions(-)

diff --git a/src/renderer/App.js b/src/renderer/App.js
index a4500b93fe95..bfe3f74e8bb2 100644
--- a/src/renderer/App.js
+++ b/src/renderer/App.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import Vue, { defineComponent } from 'vue'
 import { mapActions, mapMutations } from 'vuex'
 import { ObserveVisibility } from 'vue-observe-visibility'
 import FtFlexBox from './components/ft-flex-box/ft-flex-box.vue'
@@ -18,7 +18,7 @@ let ipcRenderer = null
 
 Vue.directive('observe-visibility', ObserveVisibility)
 
-export default Vue.extend({
+export default defineComponent({
   name: 'App',
   components: {
     FtFlexBox,
diff --git a/src/renderer/components/data-settings/data-settings.js b/src/renderer/components/data-settings/data-settings.js
index ca61126f3eed..eca9b0f963f0 100644
--- a/src/renderer/components/data-settings/data-settings.js
+++ b/src/renderer/components/data-settings/data-settings.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import { mapActions, mapMutations } from 'vuex'
 import FtButton from '../ft-button/ft-button.vue'
@@ -18,7 +18,7 @@ import {
 } from '../../helpers/utils'
 import { invidiousAPICall } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'DataSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
diff --git a/src/renderer/components/distraction-settings/distraction-settings.js b/src/renderer/components/distraction-settings/distraction-settings.js
index 939ecba67f54..fa5b08326b13 100644
--- a/src/renderer/components/distraction-settings/distraction-settings.js
+++ b/src/renderer/components/distraction-settings/distraction-settings.js
@@ -1,11 +1,11 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtInputTags from '../../components/ft-input-tags/ft-input-tags.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'PlayerSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
diff --git a/src/renderer/components/download-settings/download-settings.js b/src/renderer/components/download-settings/download-settings.js
index 9e4faabca71b..e60d1a56c87f 100644
--- a/src/renderer/components/download-settings/download-settings.js
+++ b/src/renderer/components/download-settings/download-settings.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
@@ -9,7 +9,7 @@ import { mapActions } from 'vuex'
 import { ipcRenderer } from 'electron'
 import { IpcChannels } from '../../../constants'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'DownloadSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
diff --git a/src/renderer/components/experimental-settings/experimental-settings.js b/src/renderer/components/experimental-settings/experimental-settings.js
index ff2a1cb7ca3b..b4d5e89239d9 100644
--- a/src/renderer/components/experimental-settings/experimental-settings.js
+++ b/src/renderer/components/experimental-settings/experimental-settings.js
@@ -1,5 +1,5 @@
 import fs from 'fs/promises'
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
@@ -7,7 +7,7 @@ import FtPrompt from '../ft-prompt/ft-prompt.vue'
 import { pathExists } from '../../helpers/filesystem'
 import { getUserDataPath } from '../../helpers/utils'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'ExperimentalSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
diff --git a/src/renderer/components/external-player-settings/external-player-settings.js b/src/renderer/components/external-player-settings/external-player-settings.js
index 69c58c0561da..c2fc0647d038 100644
--- a/src/renderer/components/external-player-settings/external-player-settings.js
+++ b/src/renderer/components/external-player-settings/external-player-settings.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtSelect from '../ft-select/ft-select.vue'
@@ -6,7 +6,7 @@ import FtInput from '../ft-input/ft-input.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'ExternalPlayerSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
diff --git a/src/renderer/components/ft-age-restricted/ft-age-restricted.js b/src/renderer/components/ft-age-restricted/ft-age-restricted.js
index cc38888f3534..7e925441b465 100644
--- a/src/renderer/components/ft-age-restricted/ft-age-restricted.js
+++ b/src/renderer/components/ft-age-restricted/ft-age-restricted.js
@@ -1,6 +1,6 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtAgeRestricted',
   props: {
     contentTypeString: {
diff --git a/src/renderer/components/ft-auto-grid/ft-auto-grid.js b/src/renderer/components/ft-auto-grid/ft-auto-grid.js
index 2befee458f60..d9d1e21522e0 100644
--- a/src/renderer/components/ft-auto-grid/ft-auto-grid.js
+++ b/src/renderer/components/ft-auto-grid/ft-auto-grid.js
@@ -1,6 +1,6 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtAutoGrid',
   props: {
     grid: {
diff --git a/src/renderer/components/ft-button/ft-button.js b/src/renderer/components/ft-button/ft-button.js
index 74eb0ba844aa..808b8949b2b4 100644
--- a/src/renderer/components/ft-button/ft-button.js
+++ b/src/renderer/components/ft-button/ft-button.js
@@ -1,6 +1,6 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtButton',
   props: {
     label: {
diff --git a/src/renderer/components/ft-card/ft-card.js b/src/renderer/components/ft-card/ft-card.js
index baea9fec76b9..29d02d72472a 100644
--- a/src/renderer/components/ft-card/ft-card.js
+++ b/src/renderer/components/ft-card/ft-card.js
@@ -1,5 +1,5 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtCard'
 })
diff --git a/src/renderer/components/ft-channel-bubble/ft-channel-bubble.js b/src/renderer/components/ft-channel-bubble/ft-channel-bubble.js
index ca2a775cbadc..d3d2430de624 100644
--- a/src/renderer/components/ft-channel-bubble/ft-channel-bubble.js
+++ b/src/renderer/components/ft-channel-bubble/ft-channel-bubble.js
@@ -1,7 +1,7 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { sanitizeForHtmlId } from '../../helpers/accessibility'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtChannelBubble',
   props: {
     channelName: {
diff --git a/src/renderer/components/ft-element-list/ft-element-list.js b/src/renderer/components/ft-element-list/ft-element-list.js
index 319d31dc7b22..50b2e51370eb 100644
--- a/src/renderer/components/ft-element-list/ft-element-list.js
+++ b/src/renderer/components/ft-element-list/ft-element-list.js
@@ -1,8 +1,8 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtAutoGrid from '../ft-auto-grid/ft-auto-grid.vue'
 import FtListLazyWrapper from '../ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtElementList',
   components: {
     'ft-auto-grid': FtAutoGrid,
diff --git a/src/renderer/components/ft-flex-box/ft-flex-box.js b/src/renderer/components/ft-flex-box/ft-flex-box.js
index 41e5bf8815e2..6982d31ed0c5 100644
--- a/src/renderer/components/ft-flex-box/ft-flex-box.js
+++ b/src/renderer/components/ft-flex-box/ft-flex-box.js
@@ -1,5 +1,5 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtFlexBox'
 })
diff --git a/src/renderer/components/ft-icon-button/ft-icon-button.js b/src/renderer/components/ft-icon-button/ft-icon-button.js
index bbb7d9a90d6f..49a6aedcbfee 100644
--- a/src/renderer/components/ft-icon-button/ft-icon-button.js
+++ b/src/renderer/components/ft-icon-button/ft-icon-button.js
@@ -1,7 +1,7 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { sanitizeForHtmlId } from '../../helpers/accessibility'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtIconButton',
   props: {
     title: {
diff --git a/src/renderer/components/ft-input-tags/ft-input-tags.js b/src/renderer/components/ft-input-tags/ft-input-tags.js
index 7e4f2b6f39b6..08f8907af353 100644
--- a/src/renderer/components/ft-input-tags/ft-input-tags.js
+++ b/src/renderer/components/ft-input-tags/ft-input-tags.js
@@ -1,8 +1,8 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtInput from '../ft-input/ft-input.vue'
 import FtTooltip from '../ft-tooltip/ft-tooltip.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtInputTags',
   components: {
     'ft-input': FtInput,
diff --git a/src/renderer/components/ft-input/ft-input.js b/src/renderer/components/ft-input/ft-input.js
index 25b7e8c8ca44..91c80340f72c 100644
--- a/src/renderer/components/ft-input/ft-input.js
+++ b/src/renderer/components/ft-input/ft-input.js
@@ -1,8 +1,8 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtTooltip from '../ft-tooltip/ft-tooltip.vue'
 import { mapActions } from 'vuex'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtInput',
   components: {
     'ft-tooltip': FtTooltip
diff --git a/src/renderer/components/ft-list-channel/ft-list-channel.js b/src/renderer/components/ft-list-channel/ft-list-channel.js
index 09e33e2fe5b2..137f86bd0534 100644
--- a/src/renderer/components/ft-list-channel/ft-list-channel.js
+++ b/src/renderer/components/ft-list-channel/ft-list-channel.js
@@ -1,8 +1,8 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 import { formatNumber } from '../../helpers/utils'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtListChannel',
   props: {
     data: {
diff --git a/src/renderer/components/ft-list-dropdown/ft-list-dropdown.js b/src/renderer/components/ft-list-dropdown/ft-list-dropdown.js
index b53ca8941237..f9d20dfa3383 100644
--- a/src/renderer/components/ft-list-dropdown/ft-list-dropdown.js
+++ b/src/renderer/components/ft-list-dropdown/ft-list-dropdown.js
@@ -1,6 +1,7 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { sanitizeForHtmlId, handleDropdownKeyboardEvent } from '../../helpers/accessibility'
-export default Vue.extend({
+
+export default defineComponent({
   name: 'FtListDropdown',
   props: {
     title: {
diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
index 5d13c0a56088..7cee6fd49e4f 100644
--- a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
+++ b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
@@ -1,9 +1,9 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtListVideo from '../ft-list-video/ft-list-video.vue'
 import FtListChannel from '../ft-list-channel/ft-list-channel.vue'
 import FtListPlaylist from '../ft-list-playlist/ft-list-playlist.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtListLazyWrapper',
   components: {
     'ft-list-video': FtListVideo,
diff --git a/src/renderer/components/ft-list-playlist/ft-list-playlist.js b/src/renderer/components/ft-list-playlist/ft-list-playlist.js
index b310135f30e0..1f8c7ade03da 100644
--- a/src/renderer/components/ft-list-playlist/ft-list-playlist.js
+++ b/src/renderer/components/ft-list-playlist/ft-list-playlist.js
@@ -1,8 +1,8 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
 import { mapActions } from 'vuex'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtListPlaylist',
   components: {
     'ft-icon-button': FtIconButton
diff --git a/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js b/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js
index fcffb9278796..a2e9391ceef5 100644
--- a/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js
+++ b/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js
@@ -1,7 +1,7 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtListVideo from '../ft-list-video/ft-list-video.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtListVideoLazy',
   components: {
     'ft-list-video': FtListVideo
diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js
index 40b12e9ba1d3..cef6a2560725 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.js
+++ b/src/renderer/components/ft-list-video/ft-list-video.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
 import { mapActions } from 'vuex'
 import {
@@ -11,7 +11,7 @@ import {
   toDistractionFreeTitle
 } from '../../helpers/utils'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtListVideo',
   components: {
     'ft-icon-button': FtIconButton
diff --git a/src/renderer/components/ft-loader/ft-loader.js b/src/renderer/components/ft-loader/ft-loader.js
index 592de4600529..72643c4dbc05 100644
--- a/src/renderer/components/ft-loader/ft-loader.js
+++ b/src/renderer/components/ft-loader/ft-loader.js
@@ -1,6 +1,6 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtLoader',
   props: {
     fullscreen: {
diff --git a/src/renderer/components/ft-notification-banner/ft-notification-banner.js b/src/renderer/components/ft-notification-banner/ft-notification-banner.js
index f5333c67bc99..ce6e4adc215f 100644
--- a/src/renderer/components/ft-notification-banner/ft-notification-banner.js
+++ b/src/renderer/components/ft-notification-banner/ft-notification-banner.js
@@ -1,6 +1,6 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtNotificationBanner',
   props: {
     message: {
diff --git a/src/renderer/components/ft-profile-bubble/ft-profile-bubble.js b/src/renderer/components/ft-profile-bubble/ft-profile-bubble.js
index 4652e17ccf03..63d9f0139203 100644
--- a/src/renderer/components/ft-profile-bubble/ft-profile-bubble.js
+++ b/src/renderer/components/ft-profile-bubble/ft-profile-bubble.js
@@ -1,6 +1,6 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtProfileBubble',
   props: {
     profileName: {
diff --git a/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.js b/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.js
index 9d0483041679..45fe6d35afb5 100644
--- a/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.js
+++ b/src/renderer/components/ft-profile-channel-list/ft-profile-channel-list.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 
 import FtCard from '../../components/ft-card/ft-card.vue'
@@ -9,7 +9,7 @@ import FtPrompt from '../../components/ft-prompt/ft-prompt.vue'
 import { showToast } from '../../helpers/utils'
 import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtProfileChannelList',
   components: {
     'ft-card': FtCard,
diff --git a/src/renderer/components/ft-profile-edit/ft-profile-edit.js b/src/renderer/components/ft-profile-edit/ft-profile-edit.js
index d8eb17951cea..9cb26020c99c 100644
--- a/src/renderer/components/ft-profile-edit/ft-profile-edit.js
+++ b/src/renderer/components/ft-profile-edit/ft-profile-edit.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtPrompt from '../../components/ft-prompt/ft-prompt.vue'
@@ -9,7 +9,7 @@ import { MAIN_PROFILE_ID } from '../../../constants'
 import { calculateColorLuminance, colors } from '../../helpers/colors'
 import { showToast } from '../../helpers/utils'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtProfileEdit',
   components: {
     'ft-card': FtCard,
diff --git a/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.js b/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.js
index 2e4cea562385..ece62f7ac521 100644
--- a/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.js
+++ b/src/renderer/components/ft-profile-filter-channels-list/ft-profile-filter-channels-list.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 
 import FtCard from '../../components/ft-card/ft-card.vue'
@@ -9,7 +9,7 @@ import FtSelect from '../ft-select/ft-select.vue'
 import { showToast } from '../../helpers/utils'
 import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtProfileFilterChannelsList',
   components: {
     'ft-card': FtCard,
diff --git a/src/renderer/components/ft-profile-selector/ft-profile-selector.js b/src/renderer/components/ft-profile-selector/ft-profile-selector.js
index fc5b89c8c770..e68a29047b7a 100644
--- a/src/renderer/components/ft-profile-selector/ft-profile-selector.js
+++ b/src/renderer/components/ft-profile-selector/ft-profile-selector.js
@@ -1,11 +1,11 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtIconButton from '../../components/ft-icon-button/ft-icon-button.vue'
 import { showToast } from '../../helpers/utils'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtProfileSelector',
   components: {
     'ft-card': FtCard,
diff --git a/src/renderer/components/ft-progress-bar/ft-progress-bar.js b/src/renderer/components/ft-progress-bar/ft-progress-bar.js
index c5e7fcbc04ab..14b91aa2cbcb 100644
--- a/src/renderer/components/ft-progress-bar/ft-progress-bar.js
+++ b/src/renderer/components/ft-progress-bar/ft-progress-bar.js
@@ -1,6 +1,6 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtProgressBar',
   computed: {
     progressBarPercentage: function () {
diff --git a/src/renderer/components/ft-prompt/ft-prompt.js b/src/renderer/components/ft-prompt/ft-prompt.js
index 22b6c2bf0212..da1711946d0a 100644
--- a/src/renderer/components/ft-prompt/ft-prompt.js
+++ b/src/renderer/components/ft-prompt/ft-prompt.js
@@ -1,10 +1,10 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
 import FtButton from '../../components/ft-button/ft-button.vue'
 import { sanitizeForHtmlId } from '../../helpers/accessibility'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtPrompt',
   components: {
     'ft-card': FtCard,
diff --git a/src/renderer/components/ft-radio-button/ft-radio-button.js b/src/renderer/components/ft-radio-button/ft-radio-button.js
index ee9554bc7c73..f9135811536c 100644
--- a/src/renderer/components/ft-radio-button/ft-radio-button.js
+++ b/src/renderer/components/ft-radio-button/ft-radio-button.js
@@ -1,6 +1,6 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtElementList',
   props: {
     title: {
diff --git a/src/renderer/components/ft-search-filters/ft-search-filters.js b/src/renderer/components/ft-search-filters/ft-search-filters.js
index 47c812a80835..aaf0c7b66ac8 100644
--- a/src/renderer/components/ft-search-filters/ft-search-filters.js
+++ b/src/renderer/components/ft-search-filters/ft-search-filters.js
@@ -1,8 +1,8 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtRadioButton from '../ft-radio-button/ft-radio-button.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtSearchFilters',
   components: {
     'ft-flex-box': FtFlexBox,
diff --git a/src/renderer/components/ft-select/ft-select.js b/src/renderer/components/ft-select/ft-select.js
index 120a0e55a3fa..e6050edadff1 100644
--- a/src/renderer/components/ft-select/ft-select.js
+++ b/src/renderer/components/ft-select/ft-select.js
@@ -1,8 +1,8 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtTooltip from '../ft-tooltip/ft-tooltip.vue'
 import { sanitizeForHtmlId } from '../../helpers/accessibility'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtSelect',
   components: {
     'ft-tooltip': FtTooltip
diff --git a/src/renderer/components/ft-settings-section/ft-settings-section.js b/src/renderer/components/ft-settings-section/ft-settings-section.js
index 8d16409515a9..3b0e9ebaf956 100644
--- a/src/renderer/components/ft-settings-section/ft-settings-section.js
+++ b/src/renderer/components/ft-settings-section/ft-settings-section.js
@@ -1,6 +1,6 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtSettingsSection',
   props: {
     title: {
diff --git a/src/renderer/components/ft-share-button/ft-share-button.js b/src/renderer/components/ft-share-button/ft-share-button.js
index 9c12f296ef51..fe9a63fabec3 100644
--- a/src/renderer/components/ft-share-button/ft-share-button.js
+++ b/src/renderer/components/ft-share-button/ft-share-button.js
@@ -1,12 +1,11 @@
-import Vue from 'vue'
-
+import { defineComponent } from 'vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
 import FtButton from '../ft-button/ft-button.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import { copyToClipboard, openExternalLink } from '../../helpers/utils'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtShareButton',
   components: {
     'ft-flex-box': FtFlexBox,
diff --git a/src/renderer/components/ft-slider/ft-slider.js b/src/renderer/components/ft-slider/ft-slider.js
index fb0b56ee8bdc..31028d74f08e 100644
--- a/src/renderer/components/ft-slider/ft-slider.js
+++ b/src/renderer/components/ft-slider/ft-slider.js
@@ -1,6 +1,6 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtSlider',
   props: {
     label: {
diff --git a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
index 96b6290fd554..a0318f55ab6e 100644
--- a/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
+++ b/src/renderer/components/ft-sponsor-block-category/ft-sponsor-block-category.js
@@ -1,9 +1,10 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import { colors } from '../../helpers/colors'
 import FtSelect from '../ft-select/ft-select.vue'
 import { sanitizeForHtmlId } from '../../helpers/accessibility'
-export default Vue.extend({
+
+export default defineComponent({
   name: 'FtSponsorBlockCategory',
   components: {
     'ft-select': FtSelect
diff --git a/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js b/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js
index b093092d43ef..940213031b0b 100644
--- a/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js
+++ b/src/renderer/components/ft-timestamp-catcher/ft-timestamp-catcher.js
@@ -1,6 +1,6 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtTimestampCatcher',
   props: {
     inputHtml: {
diff --git a/src/renderer/components/ft-toast/ft-toast.js b/src/renderer/components/ft-toast/ft-toast.js
index 81c97fd51b3f..cc6b1ad8432f 100644
--- a/src/renderer/components/ft-toast/ft-toast.js
+++ b/src/renderer/components/ft-toast/ft-toast.js
@@ -1,7 +1,7 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtToastEvents from './ft-toast-events.js'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtToast',
   data: function () {
     return {
diff --git a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.js b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.js
index 3df674d11500..0e61f0c46444 100644
--- a/src/renderer/components/ft-toggle-switch/ft-toggle-switch.js
+++ b/src/renderer/components/ft-toggle-switch/ft-toggle-switch.js
@@ -1,7 +1,7 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtTooltip from '../ft-tooltip/ft-tooltip.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtToggleSwitch',
   components: {
     'ft-tooltip': FtTooltip
diff --git a/src/renderer/components/ft-tooltip/ft-tooltip.js b/src/renderer/components/ft-tooltip/ft-tooltip.js
index fc34ec65d64d..2b4e61a835c6 100644
--- a/src/renderer/components/ft-tooltip/ft-tooltip.js
+++ b/src/renderer/components/ft-tooltip/ft-tooltip.js
@@ -1,8 +1,8 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
 let idCounter = 0
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtTooltip',
   props: {
     position: {
diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
index 54bae15707c8..f1eb5ee4bab3 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 
 import videojs from 'video.js'
@@ -18,7 +18,7 @@ import { calculateColorLuminance, colors } from '../../helpers/colors'
 import { pathExists } from '../../helpers/filesystem'
 import { getPicturesPath, showSaveDialog, showToast } from '../../helpers/utils'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'FtVideoPlayer',
   beforeRouteLeave: function () {
     document.removeEventListener('keydown', this.keyboardShortcutHandler)
diff --git a/src/renderer/components/general-settings/general-settings.js b/src/renderer/components/general-settings/general-settings.js
index 4c19aba53f5d..de94dea2e460 100644
--- a/src/renderer/components/general-settings/general-settings.js
+++ b/src/renderer/components/general-settings/general-settings.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions, mapMutations } from 'vuex'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtSelect from '../ft-select/ft-select.vue'
@@ -10,7 +10,7 @@ import FtButton from '../ft-button/ft-button.vue'
 import debounce from 'lodash.debounce'
 import { showToast } from '../../helpers/utils'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'GeneralSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
diff --git a/src/renderer/components/parental-control-settings/parental-control-settings.js b/src/renderer/components/parental-control-settings/parental-control-settings.js
index 10a678e3f8ef..fd064ae635da 100644
--- a/src/renderer/components/parental-control-settings/parental-control-settings.js
+++ b/src/renderer/components/parental-control-settings/parental-control-settings.js
@@ -1,9 +1,9 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'ParentalControlSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
diff --git a/src/renderer/components/password-dialog/password-dialog.js b/src/renderer/components/password-dialog/password-dialog.js
index b201e57c3fee..ed4b5e99cafe 100644
--- a/src/renderer/components/password-dialog/password-dialog.js
+++ b/src/renderer/components/password-dialog/password-dialog.js
@@ -1,8 +1,8 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtCard from '../ft-card/ft-card.vue'
 import FtInput from '../ft-input/ft-input.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'PasswordDialog',
   components: {
     'ft-input': FtInput,
diff --git a/src/renderer/components/password-settings/password-settings.js b/src/renderer/components/password-settings/password-settings.js
index ca6f038945a4..079bbbf48037 100644
--- a/src/renderer/components/password-settings/password-settings.js
+++ b/src/renderer/components/password-settings/password-settings.js
@@ -1,11 +1,11 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtInput from '../ft-input/ft-input.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtButton from '../ft-button/ft-button.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'PasswordSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
diff --git a/src/renderer/components/player-settings/player-settings.js b/src/renderer/components/player-settings/player-settings.js
index c2c7551bd952..ecaea38b1dfe 100644
--- a/src/renderer/components/player-settings/player-settings.js
+++ b/src/renderer/components/player-settings/player-settings.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtSelect from '../ft-select/ft-select.vue'
@@ -13,7 +13,7 @@ import { IpcChannels } from '../../../constants'
 import path from 'path'
 import { getPicturesPath } from '../../helpers/utils'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'PlayerSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
diff --git a/src/renderer/components/playlist-info/playlist-info.js b/src/renderer/components/playlist-info/playlist-info.js
index bf421ae1f073..54ec8b9adc90 100644
--- a/src/renderer/components/playlist-info/playlist-info.js
+++ b/src/renderer/components/playlist-info/playlist-info.js
@@ -1,8 +1,8 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtListDropdown from '../ft-list-dropdown/ft-list-dropdown.vue'
 import { copyToClipboard, formatNumber, openExternalLink } from '../../helpers/utils'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'PlaylistInfo',
   components: {
     'ft-list-dropdown': FtListDropdown
diff --git a/src/renderer/components/privacy-settings/privacy-settings.js b/src/renderer/components/privacy-settings/privacy-settings.js
index 74046499c6bc..145fe6eb48e6 100644
--- a/src/renderer/components/privacy-settings/privacy-settings.js
+++ b/src/renderer/components/privacy-settings/privacy-settings.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtButton from '../ft-button/ft-button.vue'
@@ -8,7 +8,7 @@ import FtPrompt from '../ft-prompt/ft-prompt.vue'
 import { MAIN_PROFILE_ID } from '../../../constants'
 import { showToast } from '../../helpers/utils'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'PrivacySettings',
   components: {
     'ft-settings-section': FtSettingsSection,
diff --git a/src/renderer/components/proxy-settings/proxy-settings.js b/src/renderer/components/proxy-settings/proxy-settings.js
index 33df0bf8d406..f288467d2920 100644
--- a/src/renderer/components/proxy-settings/proxy-settings.js
+++ b/src/renderer/components/proxy-settings/proxy-settings.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
@@ -14,7 +14,7 @@ import debounce from 'lodash.debounce'
 import { IpcChannels } from '../../../constants'
 import { showToast } from '../../helpers/utils'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'ProxySettings',
   components: {
     'ft-settings-section': FtSettingsSection,
diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.js b/src/renderer/components/side-nav-more-options/side-nav-more-options.js
index 0a943afae66f..83bae2a4de7f 100644
--- a/src/renderer/components/side-nav-more-options/side-nav-more-options.js
+++ b/src/renderer/components/side-nav-more-options/side-nav-more-options.js
@@ -1,6 +1,6 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'SideNav',
   data: function () {
     return {
diff --git a/src/renderer/components/side-nav/side-nav.js b/src/renderer/components/side-nav/side-nav.js
index b9940b4a0372..31709f2584df 100644
--- a/src/renderer/components/side-nav/side-nav.js
+++ b/src/renderer/components/side-nav/side-nav.js
@@ -1,9 +1,9 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import SideNavMoreOptions from '../side-nav-more-options/side-nav-more-options.vue'
 import { youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'SideNav',
   components: {
     'ft-flex-box': FtFlexBox,
diff --git a/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js b/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js
index 80ad8e5167cf..af1fd5abf8ea 100644
--- a/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js
+++ b/src/renderer/components/sponsor-block-settings/sponsor-block-settings.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
@@ -6,7 +6,7 @@ import FtInput from '../ft-input/ft-input.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtSponsorBlockCategory from '../ft-sponsor-block-category/ft-sponsor-block-category.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'SponsorBlockSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
diff --git a/src/renderer/components/subscription-settings/subscription-settings.js b/src/renderer/components/subscription-settings/subscription-settings.js
index 510c42f5e676..97508e40f058 100644
--- a/src/renderer/components/subscription-settings/subscription-settings.js
+++ b/src/renderer/components/subscription-settings/subscription-settings.js
@@ -1,9 +1,9 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'SubscriptionSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
diff --git a/src/renderer/components/theme-settings/theme-settings.js b/src/renderer/components/theme-settings/theme-settings.js
index b8bc2e16169e..2d322d6736ad 100644
--- a/src/renderer/components/theme-settings/theme-settings.js
+++ b/src/renderer/components/theme-settings/theme-settings.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtSettingsSection from '../ft-settings-section/ft-settings-section.vue'
 import FtSelect from '../ft-select/ft-select.vue'
@@ -8,7 +8,7 @@ import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtPrompt from '../ft-prompt/ft-prompt.vue'
 import { colors } from '../../helpers/colors'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'ThemeSettings',
   components: {
     'ft-settings-section': FtSettingsSection,
diff --git a/src/renderer/components/top-nav/top-nav.js b/src/renderer/components/top-nav/top-nav.js
index 90026ea8db15..a0e00372643a 100644
--- a/src/renderer/components/top-nav/top-nav.js
+++ b/src/renderer/components/top-nav/top-nav.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtInput from '../ft-input/ft-input.vue'
 import FtSearchFilters from '../ft-search-filters/ft-search-filters.vue'
@@ -10,7 +10,7 @@ import { openInternalPath, showToast } from '../../helpers/utils'
 import { clearLocalSearchSuggestionsSession, getLocalSearchSuggestions } from '../../helpers/api/local'
 import { invidiousAPICall } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'TopNav',
   components: {
     FtInput,
diff --git a/src/renderer/components/watch-video-chapters/watch-video-chapters.js b/src/renderer/components/watch-video-chapters/watch-video-chapters.js
index 36a88bc4841b..3ec1e191f268 100644
--- a/src/renderer/components/watch-video-chapters/watch-video-chapters.js
+++ b/src/renderer/components/watch-video-chapters/watch-video-chapters.js
@@ -1,7 +1,7 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtCard from '../ft-card/ft-card.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'WatchVideoChapters',
   components: {
     'ft-card': FtCard
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.js b/src/renderer/components/watch-video-comments/watch-video-comments.js
index b79d2f7accca..bad2f65b5923 100644
--- a/src/renderer/components/watch-video-comments/watch-video-comments.js
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtCard from '../ft-card/ft-card.vue'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtSelect from '../../components/ft-select/ft-select.vue'
@@ -13,7 +13,7 @@ import {
 } from '../../helpers/utils'
 import { invidiousGetCommentReplies, invidiousGetComments } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'WatchVideoComments',
   components: {
     'ft-card': FtCard,
diff --git a/src/renderer/components/watch-video-description/watch-video-description.js b/src/renderer/components/watch-video-description/watch-video-description.js
index eb370e175413..fcfe1458c784 100644
--- a/src/renderer/components/watch-video-description/watch-video-description.js
+++ b/src/renderer/components/watch-video-description/watch-video-description.js
@@ -1,9 +1,9 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtCard from '../ft-card/ft-card.vue'
 import FtTimestampCatcher from '../ft-timestamp-catcher/ft-timestamp-catcher.vue'
 import autolinker from 'autolinker'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'WatchVideoDescription',
   components: {
     'ft-card': FtCard,
diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js
index 44ac81aa82ab..03ca3496f450 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.js
+++ b/src/renderer/components/watch-video-info/watch-video-info.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtCard from '../ft-card/ft-card.vue'
 import FtButton from '../ft-button/ft-button.vue'
@@ -7,7 +7,7 @@ import FtShareButton from '../ft-share-button/ft-share-button.vue'
 import { MAIN_PROFILE_ID } from '../../../constants'
 import { formatNumber, openExternalLink, showToast } from '../../helpers/utils'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'WatchVideoInfo',
   components: {
     'ft-card': FtCard,
diff --git a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js
index 11f55815303e..4df8793ffb54 100644
--- a/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js
+++ b/src/renderer/components/watch-video-live-chat/watch-video-live-chat.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtLoader from '../ft-loader/ft-loader.vue'
 import FtCard from '../ft-card/ft-card.vue'
 import FtButton from '../ft-button/ft-button.vue'
@@ -7,7 +7,7 @@ import autolinker from 'autolinker'
 import { getRandomColorClass } from '../../helpers/colors'
 import { getLocalVideoInfo, parseLocalTextRuns } from '../../helpers/api/local'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'WatchVideoLiveChat',
   components: {
     'ft-loader': FtLoader,
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.js b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
index 05f32a003a37..6839c27a97b0 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.js
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapMutations } from 'vuex'
 import FtLoader from '../ft-loader/ft-loader.vue'
 import FtCard from '../ft-card/ft-card.vue'
@@ -7,7 +7,7 @@ import { copyToClipboard, showToast } from '../../helpers/utils'
 import { getLocalPlaylist, parseLocalPlaylistVideo } from '../../helpers/api/local'
 import { invidiousGetPlaylistInfo } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'WatchVideoPlaylist',
   components: {
     'ft-loader': FtLoader,
diff --git a/src/renderer/components/watch-video-recommendations/watch-video-recommendations.js b/src/renderer/components/watch-video-recommendations/watch-video-recommendations.js
index bc52a540b020..0c6f34dee20a 100644
--- a/src/renderer/components/watch-video-recommendations/watch-video-recommendations.js
+++ b/src/renderer/components/watch-video-recommendations/watch-video-recommendations.js
@@ -1,10 +1,10 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtCard from '../ft-card/ft-card.vue'
 import FtListVideoLazy from '../ft-list-video-lazy/ft-list-video-lazy.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'WatchVideoRecommendations',
   components: {
     'ft-card': FtCard,
diff --git a/src/renderer/views/About/About.js b/src/renderer/views/About/About.js
index 3e65a78dd98b..669f9854fd37 100644
--- a/src/renderer/views/About/About.js
+++ b/src/renderer/views/About/About.js
@@ -1,8 +1,8 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import packageDetails from '../../../../package.json'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'About',
   components: {
     'ft-card': FtCard
diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index ecc5ed23cc75..8070a675f517 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtButton from '../../components/ft-button/ft-button.vue'
@@ -18,7 +18,7 @@ import { copyToClipboard, formatNumber, showToast } from '../../helpers/utils'
 import packageDetails from '../../../../package.json'
 import { invidiousAPICall, invidiousGetChannelInfo, youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'Search',
   components: {
     'ft-card': FtCard,
diff --git a/src/renderer/views/History/History.js b/src/renderer/views/History/History.js
index bf6569be8d7e..172bdcf3003f 100644
--- a/src/renderer/views/History/History.js
+++ b/src/renderer/views/History/History.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent, nextTick } from 'vue'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
@@ -6,7 +6,7 @@ import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
 import FtButton from '../../components/ft-button/ft-button.vue'
 import FtInput from '../../components/ft-input/ft-input.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'History',
   components: {
     'ft-loader': FtLoader,
@@ -107,9 +107,9 @@ export default Vue.extend({
     refreshPage: function() {
       const scrollPos = window.scrollY || window.scrollTop || document.getElementsByTagName('html')[0].scrollTop
       this.isLoading = true
-      Vue.nextTick(() => {
+      nextTick(() => {
         this.isLoading = false
-        Vue.nextTick(() => {
+        nextTick(() => {
           window.scrollTo(0, scrollPos)
         })
       })
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index bba96d2ca109..65e4445b47ce 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions, mapMutations } from 'vuex'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
@@ -10,7 +10,7 @@ import { getLocalPlaylist, parseLocalPlaylistVideo } from '../../helpers/api/loc
 import { extractNumberFromString } from '../../helpers/utils'
 import { invidiousGetPlaylistInfo, youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'Playlist',
   components: {
     'ft-loader': FtLoader,
diff --git a/src/renderer/views/Popular/Popular.js b/src/renderer/views/Popular/Popular.js
index 03f35f87530f..ea6d32253e75 100644
--- a/src/renderer/views/Popular/Popular.js
+++ b/src/renderer/views/Popular/Popular.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
@@ -6,7 +6,7 @@ import FtIconButton from '../../components/ft-icon-button/ft-icon-button.vue'
 
 import { invidiousAPICall } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'Popular',
   components: {
     'ft-loader': FtLoader,
diff --git a/src/renderer/views/ProfileEdit/ProfileEdit.js b/src/renderer/views/ProfileEdit/ProfileEdit.js
index 3c5c5d8ece6a..1987f62f201d 100644
--- a/src/renderer/views/ProfileEdit/ProfileEdit.js
+++ b/src/renderer/views/ProfileEdit/ProfileEdit.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapGetters } from 'vuex'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtProfileEdit from '../../components/ft-profile-edit/ft-profile-edit.vue'
@@ -8,7 +8,7 @@ import { MAIN_PROFILE_ID } from '../../../constants'
 import { calculateColorLuminance, getRandomColor } from '../../helpers/colors'
 import { showToast } from '../../helpers/utils'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'ProfileEdit',
   components: {
     'ft-loader': FtLoader,
diff --git a/src/renderer/views/ProfileSettings/ProfileSettings.js b/src/renderer/views/ProfileSettings/ProfileSettings.js
index 007be833ef1c..0324f46087cc 100644
--- a/src/renderer/views/ProfileSettings/ProfileSettings.js
+++ b/src/renderer/views/ProfileSettings/ProfileSettings.js
@@ -1,10 +1,10 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
 import FtProfileBubble from '../../components/ft-profile-bubble/ft-profile-bubble.vue'
 import FtButton from '../../components/ft-button/ft-button.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'ProfileSettings',
   components: {
     'ft-card': FtCard,
diff --git a/src/renderer/views/Search/Search.js b/src/renderer/views/Search/Search.js
index 344dbf7332c6..853dded9cf19 100644
--- a/src/renderer/views/Search/Search.js
+++ b/src/renderer/views/Search/Search.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
@@ -6,7 +6,7 @@ import { copyToClipboard, searchFiltersMatch, showToast } from '../../helpers/ut
 import { getLocalSearchContinuation, getLocalSearchResults } from '../../helpers/api/local'
 import { invidiousAPICall } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'Search',
   components: {
     'ft-loader': FtLoader,
diff --git a/src/renderer/views/Settings/Settings.js b/src/renderer/views/Settings/Settings.js
index 3e516881131b..df06cdb04ce3 100644
--- a/src/renderer/views/Settings/Settings.js
+++ b/src/renderer/views/Settings/Settings.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import GeneralSettings from '../../components/general-settings/general-settings.vue'
 import ThemeSettings from '../../components/theme-settings/theme-settings.vue'
 import PlayerSettings from '../../components/player-settings/player-settings.vue'
@@ -15,7 +15,7 @@ import ExperimentalSettings from '../../components/experimental-settings/experim
 import PasswordSettings from '../../components/password-settings/password-settings.vue'
 import PasswordDialog from '../../components/password-dialog/password-dialog.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'Settings',
   components: {
     'general-settings': GeneralSettings,
diff --git a/src/renderer/views/SubscribedChannels/SubscribedChannels.js b/src/renderer/views/SubscribedChannels/SubscribedChannels.js
index 60c9910fc343..022e9697786f 100644
--- a/src/renderer/views/SubscribedChannels/SubscribedChannels.js
+++ b/src/renderer/views/SubscribedChannels/SubscribedChannels.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import FtButton from '../../components/ft-button/ft-button.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
@@ -9,7 +9,7 @@ import ytch from 'yt-channel-info'
 import { showToast } from '../../helpers/utils'
 import { invidiousGetChannelInfo, youtubeImageUrlToInvidious, invidiousImageUrlToInvidious } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'SubscribedChannels',
   components: {
     'ft-button': FtButton,
diff --git a/src/renderer/views/Subscriptions/Subscriptions.js b/src/renderer/views/Subscriptions/Subscriptions.js
index b1c3c2cf8625..a368884e86cb 100644
--- a/src/renderer/views/Subscriptions/Subscriptions.js
+++ b/src/renderer/views/Subscriptions/Subscriptions.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions, mapMutations } from 'vuex'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
@@ -13,7 +13,7 @@ import { MAIN_PROFILE_ID } from '../../../constants'
 import { calculatePublishedDate, copyToClipboard, showToast } from '../../helpers/utils'
 import { invidiousAPICall } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'Subscriptions',
   components: {
     'ft-loader': FtLoader,
diff --git a/src/renderer/views/Trending/Trending.js b/src/renderer/views/Trending/Trending.js
index 2ab09df50741..0426f723169d 100644
--- a/src/renderer/views/Trending/Trending.js
+++ b/src/renderer/views/Trending/Trending.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
@@ -9,7 +9,7 @@ import { copyToClipboard, showToast } from '../../helpers/utils'
 import { getLocalTrending } from '../../helpers/api/local'
 import { invidiousAPICall } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'Trending',
   components: {
     'ft-card': FtCard,
diff --git a/src/renderer/views/UserPlaylists/UserPlaylists.js b/src/renderer/views/UserPlaylists/UserPlaylists.js
index a849f8d4acb8..685a0fd5a180 100644
--- a/src/renderer/views/UserPlaylists/UserPlaylists.js
+++ b/src/renderer/views/UserPlaylists/UserPlaylists.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent, nextTick } from 'vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtFlexBox from '../../components/ft-flex-box/ft-flex-box.vue'
 import FtTooltip from '../../components/ft-tooltip/ft-tooltip.vue'
@@ -7,7 +7,7 @@ import FtButton from '../../components/ft-button/ft-button.vue'
 import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
 import FtInput from '../../components/ft-input/ft-input.vue'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'UserPlaylists',
   components: {
     'ft-card': FtCard,
@@ -110,9 +110,9 @@ export default Vue.extend({
     refreshPage: function() {
       const scrollPos = window.scrollY || window.scrollTop || document.getElementsByTagName('html')[0].scrollTop
       this.isLoading = true
-      Vue.nextTick(() => {
+      nextTick(() => {
         this.isLoading = false
-        Vue.nextTick(() => {
+        nextTick(() => {
           window.scrollTo(0, scrollPos)
         })
       })
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 4857448540d4..9a8f3422298c 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import { defineComponent } from 'vue'
 import { mapActions } from 'vuex'
 import fs from 'fs/promises'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
@@ -30,7 +30,7 @@ import {
 } from '../../helpers/api/local'
 import { invidiousGetVideoInformation, youtubeImageUrlToInvidious } from '../../helpers/api/invidious'
 
-export default Vue.extend({
+export default defineComponent({
   name: 'Watch',
   components: {
     'ft-loader': FtLoader,

From 41687aa185f2981ad7a160446a391499156b2095 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Wed, 18 Jan 2023 09:21:35 +0100
Subject: [PATCH 290/301] Don't react when selecting the current trending tab
 (#3070)

---
 src/renderer/views/Trending/Trending.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/renderer/views/Trending/Trending.js b/src/renderer/views/Trending/Trending.js
index 0426f723169d..1b63126e8356 100644
--- a/src/renderer/views/Trending/Trending.js
+++ b/src/renderer/views/Trending/Trending.js
@@ -57,6 +57,10 @@ export default defineComponent({
   },
   methods: {
     changeTab: function (tab) {
+      if (tab === this.currentTab) {
+        return
+      }
+
       this.currentTab = tab
       if (this.trendingCache[this.currentTab] && this.trendingCache[this.currentTab].length > 0) {
         this.getTrendingInfoCache()

From 64d6d9b7ffecdbbe772d123b86300ece1ea38c53 Mon Sep 17 00:00:00 2001
From: Emma <MarmadileManteater@proton.me>
Date: Wed, 18 Jan 2023 19:49:56 -0500
Subject: [PATCH 291/301] Correct argument on `invidiousGetPlaylistInfo`
 (#3089)

`invidiousGetPlaylistInfo` expects a `string`.
---
 src/renderer/views/Playlist/Playlist.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index 65e4445b47ce..8551c4f27289 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -124,7 +124,7 @@ export default defineComponent({
     getPlaylistInvidious: function () {
       this.isLoading = true
 
-      invidiousGetPlaylistInfo({ playlistId: this.playlistId }).then((result) => {
+      invidiousGetPlaylistInfo(this.playlistId).then((result) => {
         this.infoData = {
           id: result.playlistId,
           title: result.title,

From a89c2005e8b1dfa4ac5cf171f6ece9f7beeebf1b Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Thu, 19 Jan 2023 11:35:20 +0800
Subject: [PATCH 292/301] ! Fix search view not loading result starting 2nd
 page via local API (#3074)

---
 src/renderer/views/Search/Search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/Search/Search.js b/src/renderer/views/Search/Search.js
index 853dded9cf19..176fb6876f7d 100644
--- a/src/renderer/views/Search/Search.js
+++ b/src/renderer/views/Search/Search.js
@@ -162,7 +162,7 @@ export default defineComponent({
 
     getNextpageLocal: async function (payload) {
       try {
-        const { results, continuationData } = getLocalSearchContinuation(payload.options.nextPageRef)
+        const { results, continuationData } = await getLocalSearchContinuation(payload.options.nextPageRef)
 
         if (results.length === 0) {
           return

From ca42dcd4fa26190b91a45af3337d46a06914b136 Mon Sep 17 00:00:00 2001
From: Sandyran <sandyran@protonmail.com>
Date: Thu, 19 Jan 2023 09:53:19 +0000
Subject: [PATCH 293/301] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 89.9% (593 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/nb_NO/
---
 static/locales/nb_NO.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/nb_NO.yaml b/static/locales/nb_NO.yaml
index 22fa11df95d9..a897b3778c1c 100644
--- a/static/locales/nb_NO.yaml
+++ b/static/locales/nb_NO.yaml
@@ -900,7 +900,7 @@ External link opening has been disabled in the general settings: Åpning av ekst
   lenker er avskrudd i de generelle innstillingene
 Search Bar:
   Clear Input: Tøm inndata
-Are you sure you want to open this link?: Åpne denne lenken?
+Are you sure you want to open this link?: Er du sikker på at du vil åpne denne lenken?
 New Window: Nytt vindu
 Channels:
   Channels: Kanaler

From 9484fd3cb28d5f63b1036d995c0655dd591c0a15 Mon Sep 17 00:00:00 2001
From: Sandyran <sandyran@protonmail.com>
Date: Thu, 19 Jan 2023 12:50:47 +0000
Subject: [PATCH 294/301] Translated using Weblate (Norwegian Nynorsk)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/nn/
---
 static/locales/nn.yaml | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/static/locales/nn.yaml b/static/locales/nn.yaml
index 33de38f7a3a3..6118dec9bd40 100644
--- a/static/locales/nn.yaml
+++ b/static/locales/nn.yaml
@@ -656,6 +656,8 @@ Video:
       looping playlists: gjentar spelelister
       starting video at offset: starter video ved punktet
       reversing playlists: speler av spelelister baklengs
+      opening specific video in a playlist (falling back to opening the video): opner
+        valt video i ei speleliste (faller tilbake til å opne videoen)
   Premieres on: Har premiere
   Stats:
     Volume: Lydstyrke
@@ -786,21 +788,43 @@ Tooltips:
       kan spele høgare kvalitet. Utdaterte format er avgrensa til maks 720p, men bruker
       mindre bandbreidde. Lydformat er berre for lydstraumar.'
     Skip by Scrolling Over Video Player: Bla for å hoppe deg gjennom videoen i MPV-stil.
+    Scroll Playback Rate Over Video Player: Mens musepeikaren er over videoen, trykk
+      og hald inne CTRL-tasten (kommandotasen på Mac) og bla opp og ned for å kontrollere
+      avspelingshastigheita. Trykk og hald inne CTRL-tasten (kommandotasten på Mac)
+      og venstretrykk rakst for å gå tilbake til standard avspelingshastigheita. Standard
+      avspelingshastigheit er 1x med mindre den har blitt endra i innstillingane.
   Subscription Settings:
     Fetch Feeds from RSS: 'Bruk RSS i staden for FreeTube sin standardmetode for innhenting
       av din abonnementsstraum. RSS er raskaren og forhindrar IP-blokkering, men manglar
       noko informasjon som videovarigheit og sanntidsstatus.'
 
 # Toast Messages
+    Fetch Automatically: Om dette alternativet er aktivert, vil FreeTube automatisk
+      hente abonnementfeeden din når eit nytt vindauge opnast og når du bytter profil.
   Privacy Settings:
     Remove Video Meta Files: Viss denne innstillinga er på, vil FreeTube automatisk
       slette metadata generert under videoavspeling når du lukker avspelingsida.
   External Player Settings:
     DefaultCustomArgumentsTemplate: "(Standard: '{defaultCustomArguments}')"
+    Custom External Player Executable: Som standard vil FreeTube anta at den valte
+      eksterne videoavspelaren kan bli funnen via programstivariabelen. Om naudsynt
+      kan ein endre på programstien.
+    Ignore Warnings: Skjul åtvaringar angåande eksterne videoavspelarar som ikkje
+      støtter gjeldande handlingar (f.eks. snu spelelister, osv.).
+    External Player: Viss ein har valt ein ekstern videoavspelar, blir eit ikon vist
+      på miniatyrbiletet til videoar. Dette ikonet lar ein opne desse videoane i ein
+      ekstern videoavspelar. Ver merksam på at Invidious-innstillingar ikkje påverker
+      den eksterne videoavspelaren.
+    Custom External Player Arguments: Eventuelle eigendefinerte kommandolinjeargument,
+      åtskilt med semikolon (";"), du vil at skal bli sendt til den eksterne videoavspelaren.
   Experimental Settings:
     Replace HTTP Cache: Deaktiver Electrons diskbaserte HTTP-hurtiglager og aktiver
-      eit spesialtilpassa biletehurtiglager i minnet. Dette vil føre til ei auking
-      i minnebruk.
+      eit eigendefinert biletehurtiglager i minnet. Dette vil føre til ei auking i
+      minnebruk.
+  Distraction Free Settings:
+    Hide Channels: Skriv inn eit kanalnamn eller ein kanal-ID for å skjule alle videoar,
+      spelelister og sjølve kanalen frå å dukke opp i "Søk" eller "På veg opp". Kanalnamnet
+      som blir skriven inn må samsvare fullstendig og skilje mellom store og små bokstavar.
 Local API Error (Click to copy): 'Lokal API-feil (Klikk her for å kopiere)'
 Invidious API Error (Click to copy): 'Invidious-API-feil (Klikk her for å kopiere)'
 Falling back to Invidious API: 'Faller tilbake til Invidious-API-et'

From 0f4bf0e87e6b7bedf6925bffc745a146c61e426d Mon Sep 17 00:00:00 2001
From: Emma <MarmadileManteater@proton.me>
Date: Thu, 19 Jan 2023 10:58:04 -0500
Subject: [PATCH 295/301] Map `videos` property on Invidious API response
 (#3090)

`invidiousAPICall` is returning an object with a `videos` property here
instead of a list.
---
 src/renderer/views/Subscriptions/Subscriptions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/Subscriptions/Subscriptions.js b/src/renderer/views/Subscriptions/Subscriptions.js
index a368884e86cb..266ecc48fa86 100644
--- a/src/renderer/views/Subscriptions/Subscriptions.js
+++ b/src/renderer/views/Subscriptions/Subscriptions.js
@@ -361,7 +361,7 @@ export default defineComponent({
         }
 
         invidiousAPICall(subscriptionsPayload).then(async (result) => {
-          resolve(await Promise.all(result.map((video) => {
+          resolve(await Promise.all(result.videos.map((video) => {
             video.publishedDate = new Date(video.published * 1000)
             return video
           })))

From 12e9565dbeaa248c28d515b4d7f209a46af3a444 Mon Sep 17 00:00:00 2001
From: Emma <MarmadileManteater@proton.me>
Date: Thu, 19 Jan 2023 10:58:12 -0500
Subject: [PATCH 296/301] Bind directive to function instead of function call
 (#3091)

v-if="showResult(data)" evaluates once
v-if="showResult" is reactive;

`data` also doesn't need to be passed here
because it is already accessible from `this`.
---
 .../components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js    | 3 ++-
 .../components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
index 7cee6fd49e4f..a063afb32749 100644
--- a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
+++ b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
@@ -54,7 +54,8 @@ export default defineComponent({
      *
      * @return {bool} false to hide the video, true to show it
      */
-    showResult: function (data) {
+    showResult: function () {
+      const { data } = this
       if (!data.type) {
         return false
       }
diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
index b7471c4d33f9..92565be194ec 100644
--- a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
+++ b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="showResult(data)"
+    v-if="showResult"
     v-observe-visibility="firstScreen ? false : {
       callback: onVisibilityChanged,
       once: true,

From 28ee117709c927199c5eea2621bb5c9114be685c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D1=80=D1=82=D1=91=D0=BC=20=D0=9A=D0=BE=D1=82=D0=BB?=
 =?UTF-8?q?=D1=83=D0=B1=D0=B0=D0=B9?= <artemkotlubai@yandex.ru>
Date: Thu, 19 Jan 2023 16:21:34 +0000
Subject: [PATCH 297/301] Translated using Weblate (Russian)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 481683e38ade..91dca414b7cc 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -968,5 +968,5 @@ Chapters:
     текущий раздел: {chapterName}'
   'Chapters list hidden, current chapter: {chapterName}': 'Список разделов скрыт,
     текущий раздел: {chapterName}'
-Preferences: Предпочтения
+Preferences: Настройки
 Ok: Хорошо

From 590f3a6121459d01948d5afa09e7b274827fb4f2 Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Fri, 20 Jan 2023 08:00:29 +0800
Subject: [PATCH 298/301] ! Fix searching (2nd time onward) in channel view
 broken (#3073)

---
 src/renderer/views/Channel/Channel.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index 8070a675f517..27e8e780b8bc 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -676,12 +676,13 @@ export default defineComponent({
         }
       }
 
+      // `currentTabNode` can be `null` on 2nd+ search
       const currentTabNode = document.querySelector('.tabs > .tab[aria-selected="true"]')
       // `newTabNode` can be `null` when `tab` === "search"
       const newTabNode = document.getElementById(`${tab}Tab`)
-      document.querySelector('.tabs > .tab[tabindex="0"]').setAttribute('tabindex', '-1')
+      document.querySelector('.tabs > .tab[tabindex="0"]')?.setAttribute('tabindex', '-1')
       newTabNode?.setAttribute('tabindex', '0')
-      currentTabNode.setAttribute('aria-selected', 'false')
+      currentTabNode?.setAttribute('aria-selected', 'false')
       newTabNode?.setAttribute('aria-selected', 'true')
       this.currentTab = tab
       newTabNode?.focus({ focusVisible: true })

From c3c63654c75c0fb109e60a966c263f20d43aa914 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Fri, 20 Jan 2023 12:00:07 +0100
Subject: [PATCH 299/301] Use a single import for the brand icons (#3094)

---
 src/renderer/main.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/renderer/main.js b/src/renderer/main.js
index dc68e6f34e98..dd153e5fd2c2 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -55,10 +55,12 @@ import {
   faTimesCircle,
   faUsers
 } from '@fortawesome/free-solid-svg-icons'
-import { faGithub } from '@fortawesome/free-brands-svg-icons/faGithub'
-import { faBitcoin } from '@fortawesome/free-brands-svg-icons/faBitcoin'
-import { faMonero } from '@fortawesome/free-brands-svg-icons/faMonero'
-import { faMastodon } from '@fortawesome/free-brands-svg-icons/faMastodon'
+import {
+  faBitcoin,
+  faGithub,
+  faMastodon,
+  faMonero
+} from '@fortawesome/free-brands-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 
 Vue.config.devtools = process.env.NODE_ENV === 'development'

From 2d0fc8e2eee7653177a11df0a0576bbf9e53498d Mon Sep 17 00:00:00 2001
From: Vin <k3kelm4vw@mozmail.com>
Date: Fri, 20 Jan 2023 17:48:33 +0000
Subject: [PATCH 300/301] Translated using Weblate (Russian)

Currently translated at 100.0% (659 of 659 strings)

Translation: FreeTube/Translations
Translate-URL: https://hosted.weblate.org/projects/free-tube/translations/ru/
---
 static/locales/ru.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 91dca414b7cc..d888a47583a4 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -28,7 +28,7 @@ Back: 'Назад'
 Forward: 'Вперёд'
 
 # Search Bar
-Search / Go to URL: 'Поиск / Перейти по адресу'
+Search / Go to URL: 'Поиск/Перейти по адресу'
   # In Filter Button
 Search Filters:
   Search Filters: 'Фильтры поиска'

From 7ccb5dd05e4bb1c4ee1dbf3d269d6cc6f61288c3 Mon Sep 17 00:00:00 2001
From: Emma <MarmadileManteater@proton.me>
Date: Sat, 21 Jan 2023 04:25:01 -0500
Subject: [PATCH 301/301] Adjust `side-nav-more-options` to account for anchor
 style (#3097)

* Adjust side-nav-more-options to account for `a` styles

- These nav-options were changed from `div`s to anchors, and so,
they need to be styled like the `div`s that used to be there.

* Use `inherit` instead of white
---
 .../components/side-nav-more-options/side-nav-more-options.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.css b/src/renderer/components/side-nav-more-options/side-nav-more-options.css
index 36ad739962d2..146e64ebc2a4 100644
--- a/src/renderer/components/side-nav-more-options/side-nav-more-options.css
+++ b/src/renderer/components/side-nav-more-options/side-nav-more-options.css
@@ -6,6 +6,9 @@
   position: relative;
   padding: 5px;
   cursor: pointer;
+  color: inherit;
+  text-decoration: none;
+  display: block;
 }
 
 .navOption:hover {