From 07a63279033a415918367bac1f9b9b957015a8eb Mon Sep 17 00:00:00 2001
From: preston <preston@fedora>
Date: Sat, 26 Jun 2021 15:10:48 -0400
Subject: [PATCH 001/105] Bump version number to v0.13.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f5983d6f35ffc..4e45613689bba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "freetube",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0f93b899622f8..f70bf3cfba639 100644
--- a/package.json
+++ b/package.json
@@ -148,5 +148,5 @@
     "test": "run-s rebuild:node pack:workers jest",
     "test:watch": "run-s rebuild:node pack:workers jest:watch"
   },
-  "version": "0.13.1"
+  "version": "0.13.2"
 }

From c2c555573eb373e5a4dfbac8533a711ed236bb2f Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Thu, 16 Jun 2022 00:41:01 +0200
Subject: [PATCH 002/105] Fix the YouTube GDPR cookie not being sent along with
 requests (#2316)

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

diff --git a/src/main/index.js b/src/main/index.js
index dbf6378eb3c1d..6a1582ab54526 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -147,7 +147,8 @@ function runApp() {
       session.defaultSession.cookies.set({
         url: url,
         name: 'CONSENT',
-        value: 'YES+'
+        value: 'YES+',
+        sameSite: 'no_restriction'
       })
     })
 

From c12d64c389a7bb1ecde6b4727859852701cb8baf Mon Sep 17 00:00:00 2001
From: bob1520 <80553357+hockerschwan@users.noreply.github.com>
Date: Wed, 15 Jun 2022 22:41:26 +0000
Subject: [PATCH 003/105] add ? and * (#2318)

---
 src/renderer/store/modules/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index a0884a858de3e..a8bdb99e267b5 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -326,7 +326,7 @@ const actions = {
       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 => {
+        const noForbiddenChars = ['<', '>', ':', '"', '/', '|', '?', '*'].every(char => {
           return parsedString.indexOf(char) === -1
         })
         if (!noForbiddenChars) {

From d1fc87da44ba558d5f428a10768ea7da9051e127 Mon Sep 17 00:00:00 2001
From: bob1520 <80553357+hockerschwan@users.noreply.github.com>
Date: Sun, 19 Jun 2022 18:39:42 +0000
Subject: [PATCH 004/105] loop button color (#2313)

---
 src/renderer/components/ft-video-player/ft-video-player.js | 4 ++--
 1 file changed, 2 insertions(+), 2 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 fcdab490af703..2152a343fb32f 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -1167,8 +1167,8 @@ export default Vue.extend({
 
     toggleVideoLoop: async function () {
       if (!this.player.loop()) {
-        const currentTheme = localStorage.getItem('mainColor')
-        const colorNames = this.$store.state.utils.colorClasses
+        const currentTheme = this.$store.state.settings.mainColor
+        const colorNames = this.$store.state.utils.colorNames
         const colorValues = this.$store.state.utils.colorValues
 
         const nameIndex = colorNames.findIndex((color) => {

From c9c6b38627b61dce8b047f16cfd1b9a369b272e0 Mon Sep 17 00:00:00 2001
From: Svallinn <41585298+Svallinn@users.noreply.github.com>
Date: Sun, 19 Jun 2022 20:09:24 +0100
Subject: [PATCH 005/105] Utils+Everywhere: Add a start offset tolerance for
 the external player (#2326)

If a current video is practically over or the value in
the history's watch progress is almost the same as the length
of the video, it's safe to deduce that if the external player
button is clicked, the user is most likely just rewatching
the video, making no sense to pass a start offset to it
---
 src/renderer/components/ft-list-video/ft-list-video.js       | 1 +
 src/renderer/components/watch-video-info/watch-video-info.js | 1 +
 src/renderer/store/modules/utils.js                          | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

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 682ecef111c4b..5f31a7ff0cbc0 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.js
+++ b/src/renderer/components/ft-list-video/ft-list-video.js
@@ -252,6 +252,7 @@ export default Vue.extend({
         watchProgress: this.watchProgress,
         playbackRate: this.defaultPlayback,
         videoId: this.id,
+        videoLength: this.data.lengthSeconds,
         playlistId: this.playlistId,
         playlistIndex: this.playlistIndex,
         playlistReverse: this.playlistReverse,
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 8f2518fe97744..0d218f2baf18f 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.js
+++ b/src/renderer/components/watch-video-info/watch-video-info.js
@@ -303,6 +303,7 @@ export default Vue.extend({
         watchProgress: this.getTimestamp(),
         playbackRate: this.defaultPlayback,
         videoId: this.id,
+        videoLength: this.lengthSeconds,
         playlistId: this.playlistId,
         playlistIndex: this.getPlaylistIndex(),
         playlistReverse: this.getPlaylistReverse(),
diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index a8bdb99e267b5..d0d2be5e7e6dd 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -895,7 +895,7 @@ const actions = {
       args.push(...defaultCustomArguments)
     }
 
-    if (payload.watchProgress > 0) {
+    if (payload.watchProgress > 0 && payload.watchProgress < payload.videoLength - 10) {
       if (typeof cmdArgs.startOffset === 'string') {
         args.push(`${cmdArgs.startOffset}${payload.watchProgress}`)
       } else {

From 7dbed0e943e0b880a5b1f2d556b863b02fb40611 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 19 Jun 2022 21:27:11 +0200
Subject: [PATCH 006/105] Allow the lint workflow to run on all RC branches
 (#2337)

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

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 7402cf3fb1d1e..fe72c0b3df81f 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -6,7 +6,7 @@ name: Linter
 # events but only for the master branch
 on:
   pull_request:
-    branches: [ master, development ]
+    branches: [ master, development, '**-RC' ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:

From 21f3862135309702eeeca5a02a14dfb277e4e62a Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Mon, 20 Jun 2022 04:01:59 +0200
Subject: [PATCH 007/105] Fix the theming of the share menu logos for the
 system, black and dracula themes (#2330)

---
 .../ft-share-button/ft-share-button.sass         | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/ft-share-button/ft-share-button.sass b/src/renderer/components/ft-share-button/ft-share-button.sass
index 21239972714a3..f5a7e1158bf31 100644
--- a/src/renderer/components/ft-share-button/ft-share-button.sass
+++ b/src/renderer/components/ft-share-button/ft-share-button.sass
@@ -29,10 +29,15 @@
 		width: auto
 
 		@at-root
-			.dark &
+			.dark &, .system[data-system-theme*='dark'] &
 				filter: brightness(0.868)
 
-			.light &
+			.black &
+				filter: brightness(0.933)
+
+			/* no changes for the dracula theme */
+
+			.light &, .system[data-system-theme*='light'] &
 				filter: invert(0.87)
 
 	.invidious
@@ -48,8 +53,11 @@
 			margin-right: 2px
 
 			@at-root
-				.dark &
+				.dark &,
+				.black &,
+				.dracula &,
+				.system[data-system-theme*='dark'] &
 					background-image: url(~../../assets/img/invidious-logo-dark.svg)
 
-				.light &
+				.light &, .system[data-system-theme*='light'] &
 					background-image: url(~../../assets/img/invidious-logo-light.svg)

From c68704363e767681b3f1ddf2d313058c227727b5 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Mon, 20 Jun 2022 17:44:02 +0200
Subject: [PATCH 008/105] Fix emojis displaying incorrectly (#2328)

---
 src/renderer/App.css                                            | 2 +-
 .../watch-video-description/watch-video-description.css         | 2 +-
 src/renderer/videoJS.css                                        | 2 +-
 src/renderer/views/Channel/Channel.css                          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/App.css b/src/renderer/App.css
index dc7b3a870facf..70b98ebb20981 100644
--- a/src/renderer/App.css
+++ b/src/renderer/App.css
@@ -6,7 +6,7 @@
 #app {
   display: flex;
   flex-wrap: wrap;
-  font-family: 'Roboto', sans-serif;
+  font-family: 'Roboto', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
 }
 
 .routerView {
diff --git a/src/renderer/components/watch-video-description/watch-video-description.css b/src/renderer/components/watch-video-description/watch-video-description.css
index ef3c71c26a514..dc1d33c7d0799 100644
--- a/src/renderer/components/watch-video-description/watch-video-description.css
+++ b/src/renderer/components/watch-video-description/watch-video-description.css
@@ -4,7 +4,7 @@
 }
 
 .description {
-  font-family: 'Roboto', sans-serif;
+  font-family: 'Roboto', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
   font-size: 17px;
   white-space: pre-wrap;
 }
diff --git a/src/renderer/videoJS.css b/src/renderer/videoJS.css
index 8a3f4831cec61..7d56c1e272142 100644
--- a/src/renderer/videoJS.css
+++ b/src/renderer/videoJS.css
@@ -350,7 +350,7 @@
   line-height: 1;
   font-weight: normal;
   font-style: normal;
-  font-family: Arial, Helvetica, sans-serif;
+  font-family: Arial, Helvetica, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
   word-break: initial;
 }
 .video-js:-moz-full-screen {
diff --git a/src/renderer/views/Channel/Channel.css b/src/renderer/views/Channel/Channel.css
index 1c7109bcfe925..c117485107f44 100644
--- a/src/renderer/views/Channel/Channel.css
+++ b/src/renderer/views/Channel/Channel.css
@@ -108,7 +108,7 @@
 }
 
 .aboutInfo {
-  font-family: 'Roboto', sans-serif;
+  font-family: 'Roboto', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
   font-size: 17px;
   white-space: pre-wrap;
 }

From 2be06bfa93c2caceb354a83795ee64da9028030f Mon Sep 17 00:00:00 2001
From: bob1520 <80553357+hockerschwan@users.noreply.github.com>
Date: Tue, 21 Jun 2022 01:44:03 +0000
Subject: [PATCH 009/105] Fix download filename problems (#2310)

* fix "illegal" filename and EISDIR

* check download folder exists
---
 src/renderer/store/modules/utils.js | 49 ++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index d0d2be5e7e6dd..911385c81457e 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -1,6 +1,7 @@
 import IsEqual from 'lodash.isequal'
 import FtToastEvents from '../../components/ft-toast/ft-toast-events'
 import fs from 'fs'
+import path from 'path'
 import i18n from '../../i18n/index'
 
 import { IpcChannels } from '../../../constants'
@@ -180,8 +181,41 @@ 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 }) {
-    const fileName = `${title}.${extension}`
+    const fileName = `${await dispatch('replaceFilenameForbiddenChars', title)}.${extension}`
     const usingElectron = rootState.settings.usingElectron
     const locale = i18n._vm.locale
     const translations = i18n._vm.messages[locale]
@@ -213,6 +247,19 @@ const actions = {
       }
 
       folderPath = response.filePath
+    } else {
+      if (!fs.existsSync(folderPath)) {
+        try {
+          fs.mkdirSync(folderPath, { recursive: true })
+        } catch (err) {
+          console.error(err)
+          this.showToast({
+            message: err
+          })
+          return
+        }
+      }
+      folderPath = path.join(folderPath, fileName)
     }
 
     dispatch('showToast', {

From 6c198b47a3778738d42fbec3028607d93ef9ba86 Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Tue, 21 Jun 2022 10:31:56 +0800
Subject: [PATCH 010/105] * Update app menu to add item for new window (#2314)

with keyboard shortcut
---
 src/main/index.js         | 16 +++++++++++++++-
 static/locales/en-US.yaml |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/index.js b/src/main/index.js
index 6a1582ab54526..ca7e0f3e27b25 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -770,7 +770,21 @@ function runApp() {
     const template = [
       {
         label: 'File',
-        submenu: [{ role: 'quit' }]
+        submenu: [
+          {
+            label: 'New Window',
+            accelerator: 'CmdOrCtrl+N',
+            click: (_menuItem, _browserWindow, _event) => {
+              createWindow({
+                replaceMainWindow: false,
+                showWindowNow: true
+              })
+            },
+            type: 'normal'
+          },
+          { type: 'separator' },
+          { role: 'quit' }
+        ]
       },
       {
         label: 'Edit',
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index f47df3ad1d1d9..e5eac17d8dde2 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -7,6 +7,7 @@ FreeTube: FreeTube
 
 # Webkit Menu Bar
 File: File
+New Window: New Window
 Quit: Quit
 Edit: Edit
 Undo: Undo

From dd879b68c1871b2f38d9f72af42bf902e6d2c714 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 21 Jun 2022 04:33:53 +0200
Subject: [PATCH 011/105] Fix removing the meta files when navigating to a new
 video (#2345)

---
 src/renderer/views/Watch/Watch.js | 41 +++++++++++++++++--------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index c3210f1516471..a26fe1003f286 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -29,11 +29,11 @@ export default Vue.extend({
     'watch-video-recommendations': WatchVideoRecommendations
   },
   beforeRouteLeave: function (to, from, next) {
-    this.handleRouteChange()
+    this.handleRouteChange(this.videoId)
     window.removeEventListener('beforeunload', this.handleWatchProgress)
     next()
   },
-  data: function() {
+  data: function () {
     return {
       isLoading: false,
       firstLoad: true,
@@ -144,13 +144,13 @@ export default Vue.extend({
     hideVideoLikesAndDislikes: function () {
       return this.$store.getters.getHideVideoLikesAndDislikes
     },
-    theatrePossible: function() {
+    theatrePossible: function () {
       return !this.hideRecommendedVideos || (!this.hideLiveChat && this.isLive) || this.watchingPlaylist
     }
   },
   watch: {
     $route() {
-      this.handleRouteChange()
+      this.handleRouteChange(this.videoId)
       // react to route changes...
       this.videoId = this.$route.params.id
 
@@ -220,14 +220,14 @@ export default Vue.extend({
     window.addEventListener('beforeunload', this.handleWatchProgress)
   },
   methods: {
-    changeTimestamp: function(timestamp) {
+    changeTimestamp: function (timestamp) {
       this.$refs.videoPlayer.player.currentTime(timestamp)
     },
-    toggleTheatreMode: function() {
+    toggleTheatreMode: function () {
       this.useTheatreMode = !this.useTheatreMode
     },
 
-    getVideoInformationLocal: function() {
+    getVideoInformationLocal: function () {
       if (this.firstLoad) {
         this.isLoading = true
       }
@@ -535,7 +535,7 @@ export default Vue.extend({
         })
     },
 
-    getVideoInformationInvidious: function() {
+    getVideoInformationInvidious: function () {
       if (this.firstLoad) {
         this.isLoading = true
       }
@@ -967,7 +967,11 @@ export default Vue.extend({
       this.playNextCountDownIntervalId = setInterval(showCountDownMessage, 1000)
     },
 
-    handleRouteChange: async function () {
+    handleRouteChange: async function (videoId) {
+      // if the user navigates to another video, the ipc call for the userdata path
+      // takes long enough for the video id to have already changed to the new one
+      // receiving it as an arg instead of accessing it ourselves means we always have the right one
+
       clearTimeout(this.playNextTimeout)
       clearInterval(this.playNextCountDownIntervalId)
 
@@ -977,14 +981,13 @@ export default Vue.extend({
         const player = this.$refs.videoPlayer.player
 
         if (player !== null && !player.paused() && player.isInPictureInPicture()) {
-          const playerId = this.videoId
           setTimeout(() => {
             player.play()
             player.on('leavepictureinpicture', (event) => {
               const watchTime = player.currentTime()
               if (this.$route.fullPath.includes('/watch')) {
                 const routeId = this.$route.params.id
-                if (routeId === playerId) {
+                if (routeId === videoId) {
                   const activePlayer = $('.ftVideoPlayer video').get(0)
                   activePlayer.currentTime = watchTime
                 }
@@ -1000,23 +1003,23 @@ export default Vue.extend({
       if (this.removeVideoMetaFiles) {
         const userData = await this.getUserDataPath()
         if (this.isDev) {
-          const dashFileLocation = `static/dashFiles/${this.videoId}.xml`
-          const vttFileLocation = `static/storyboards/${this.videoId}.vtt`
+          const dashFileLocation = `static/dashFiles/${videoId}.xml`
+          const vttFileLocation = `static/storyboards/${videoId}.vtt`
           // only delete the file it actually exists
-          if (fs.existsSync('static/dashFiles/') && fs.existsSync(dashFileLocation)) {
+          if (fs.existsSync(dashFileLocation)) {
             fs.rmSync(dashFileLocation)
           }
-          if (fs.existsSync('static/storyboards/') && fs.existsSync(vttFileLocation)) {
+          if (fs.existsSync(vttFileLocation)) {
             fs.rmSync(vttFileLocation)
           }
         } else {
-          const dashFileLocation = `${userData}/dashFiles/${this.videoId}.xml`
-          const vttFileLocation = `${userData}/storyboards/${this.videoId}.vtt`
+          const dashFileLocation = `${userData}/dashFiles/${videoId}.xml`
+          const vttFileLocation = `${userData}/storyboards/${videoId}.vtt`
 
-          if (fs.existsSync(`${userData}/dashFiles/`) && fs.existsSync(dashFileLocation)) {
+          if (fs.existsSync(dashFileLocation)) {
             fs.rmSync(dashFileLocation)
           }
-          if (fs.existsSync(`${userData}/storyboards/`) && fs.existsSync(vttFileLocation)) {
+          if (fs.existsSync(vttFileLocation)) {
             fs.rmSync(vttFileLocation)
           }
         }

From 4a5d0916531f52377177877fd40d83332eed59c4 Mon Sep 17 00:00:00 2001
From: bob1520 <80553357+hockerschwan@users.noreply.github.com>
Date: Fri, 24 Jun 2022 21:53:00 +0000
Subject: [PATCH 012/105] clear filter in userplaylists and history when
 clicked "clear input" (#2350)

---
 src/renderer/components/ft-input/ft-input.js       | 2 ++
 src/renderer/views/History/History.vue             | 1 +
 src/renderer/views/UserPlaylists/UserPlaylists.vue | 1 +
 3 files changed, 4 insertions(+)

diff --git a/src/renderer/components/ft-input/ft-input.js b/src/renderer/components/ft-input/ft-input.js
index f4fb14c9aa774..98d2afae72623 100644
--- a/src/renderer/components/ft-input/ft-input.js
+++ b/src/renderer/components/ft-input/ft-input.js
@@ -126,6 +126,8 @@ export default Vue.extend({
 
       // Focus on input element after text is clear for better UX
       inputElement.focus()
+
+      this.$emit('clear')
     },
 
     handleActionIconChange: function() {
diff --git a/src/renderer/views/History/History.vue b/src/renderer/views/History/History.vue
index 9703421c5d7b9..4b6e64242deee 100644
--- a/src/renderer/views/History/History.vue
+++ b/src/renderer/views/History/History.vue
@@ -16,6 +16,7 @@
         :show-clear-text-button="true"
         :show-action-button="false"
         @input="(input) => query = input"
+        @clear="query = ''"
       />
       <ft-flex-box
         v-show="fullData.length === 0"
diff --git a/src/renderer/views/UserPlaylists/UserPlaylists.vue b/src/renderer/views/UserPlaylists/UserPlaylists.vue
index 06c19bcddf01c..09097ef8f2186 100644
--- a/src/renderer/views/UserPlaylists/UserPlaylists.vue
+++ b/src/renderer/views/UserPlaylists/UserPlaylists.vue
@@ -23,6 +23,7 @@
         :show-clear-text-button="true"
         :show-action-button="false"
         @input="(input) => query = input"
+        @clear="query = ''"
       />
       <ft-flex-box
         v-show="fullData.length === 0"

From 2bee1f1cc6507f0a85b588f04bd3910ec1c2c1d9 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Thu, 30 Jun 2022 20:54:05 +0200
Subject: [PATCH 013/105] Fix right clicking on links being treated as link
 clicks (#2356)

---
 src/renderer/App.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/renderer/App.js b/src/renderer/App.js
index 74780713867d4..fee872301e9a7 100644
--- a/src/renderer/App.js
+++ b/src/renderer/App.js
@@ -334,14 +334,17 @@ export default Vue.extend({
       })
 
       $(document).on('auxclick', 'a[href^="http"]', (event) => {
-        this.handleLinkClick(event)
+        // auxclick fires for all clicks not performed with the primary button
+        // only handle the link click if it was the middle button,
+        // otherwise the context menu breaks
+        if (event.button === 1) {
+          this.handleLinkClick(event)
+        }
       })
     },
 
     handleLinkClick: function (event) {
       const el = event.currentTarget
-      console.log(this.usingElectron)
-      console.log(el)
       event.preventDefault()
 
       // Check if it's a YouTube link

From 7a374ac3122ca912af88e0d9b267ce3d10f12d19 Mon Sep 17 00:00:00 2001
From: bob1520 <80553357+hockerschwan@users.noreply.github.com>
Date: Fri, 1 Jul 2022 08:30:00 +0000
Subject: [PATCH 014/105] search suggestion out of index (#2354)

---
 src/renderer/components/ft-input/ft-input.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/ft-input/ft-input.js b/src/renderer/components/ft-input/ft-input.js
index 98d2afae72623..052112010520f 100644
--- a/src/renderer/components/ft-input/ft-input.js
+++ b/src/renderer/components/ft-input/ft-input.js
@@ -199,13 +199,13 @@ export default Vue.extend({
     },
 
     handleKeyDown: function (keyCode) {
-      if (this.dataList.length === 0) { return }
+      if (this.visibleDataList.length === 0) { return }
       // Update selectedOption based on arrow key pressed
       if (keyCode === 40) {
-        this.searchState.selectedOption = (this.searchState.selectedOption + 1) % this.dataList.length
+        this.searchState.selectedOption = (this.searchState.selectedOption + 1) % this.visibleDataList.length
       } else if (keyCode === 38) {
-        if (this.searchState.selectedOption === -1) {
-          this.searchState.selectedOption = this.dataList.length - 1
+        if (this.searchState.selectedOption < 1) {
+          this.searchState.selectedOption = this.visibleDataList.length - 1
         } else {
           this.searchState.selectedOption--
         }

From 04c276ca73a62db8c9ecdeddc38b9acbf0c469e9 Mon Sep 17 00:00:00 2001
From: Luca Hohmann <34301369+GilgusMaximus@users.noreply.github.com>
Date: Thu, 7 Jul 2022 21:04:08 +0200
Subject: [PATCH 015/105] Fix blog banner layout (#2300) (#2383)

* Fix blog banner layout

* Fix banner stretching with no content

Co-authored-by: vallode <18506096+vallode@users.noreply.github.com>
---
 src/renderer/App.css |  8 +++++---
 src/renderer/App.vue | 32 ++++++++++++++++----------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/renderer/App.css b/src/renderer/App.css
index 70b98ebb20981..11b789b33de6e 100644
--- a/src/renderer/App.css
+++ b/src/renderer/App.css
@@ -15,12 +15,14 @@
 }
 
 .banner {
-  width: 85%;
+  margin: 16px auto 0 auto;
+  width: 90%;
 }
 
 .flexBox {
-  margin-top: 60px;
-  margin-bottom: -75px;
+  margin: 0;
+  flex: 1 1 0%;
+  flex-direction: column;
 }
 
 #changeLogText {
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 9b00dc4086586..569693173cd9c 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -9,10 +9,8 @@
   >
     <top-nav ref="topNav" />
     <side-nav ref="sideNav" />
-    <ft-flex-box
-      v-if="showUpdatesBanner || showBlogBanner"
-      class="flexBox routerView"
-    >
+
+    <ft-flex-box class="flexBox">
       <ft-notification-banner
         v-if="showUpdatesBanner"
         class="banner"
@@ -25,19 +23,21 @@
         :message="blogBannerMessage"
         @click="handleNewBlogBannerClick"
       />
+
+      <transition
+        v-if="dataReady"
+        mode="out-in"
+        name="fade"
+      >
+        <!-- <keep-alive> -->
+        <RouterView
+          ref="router"
+          class="routerView"
+        />
+        <!-- </keep-alive> -->
+      </transition>
     </ft-flex-box>
-    <transition
-      v-if="dataReady"
-      mode="out-in"
-      name="fade"
-    >
-      <!-- <keep-alive> -->
-      <RouterView
-        ref="router"
-        class="routerView"
-      />
-      <!-- </keep-alive> -->
-    </transition>
+
     <ft-prompt
       v-if="showReleaseNotes"
       @click="showReleaseNotes = !showReleaseNotes"

From 11db87f369626295b2ffef5a2d3ce773899a8d71 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sat, 9 Jul 2022 17:30:02 +0200
Subject: [PATCH 016/105] Fix long video links in the video description
 breaking the layout (#2382)

---
 .../watch-video-description/watch-video-description.css          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/components/watch-video-description/watch-video-description.css b/src/renderer/components/watch-video-description/watch-video-description.css
index dc1d33c7d0799..c34953dde31f6 100644
--- a/src/renderer/components/watch-video-description/watch-video-description.css
+++ b/src/renderer/components/watch-video-description/watch-video-description.css
@@ -7,4 +7,5 @@
   font-family: 'Roboto', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
   font-size: 17px;
   white-space: pre-wrap;
+  overflow-wrap: anywhere;
 }

From d9bce866449de32c77073bf541b48b51d10b94a1 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sat, 9 Jul 2022 19:31:35 +0200
Subject: [PATCH 017/105] Fixes search suggestion issues with arrow keys
 (#2371)

* Fix cursor moving while cycling through search suggestions

* Fix the search suggestions changing for all keyboard events

* Remove use of deprecated event.keyCode
---
 src/renderer/components/ft-input/ft-input.js  | 15 +++++++--------
 src/renderer/components/ft-input/ft-input.vue |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/renderer/components/ft-input/ft-input.js b/src/renderer/components/ft-input/ft-input.js
index 052112010520f..e1a6ae695af17 100644
--- a/src/renderer/components/ft-input/ft-input.js
+++ b/src/renderer/components/ft-input/ft-input.js
@@ -184,7 +184,7 @@ export default Vue.extend({
 
       if (inputElement !== null) {
         inputElement.addEventListener('keydown', (event) => {
-          if (event.keyCode === 13) {
+          if (event.key === 'Enter') {
             this.handleClick()
           }
         })
@@ -198,12 +198,12 @@ export default Vue.extend({
       this.handleClick()
     },
 
-    handleKeyDown: function (keyCode) {
+    handleKeyDown: function (event) {
       if (this.visibleDataList.length === 0) { return }
       // Update selectedOption based on arrow key pressed
-      if (keyCode === 40) {
+      if (event.key === 'ArrowDown') {
         this.searchState.selectedOption = (this.searchState.selectedOption + 1) % this.visibleDataList.length
-      } else if (keyCode === 38) {
+      } else if (event.key === 'ArrowUp') {
         if (this.searchState.selectedOption < 1) {
           this.searchState.selectedOption = this.visibleDataList.length - 1
         } else {
@@ -214,14 +214,13 @@ export default Vue.extend({
       }
 
       // Key pressed isn't enter
-      if (keyCode !== 13) {
+      if (event.key !== 'Enter') {
         this.searchState.showOptions = true
       }
       // Update Input box value if arrow keys were pressed
-      if ((keyCode === 40 || keyCode === 38) && this.searchState.selectedOption !== -1) {
+      if ((event.key === 'ArrowDown' || event.key === 'ArrowUp') && this.searchState.selectedOption !== -1) {
+        event.preventDefault()
         this.inputData = this.visibleDataList[this.searchState.selectedOption]
-      } else {
-        this.updateVisibleDataList()
       }
     },
 
diff --git a/src/renderer/components/ft-input/ft-input.vue b/src/renderer/components/ft-input/ft-input.vue
index 26c321f3ae191..91f9eb7f953ea 100644
--- a/src/renderer/components/ft-input/ft-input.vue
+++ b/src/renderer/components/ft-input/ft-input.vue
@@ -49,7 +49,7 @@
       @input="e => handleInput(e.target.value)"
       @focus="handleFocus"
       @blur="handleInputBlur"
-      @keydown="e => handleKeyDown(e.keyCode)"
+      @keydown="handleKeyDown"
     >
     <font-awesome-icon
       v-if="showActionButton"

From e6fdfa5f7ddfccf4cd840b781f7d15a66555929b Mon Sep 17 00:00:00 2001
From: Luca Hohmann <34301369+GilgusMaximus@users.noreply.github.com>
Date: Sat, 16 Jul 2022 11:30:20 +0200
Subject: [PATCH 018/105] Fix for banner and too far scrolling (#2398)

* Fix for banner and too far scrolling

* Update App.css
---
 src/renderer/App.css | 13 +++++++------
 src/renderer/App.vue | 36 ++++++++++++++++++++----------------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/renderer/App.css b/src/renderer/App.css
index 11b789b33de6e..f04531d2c82dd 100644
--- a/src/renderer/App.css
+++ b/src/renderer/App.css
@@ -7,6 +7,7 @@
   display: flex;
   flex-wrap: wrap;
   font-family: 'Roboto', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+  height: 100%;
 }
 
 .routerView {
@@ -15,14 +16,13 @@
 }
 
 .banner {
-  margin: 16px auto 0 auto;
-  width: 90%;
+  width: 80%;
+  margin: 0 auto;
 }
 
 .flexBox {
-  margin: 0;
-  flex: 1 1 0%;
-  flex-direction: column;
+  margin-top: 60px;
+  display: block;
 }
 
 #changeLogText {
@@ -44,7 +44,8 @@
   }
 
   .banner {
-    width: 90%;
+    width: 80%;
+    margin-top: 60px;
   }
 
   .flexBox {
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 569693173cd9c..85d2e18b49da0 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -9,21 +9,25 @@
   >
     <top-nav ref="topNav" />
     <side-nav ref="sideNav" />
-
-    <ft-flex-box class="flexBox">
-      <ft-notification-banner
-        v-if="showUpdatesBanner"
-        class="banner"
-        :message="updateBannerMessage"
-        @click="handleUpdateBannerClick"
-      />
-      <ft-notification-banner
-        v-if="showBlogBanner"
-        class="banner"
-        :message="blogBannerMessage"
-        @click="handleNewBlogBannerClick"
-      />
-
+    <ft-flex-box
+      class="flexBox routerView"
+    >
+      <div
+        v-if="showUpdatesBanner || showBlogBanner"
+      >
+        <ft-notification-banner
+          v-if="showUpdatesBanner"
+          class="banner"
+          :message="updateBannerMessage"
+          @click="handleUpdateBannerClick"
+        />
+        <ft-notification-banner
+          v-if="showBlogBanner"
+          class="banner"
+          :message="blogBannerMessage"
+          @click="handleNewBlogBannerClick"
+        />
+      </div>
       <transition
         v-if="dataReady"
         mode="out-in"
@@ -34,7 +38,7 @@
           ref="router"
           class="routerView"
         />
-        <!-- </keep-alive> -->
+      <!-- </keep-alive> -->
       </transition>
     </ft-flex-box>
 

From 7ec1c1eb05738d9d45b1e2e5d3321cc086c0176f Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Thu, 28 Jul 2022 01:57:52 +0800
Subject: [PATCH 019/105] ! Fix style issue introduced in
 https://github.com/FreeTubeApp/FreeTube/pull/2398 (#2405)

---
 src/renderer/App.css | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/renderer/App.css b/src/renderer/App.css
index f04531d2c82dd..00e1d282709bf 100644
--- a/src/renderer/App.css
+++ b/src/renderer/App.css
@@ -17,11 +17,10 @@
 
 .banner {
   width: 80%;
-  margin: 0 auto;
+  margin: 20px auto 0;
 }
 
 .flexBox {
-  margin-top: 60px;
   display: block;
 }
 
@@ -45,7 +44,7 @@
 
   .banner {
     width: 80%;
-    margin-top: 60px;
+    margin-top: 20px;
   }
 
   .flexBox {

From 651e95f7a033785ada43a460db5336a79c227326 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 31 Jul 2022 16:09:12 +0200
Subject: [PATCH 020/105] Fix scrolling through the download dropdown (#2425)

* Fix scrolling through the download dropdown

* Fix lining issue
---
 .../components/watch-video-info/watch-video-info.js  | 12 ++++++++++++
 .../components/watch-video-info/watch-video-info.vue |  1 +
 src/renderer/views/Watch/Watch.js                    |  3 ++-
 src/renderer/views/Watch/Watch.sass                  |  6 +++++-
 src/renderer/views/Watch/Watch.vue                   |  6 +++++-
 5 files changed, 25 insertions(+), 3 deletions(-)

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 0d218f2baf18f..f47f93179a89c 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.js
+++ b/src/renderer/components/watch-video-info/watch-video-info.js
@@ -292,6 +292,18 @@ export default Vue.extend({
           }
         ]
       })
+
+      this.$watch('$refs.downloadButton.dropdownShown', (dropdownShown) => {
+        this.$parent.infoAreaSticky = !dropdownShown
+
+        if (dropdownShown && window.innerWidth >= 901) {
+          // adds a slight delay so we know that the dropdown has shown up
+          // and won't mess up our scrolling
+          Promise.resolve().then(() => {
+            this.$parent.$refs.infoArea.scrollIntoView()
+          })
+        }
+      })
     }
   },
   methods: {
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 fbece05d04cb2..15b6bc0e1226f 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.vue
+++ b/src/renderer/components/watch-video-info/watch-video-info.vue
@@ -95,6 +95,7 @@
         />
         <ft-icon-button
           v-if="!isUpcoming && downloadLinks.length > 0"
+          ref="downloadButton"
           :title="$t('Video.Download Video')"
           class="option"
           theme="secondary"
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index a26fe1003f286..cf08e3ccd9b54 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -76,7 +76,8 @@ export default Vue.extend({
       timestamp: null,
       playNextTimeout: null,
       playNextCountDownIntervalId: null,
-      pictureInPictureButtonInverval: null
+      pictureInPictureButtonInverval: null,
+      infoAreaSticky: true
     }
   },
   computed: {
diff --git a/src/renderer/views/Watch/Watch.sass b/src/renderer/views/Watch/Watch.sass
index 2c566255dbd5c..511b8206ce7e1 100644
--- a/src/renderer/views/Watch/Watch.sass
+++ b/src/renderer/views/Watch/Watch.sass
@@ -68,7 +68,11 @@
     grid-area: info
     position: relative
 
-    @media only screen and (min-width: 901px)
+  @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 91b4679bb1c5b..628151c4f6b7c 100644
--- a/src/renderer/views/Watch/Watch.vue
+++ b/src/renderer/views/Watch/Watch.vue
@@ -64,7 +64,11 @@
         </div>
       </div>
     </div>
-    <div class="infoArea">
+    <div
+      ref="infoArea"
+      class="infoArea"
+      :class="{ infoAreaSticky }"
+    >
       <watch-video-info
         v-if="!isLoading"
         :id="videoId"

From 4abcb7df15cb9c19d92b14202c460a9407314e4c Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 31 Jul 2022 21:36:52 +0200
Subject: [PATCH 021/105] Fix banner width (#2431)

---
 src/renderer/App.css | 6 +++++-
 src/renderer/App.vue | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/renderer/App.css b/src/renderer/App.css
index 00e1d282709bf..d5e9fdfd805e5 100644
--- a/src/renderer/App.css
+++ b/src/renderer/App.css
@@ -16,10 +16,14 @@
 }
 
 .banner {
-  width: 80%;
+  width: 85%;
   margin: 20px auto 0;
 }
 
+.banner-wrapper {
+  margin: 0 10px;
+}
+
 .flexBox {
   display: block;
 }
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 85d2e18b49da0..7684e01af5117 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -14,6 +14,7 @@
     >
       <div
         v-if="showUpdatesBanner || showBlogBanner"
+        class="banner-wrapper"
       >
         <ft-notification-banner
           v-if="showUpdatesBanner"

From 1ec55aff1644ecd2b3433d99193424e813a17b3c Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 31 Jul 2022 15:37:47 -0400
Subject: [PATCH 022/105] Respect autoplay playlists setting (#2429)

---
 src/renderer/views/Watch/Watch.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index cf08e3ccd9b54..b490833e69b2b 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -129,6 +129,9 @@ export default Vue.extend({
     playNextVideo: function () {
       return this.$store.getters.getPlayNextVideo
     },
+    autoplayPlaylists: function () {
+      return this.$store.getters.getAutoplayPlaylists
+    },
     hideRecommendedVideos: function () {
       return this.$store.getters.getHideRecommendedVideos
     },
@@ -915,7 +918,7 @@ export default Vue.extend({
     },
 
     handleVideoEnded: function () {
-      if (!this.watchingPlaylist && !this.playNextVideo) {
+      if ((!this.watchingPlaylist || !this.autoplayPlaylists) && !this.playNextVideo) {
         return
       }
 

From 79c338df5686515d98aa7ce694e1c7122f402c06 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 31 Jul 2022 20:25:57 -0400
Subject: [PATCH 023/105] Change URL for proxy test (#2433)

---
 src/renderer/components/proxy-settings/proxy-settings.js | 9 ++++-----
 .../components/proxy-settings/proxy-settings.vue         | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/renderer/components/proxy-settings/proxy-settings.js b/src/renderer/components/proxy-settings/proxy-settings.js
index 1f536e17a49bf..eaf65d42d3666 100644
--- a/src/renderer/components/proxy-settings/proxy-settings.js
+++ b/src/renderer/components/proxy-settings/proxy-settings.js
@@ -31,8 +31,7 @@ export default Vue.extend({
     return {
       isLoading: false,
       dataAvailable: false,
-      proxyTestUrl: 'https://api.ipify.org?format=json',
-      proxyTestUrl1: 'https://freegeoip.app/json/',
+      proxyTestUrl: 'https://ipwho.is/',
       proxyId: '',
       proxyCountry: '',
       proxyRegion: '',
@@ -125,11 +124,11 @@ export default Vue.extend({
       if (!this.useProxy) {
         this.enableProxy()
       }
-      $.getJSON(this.proxyTestUrl1, (response) => {
+      $.getJSON(this.proxyTestUrl, (response) => {
         console.log(response)
         this.proxyIp = response.ip
-        this.proxyCountry = response.country_name
-        this.proxyRegion = response.region_name
+        this.proxyCountry = response.country
+        this.proxyRegion = response.region
         this.proxyCity = response.city
         this.dataAvailable = true
       }).fail((xhr, textStatus, error) => {
diff --git a/src/renderer/components/proxy-settings/proxy-settings.vue b/src/renderer/components/proxy-settings/proxy-settings.vue
index 2ead1dfe911a1..594aab60f9fd1 100644
--- a/src/renderer/components/proxy-settings/proxy-settings.vue
+++ b/src/renderer/components/proxy-settings/proxy-settings.vue
@@ -45,7 +45,7 @@
         class="center"
         :style="{opacity: useProxy ? 1 : 0.4}"
       >
-        {{ $t('Settings.Proxy Settings.Clicking on Test Proxy will send a request to') }} https://freegeoip.app/json/
+        {{ $t('Settings.Proxy Settings.Clicking on Test Proxy will send a request to') }} {{ proxyTestUrl }}
       </p>
       <ft-flex-box>
         <ft-button

From 45f80b550d0f786a3bdaabce292ae695e7bc66b3 Mon Sep 17 00:00:00 2001
From: namazso <admin@namazso.eu>
Date: Mon, 10 Apr 2023 13:48:40 +0200
Subject: [PATCH 024/105] Remove invidious.namazso.eu (#3417)

---
 static/invidious-instances.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/static/invidious-instances.json b/static/invidious-instances.json
index 9dcd60b6d6c57..71e2eabf3ef1b 100644
--- a/static/invidious-instances.json
+++ b/static/invidious-instances.json
@@ -11,6 +11,5 @@
     { "url": "https://invidious.lunar.icu" },
     { "url": "https://invidious.weblibre.org" },
     { "url": "https://invidious.esmailelbob.xyz" },
-    { "url": "https://youtube.076.ne.jp" },
-    { "url": "https://invidious.namazso.eu" }
+    { "url": "https://youtube.076.ne.jp" }
 ]

From 31c8d1359e4ade03052335b4abf18bfeb342ed52 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Thu, 21 Dec 2023 04:27:49 +0100
Subject: [PATCH 025/105] Local API: Support extracting about information from
 YouTube's new about popup (#4370)

* Support extracting about information from YouTube's new about popup

* Update YouTube.js from 7.0.0 to 8.0.0
---
 package.json                                  |  2 +-
 .../components/channel-about/channel-about.js |  8 ++++
 .../channel-about/channel-about.vue           | 12 +++++-
 src/renderer/views/Channel/Channel.js         | 41 +++++++++++++++----
 src/renderer/views/Channel/Channel.vue        |  3 +-
 yarn.lock                                     |  8 ++--
 6 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index e51a34fbd847d..5e26c5ee1ebbc 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "vue-router": "^3.6.5",
     "vue-tiny-slider": "^0.1.39",
     "vuex": "^3.6.2",
-    "youtubei.js": "^6.4.1"
+    "youtubei.js": "^8.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.23.0",
diff --git a/src/renderer/components/channel-about/channel-about.js b/src/renderer/components/channel-about/channel-about.js
index feac9f71e23fe..3eb151e1b02bb 100644
--- a/src/renderer/components/channel-about/channel-about.js
+++ b/src/renderer/components/channel-about/channel-about.js
@@ -24,6 +24,10 @@ export default defineComponent({
       type: Number,
       default: null
     },
+    videos: {
+      type: Number,
+      default: null
+    },
     location: {
       type: String,
       default: null
@@ -61,5 +65,9 @@ export default defineComponent({
     formattedViews: function () {
       return formatNumber(this.views)
     },
+
+    formattedVideos: function () {
+      return formatNumber(this.videos)
+    },
   }
 })
diff --git a/src/renderer/components/channel-about/channel-about.vue b/src/renderer/components/channel-about/channel-about.vue
index e1100dbd15d63..5829f8bb58293 100644
--- a/src/renderer/components/channel-about/channel-about.vue
+++ b/src/renderer/components/channel-about/channel-about.vue
@@ -12,7 +12,7 @@
       />
     </template>
     <template
-      v-if="joined || views !== null || location"
+      v-if="joined || views !== null || videos !== null || location"
     >
       <h2>{{ $t('Channel.About.Details') }}</h2>
       <table
@@ -38,6 +38,16 @@
           </th>
           <td>{{ formattedViews }}</td>
         </tr>
+        <tr
+          v-if="videos !== null"
+        >
+          <th
+            scope="row"
+          >
+            {{ $t('Global.Videos') }}
+          </th>
+          <td>{{ formattedVideos }}</td>
+        </tr>
         <tr
           v-if="location"
         >
diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index 93ad7b5695ab9..51ed36aba0005 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -74,7 +74,8 @@ export default defineComponent({
       communityContinuationData: null,
       description: '',
       tags: [],
-      views: 0,
+      viewCount: 0,
+      videoCount: 0,
       joined: 0,
       location: null,
       videoSortBy: 'newest',
@@ -674,7 +675,8 @@ export default defineComponent({
           this.getChannelAboutLocal()
         } else {
           this.description = ''
-          this.views = null
+          this.viewCount = null
+          this.videoCount = null
           this.joined = 0
           this.location = null
         }
@@ -746,14 +748,36 @@ export default defineComponent({
         const channel = this.channelInstance
         const about = await channel.getAbout()
 
-        this.description = about.description.isEmpty() ? '' : autolinker.link(about.description.text)
+        if (about.type === 'ChannelAboutFullMetadata') {
+          /** @type {import('youtubei.js').YTNodes.ChannelAboutFullMetadata} */
+          const about_ = about
 
-        const views = extractNumberFromString(about.view_count.text)
-        this.views = isNaN(views) ? null : views
+          this.description = about_.description.isEmpty() ? '' : autolinker.link(about_.description.text)
 
-        this.joined = about.joined_date.isEmpty() ? 0 : new Date(about.joined_date.text.replace('Joined').trim())
+          const viewCount = extractNumberFromString(about_.view_count.text)
+          this.viewCount = isNaN(viewCount) ? null : viewCount
 
-        this.location = about.country.isEmpty() ? null : about.country.text
+          this.videoCount = null
+
+          this.joined = about_.joined_date.isEmpty() ? 0 : new Date(about_.joined_date.text.replace('Joined').trim())
+
+          this.location = about_.country.isEmpty() ? null : about_.country.text
+        } else {
+          /** @type {import('youtubei.js').YTNodes.AboutChannelView} */
+          const metadata = about.metadata
+
+          this.description = metadata.description ? autolinker.link(metadata.description) : ''
+
+          const viewCount = extractNumberFromString(metadata.view_count)
+          this.viewCount = isNaN(viewCount) ? null : viewCount
+
+          const videoCount = extractNumberFromString(metadata.video_count)
+          this.videoCount = isNaN(videoCount) ? null : videoCount
+
+          this.joined = metadata.joined_date.isEmpty() ? 0 : new Date(metadata.joined_date.text.replace('Joined').trim())
+
+          this.location = metadata.country ?? null
+        }
       } catch (err) {
         console.error(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
@@ -965,7 +989,8 @@ export default defineComponent({
         this.thumbnailUrl = youtubeImageUrlToInvidious(thumbnail, this.currentInvidiousInstance)
         this.updateSubscriptionDetails({ channelThumbnailUrl: thumbnail, channelName: channelName, channelId: channelId })
         this.description = autolinker.link(response.description)
-        this.views = response.totalViews
+        this.viewCount = response.totalViews
+        this.videoCount = null
         this.joined = response.joined > 0 ? new Date(response.joined * 1000) : 0
         this.relatedChannels = response.relatedChannels.map((channel) => {
           const thumbnailUrl = channel.authorThumbnails.at(-1).url
diff --git a/src/renderer/views/Channel/Channel.vue b/src/renderer/views/Channel/Channel.vue
index f8cfb0b5c6ed8..876ed8a5181dd 100644
--- a/src/renderer/views/Channel/Channel.vue
+++ b/src/renderer/views/Channel/Channel.vue
@@ -223,7 +223,8 @@
         id="aboutPanel"
         :description="description"
         :joined="joined"
-        :views="views"
+        :views="viewCount"
+        :videos="videoCount"
         :location="location"
         :tags="tags"
         :related-channels="relatedChannels"
diff --git a/yarn.lock b/yarn.lock
index f82875a64374f..f0c6ef1d438af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8918,10 +8918,10 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
   integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
 
-youtubei.js@^6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-6.4.1.tgz#d7a7c83cd7ddf8fedbaf3d2ab8a36840e233adf4"
-  integrity sha512-GVrDkJmF5t378SeDiZPEAoegZ1pxjbEzNyXTuiQnL5LzPSZKA3IoJwL8lBNlRMKyksI5RbieoHzULsEt4AIbFw==
+youtubei.js@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-8.0.0.tgz#0fcbe332e263d9be6afe4e3d1917e9ddc1ffbed3"
+  integrity sha512-kUwHvqoB5vfaGaY1quAGcX5JPIyjr5fjj9Zj/ZwUDCrermz/r5uIkNiJ5cNHkmAJbZP9fdygzNMvGHd7fM445g==
   dependencies:
     jintr "^1.1.0"
     tslib "^2.5.0"

From f1db161f1664fa8a83840ad32f1ac471d0448800 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Fri, 9 Feb 2024 17:39:01 +0100
Subject: [PATCH 026/105] Support YouTube using PageHeader on user channels not
 just auto-generated ones (#4543)

* Support YouTube using PageHeader on user channels not just auto-generated ones

* Bump YouTube.js to 9.0.2 as requested
---
 jsconfig.json                         |   3 +
 package.json                          |   2 +-
 src/renderer/helpers/api/local.js     | 206 ++++++++++++++++++++++----
 src/renderer/views/Channel/Channel.js | 117 +++------------
 yarn.lock                             |   8 +-
 5 files changed, 210 insertions(+), 126 deletions(-)

diff --git a/jsconfig.json b/jsconfig.json
index 8f5ea8a228e3c..6efa53c23ad98 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,5 +1,8 @@
 {
   "vueCompilerOptions": {
     "target": 2.7
+  },
+  "compilerOptions": {
+    "strictNullChecks": true
   }
 }
diff --git a/package.json b/package.json
index 5e26c5ee1ebbc..52f140d55ddc8 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "vue-router": "^3.6.5",
     "vue-tiny-slider": "^0.1.39",
     "vuex": "^3.6.2",
-    "youtubei.js": "^8.0.0"
+    "youtubei.js": "^9.0.2"
   },
   "devDependencies": {
     "@babel/core": "^7.23.0",
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index f95bca91ef4c7..5b3d7e11222f3 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -283,7 +283,9 @@ export async function getLocalChannelVideos(id) {
     // if the channel doesn't have a videos tab, YouTube returns the home tab instead
     // so we need to check that we got the right tab
     if (videosTab.current_tab?.endpoint.metadata.url?.endsWith('/videos')) {
-      return parseLocalChannelVideos(videosTab.videos, videosTab.header.author)
+      const { id: channelId = id, name } = parseLocalChannelHeader(videosTab)
+
+      return parseLocalChannelVideos(videosTab.videos, channelId, name)
     } else {
       return []
     }
@@ -313,7 +315,9 @@ export async function getLocalChannelLiveStreams(id) {
     // if the channel doesn't have a live tab, YouTube returns the home tab instead
     // so we need to check that we got the right tab
     if (liveStreamsTab.current_tab?.endpoint.metadata.url?.endsWith('/streams')) {
-      return parseLocalChannelVideos(liveStreamsTab.videos, liveStreamsTab.header.author)
+      const { id: channelId = id, name } = parseLocalChannelHeader(liveStreamsTab)
+
+      return parseLocalChannelVideos(liveStreamsTab.videos, channelId, name)
     } else {
       return []
     }
@@ -357,17 +361,159 @@ export async function getLocalChannelCommunity(id) {
   }
 }
 
+/**
+ * @param {YT.Channel} channel
+ */
+export function parseLocalChannelHeader(channel) {
+  /** @type {string=} */
+  let id
+  /** @type {string} */
+  let name
+  /** @type {string=} */
+  let thumbnailUrl
+  /** @type {string=} */
+  let bannerUrl
+  /** @type {string=} */
+  let subscriberText
+  /** @type {string[]} */
+  const tags = []
+
+  switch (channel.header.type) {
+    case 'C4TabbedHeader': {
+      // example: Linus Tech Tips
+      // https://www.youtube.com/channel/UCXuqSBlHAE6Xw-yeJA0Tunw
+
+      /**
+       * @type {import('youtubei.js').YTNodes.C4TabbedHeader}
+       */
+      const header = channel.header
+
+      id = header.author.id
+      name = header.author.name
+      thumbnailUrl = header.author.best_thumbnail.url
+      bannerUrl = header.banner?.[0]?.url
+      subscriberText = header.subscribers?.text
+      break
+    }
+    case 'CarouselHeader': {
+      // examples: Music and YouTube Gaming
+      // https://www.youtube.com/channel/UC-9-kyTW8ZkZNDHQJ6FgpwQ
+      // https://www.youtube.com/channel/UCOpNcN46UbXVtpKMrmU4Abg
+
+      /**
+       * @type {import('youtubei.js').YTNodes.CarouselHeader}
+       */
+      const header = channel.header
+
+      /**
+       * @type {import('youtubei.js').YTNodes.TopicChannelDetails}
+       */
+      const topicChannelDetails = header.contents.find(node => node.type === 'TopicChannelDetails')
+      name = topicChannelDetails.title.text
+      subscriberText = topicChannelDetails.subtitle.text
+      thumbnailUrl = topicChannelDetails.avatar[0].url
+
+      if (channel.metadata.external_id) {
+        id = channel.metadata.external_id
+      } else {
+        id = topicChannelDetails.subscribe_button.channel_id
+      }
+      break
+    }
+    case 'InteractiveTabbedHeader': {
+      // example: Minecraft - Topic
+      // https://www.youtube.com/channel/UCQvWX73GQygcwXOTSf_VDVg
+
+      /**
+       * @type {import('youtubei.js').YTNodes.InteractiveTabbedHeader}
+       */
+      const header = channel.header
+      name = header.title.text
+      thumbnailUrl = header.box_art.at(-1).url
+      bannerUrl = header.banner[0]?.url
+
+      const badges = header.badges.map(badge => badge.label).filter(tag => tag)
+      tags.push(...badges)
+
+      id = channel.current_tab?.endpoint.payload.browseId
+      break
+    }
+    case 'PageHeader': {
+      // example: YouTube Gaming
+      // https://www.youtube.com/channel/UCOpNcN46UbXVtpKMrmU4Abg
+
+      // User channels (an A/B test at the time of writing)
+
+      /**
+       * @type {import('youtubei.js').YTNodes.PageHeader}
+       */
+      const header = channel.header
+
+      name = header.content.title.text.text
+      if (header.content.image) {
+        if (header.content.image.type === 'ContentPreviewImageView') {
+          /** @type {import('youtubei.js').YTNodes.ContentPreviewImageView} */
+          const image = header.content.image
+
+          thumbnailUrl = image.image[0].url
+        } else {
+          /** @type {import('youtubei.js').YTNodes.DecoratedAvatarView} */
+          const image = header.content.image
+          thumbnailUrl = image.avatar?.image[0].url
+        }
+      }
+
+      if (!thumbnailUrl && channel.metadata.thumbnail) {
+        thumbnailUrl = channel.metadata.thumbnail[0].url
+      }
+
+      if (header.content.banner) {
+        bannerUrl = header.content.banner.image[0]?.url
+      }
+
+      if (header.content.actions) {
+        const modal = header.content.actions.actions_rows[0].actions[0].on_tap.modal
+
+        if (modal && modal.type === 'ModalWithTitleAndButton') {
+          /** @type {import('youtubei.js').YTNodes.ModalWithTitleAndButton} */
+          const typedModal = modal
+
+          id = typedModal.button.endpoint.next_endpoint?.payload.browseId
+        }
+      } else if (channel.metadata.external_id) {
+        id = channel.metadata.external_id
+      }
+
+      if (header.content.metadata) {
+        subscriberText = header.content.metadata.metadata_rows[0].metadata_parts[1].text.text
+      }
+
+      break
+    }
+  }
+
+  return {
+    id,
+    name,
+    thumbnailUrl,
+    bannerUrl,
+    subscriberText,
+    tags
+  }
+}
+
 /**
  * @param {import('youtubei.js').YTNodes.Video[]} videos
- * @param {Misc.Author} author
+ * @param {string} channelId
+ * @param {string} channelName
  */
-export function parseLocalChannelVideos(videos, author) {
+export function parseLocalChannelVideos(videos, channelId, channelName) {
   const parsedVideos = videos.map(parseLocalListVideo)
 
   // fix empty author info
   parsedVideos.forEach(video => {
-    video.author = author.name
-    video.authorId = author.id
+    video.author = channelName
+    video.authorId = channelId
   })
 
   return parsedVideos
@@ -375,9 +521,10 @@ export function parseLocalChannelVideos(videos, author) {
 
 /**
  * @param {import('youtubei.js').YTNodes.ReelItem[]} shorts
- * @param {Misc.Author} author
+ * @param {string} channelId
+ * @param {string} channelName
  */
-export function parseLocalChannelShorts(shorts, author) {
+export function parseLocalChannelShorts(shorts, channelId, channelName) {
   return shorts.map(short => {
     // unfortunately the only place with the duration is the accesibility string
     const duration = parseShortDuration(short.accessibility_label, short.id)
@@ -386,8 +533,8 @@ export function parseLocalChannelShorts(shorts, author) {
       type: 'video',
       videoId: short.id,
       title: short.title.text,
-      author: author.name,
-      authorId: author.id,
+      author: channelName,
+      authorId: channelId,
       viewCount: parseLocalSubscriberCount(short.views.text),
       lengthSeconds: isNaN(duration) ? '' : duration
     }
@@ -457,36 +604,43 @@ function parseShortDuration(accessibilityLabel, videoId) {
 
 /**
  * @param {Playlist|GridPlaylist} playlist
- * @param {Misc.Author} author
+ * @param {string} channelId
+ * @param {string} chanelName
  */
-export function parseLocalListPlaylist(playlist, author = undefined) {
-  let channelName
-  let channelId = null
-  /** @type {import('youtubei.js').YTNodes.PlaylistVideoThumbnail} */
-  const thumbnailRenderer = playlist.thumbnail_renderer
+export function parseLocalListPlaylist(playlist, channelId = undefined, channelName = undefined) {
+  let internalChannelName
+  let internalChannelId = null
+
   if (playlist.author && playlist.author.id !== 'N/A') {
     if (playlist.author instanceof Misc.Text) {
-      channelName = playlist.author.text
+      internalChannelName = playlist.author.text
 
-      if (author) {
-        channelId = author.id
+      if (channelId) {
+        internalChannelId = channelId
       }
     } else {
-      channelName = playlist.author.name
-      channelId = playlist.author.id
+      internalChannelName = playlist.author.name
+      internalChannelId = playlist.author.id
     }
-  } else {
-    channelName = author.name
-    channelId = author.id
+  } else if (channelId || channelName) {
+    internalChannelName = channelName
+    internalChannelId = channelId
+  } else if (playlist.author?.name) {
+    // auto-generated album playlists don't have an author
+    // so in search results, the author text is "Playlist" and doesn't have a link or channel ID
+    internalChannelName = playlist.author.name
   }
 
+  /** @type {import('youtubei.js').YTNodes.PlaylistVideoThumbnail} */
+  const thumbnailRenderer = playlist.thumbnail_renderer
+
   return {
     type: 'playlist',
     dataSource: 'local',
     title: playlist.title.text,
     thumbnail: thumbnailRenderer ? thumbnailRenderer.thumbnail[0].url : playlist.thumbnails[0].url,
-    channelName,
-    channelId,
+    channelName: internalChannelName,
+    channelId: internalChannelId,
     playlistId: playlist.id,
     videoCount: extractNumberFromString(playlist.video_count.text)
   }
diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index 51ed36aba0005..6781415be54dd 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -25,6 +25,7 @@ import {
 import {
   getLocalChannel,
   getLocalChannelId,
+  parseLocalChannelHeader,
   parseLocalChannelShorts,
   parseLocalChannelVideos,
   parseLocalCommunityPosts,
@@ -535,90 +536,22 @@ export default defineComponent({
           return
         }
 
-        let channelId
-        let subscriberText = null
-        let tags = []
+        const parsedHeader = parseLocalChannelHeader(channel)
 
-        switch (channel.header.type) {
-          case 'C4TabbedHeader': {
-            // example: Linus Tech Tips
-            // https://www.youtube.com/channel/UCXuqSBlHAE6Xw-yeJA0Tunw
+        const channelId = parsedHeader.id ?? this.id
+        const subscriberText = parsedHeader.subscriberText ?? null
+        let tags = parsedHeader.tags
 
-            /**
-             * @type {import('youtubei.js').YTNodes.C4TabbedHeader}
-             */
-            const header = channel.header
+        channelThumbnailUrl = parsedHeader.thumbnailUrl ?? this.subscriptionInfo?.thumbnail
+        channelName = parsedHeader.name ?? this.subscriptionInfo?.name
 
-            channelId = header.author.id
-            channelName = header.author.name
-            channelThumbnailUrl = header.author.best_thumbnail.url
-            subscriberText = header.subscribers?.text
-            break
-          }
-          case 'CarouselHeader': {
-            // examples: Music and YouTube Gaming
-            // https://www.youtube.com/channel/UC-9-kyTW8ZkZNDHQJ6FgpwQ
-            // https://www.youtube.com/channel/UCOpNcN46UbXVtpKMrmU4Abg
-
-            /**
-             * @type {import('youtubei.js').YTNodes.CarouselHeader}
-             */
-            const header = channel.header
-
-            /**
-             * @type {import('youtubei.js').YTNodes.TopicChannelDetails}
-             */
-            const topicChannelDetails = header.contents.find(node => node.type === 'TopicChannelDetails')
-            channelName = topicChannelDetails.title.text
-            subscriberText = topicChannelDetails.subtitle.text
-            channelThumbnailUrl = topicChannelDetails.avatar[0].url
-
-            if (channel.metadata.external_id) {
-              channelId = channel.metadata.external_id
-            } else {
-              channelId = topicChannelDetails.subscribe_button.channel_id
-            }
-            break
-          }
-          case 'InteractiveTabbedHeader': {
-            // example: Minecraft - Topic
-            // https://www.youtube.com/channel/UCQvWX73GQygcwXOTSf_VDVg
-
-            /**
-             * @type {import('youtubei.js').YTNodes.InteractiveTabbedHeader}
-             */
-            const header = channel.header
-            channelName = header.title.text
-            channelId = this.id
-            channelThumbnailUrl = header.box_art.at(-1).url
-
-            const badges = header.badges.map(badge => badge.label).filter(tag => tag)
-            tags.push(...badges)
-            break
-          }
-          case 'PageHeader': {
-            // example: YouTube Gaming (an A/B test at the time of writing)
-            // https://www.youtube.com/channel/UCOpNcN46UbXVtpKMrmU4Abg
-
-            /**
-             * @type {import('youtubei.js').YTNodes.PageHeader}
-             */
-            const header = channel.header
-
-            channelName = header.content.title.text
-            channelThumbnailUrl = header.content.image.image[0].url
-            channelId = this.id
-
-            break
-          }
-        }
-
-        if (channelThumbnailUrl.startsWith('//')) {
+        if (channelThumbnailUrl?.startsWith('//')) {
           channelThumbnailUrl = `https:${channelThumbnailUrl}`
         }
 
         this.channelName = channelName
         this.thumbnailUrl = channelThumbnailUrl
+        this.bannerUrl = parsedHeader.bannerUrl ?? null
         this.isFamilyFriendly = !!channel.metadata.is_family_safe
 
         if (channel.metadata.tags) {
@@ -649,12 +582,6 @@ export default defineComponent({
 
         this.updateSubscriptionDetails({ channelThumbnailUrl, channelName, channelId })
 
-        if (channel.header.banner?.length > 0) {
-          this.bannerUrl = channel.header.banner[0].url
-        } else {
-          this.bannerUrl = null
-        }
-
         this.relatedChannels = channel.channels.map(({ author }) => {
           let thumbnailUrl = author.best_thumbnail.url
 
@@ -815,7 +742,7 @@ export default defineComponent({
           return
         }
 
-        this.latestVideos = parseLocalChannelVideos(videosTab.videos, channel.header.author)
+        this.latestVideos = parseLocalChannelVideos(videosTab.videos, this.id, this.channelName)
         this.videoContinuationData = videosTab.has_continuation ? videosTab : null
         this.isElementListLoading = false
       } catch (err) {
@@ -840,7 +767,7 @@ export default defineComponent({
          */
         const continuation = await this.videoContinuationData.getContinuation()
 
-        this.latestVideos = this.latestVideos.concat(parseLocalChannelVideos(continuation.videos, this.channelInstance.header.author))
+        this.latestVideos = this.latestVideos.concat(parseLocalChannelVideos(continuation.videos, this.id, this.channelName))
         this.videoContinuationData = continuation.has_continuation ? continuation : null
       } catch (err) {
         console.error(err)
@@ -873,7 +800,7 @@ export default defineComponent({
           return
         }
 
-        this.latestShorts = parseLocalChannelShorts(shortsTab.videos, channel.header.author)
+        this.latestShorts = parseLocalChannelShorts(shortsTab.videos, this.id, this.channelName)
         this.shortContinuationData = shortsTab.has_continuation ? shortsTab : null
         this.isElementListLoading = false
       } catch (err) {
@@ -898,7 +825,7 @@ export default defineComponent({
          */
         const continuation = await this.shortContinuationData.getContinuation()
 
-        this.latestShorts.push(...parseLocalChannelShorts(continuation.videos, this.channelInstance.header.author))
+        this.latestShorts.push(...parseLocalChannelShorts(continuation.videos, this.id, this.channelName))
         this.shortContinuationData = continuation.has_continuation ? continuation : null
       } catch (err) {
         console.error(err)
@@ -931,7 +858,7 @@ export default defineComponent({
           return
         }
 
-        this.latestLive = parseLocalChannelVideos(liveTab.videos, channel.header.author)
+        this.latestLive = parseLocalChannelVideos(liveTab.videos, this.id, this.channelName)
         this.liveContinuationData = liveTab.has_continuation ? liveTab : null
         this.isElementListLoading = false
       } catch (err) {
@@ -956,7 +883,7 @@ export default defineComponent({
          */
         const continuation = await this.liveContinuationData.getContinuation()
 
-        this.latestLive.push(...parseLocalChannelVideos(continuation.videos, this.channelInstance.header.author))
+        this.latestLive.push(...parseLocalChannelVideos(continuation.videos, this.id, this.channelName))
         this.liveContinuationData = continuation.has_continuation ? continuation : null
       } catch (err) {
         console.error(err)
@@ -1241,7 +1168,7 @@ export default defineComponent({
           return
         }
 
-        this.latestPlaylists = playlistsTab.playlists.map(playlist => parseLocalListPlaylist(playlist, channel.header.author))
+        this.latestPlaylists = playlistsTab.playlists.map(playlist => parseLocalListPlaylist(playlist, this.id, this.channelName))
         this.playlistContinuationData = playlistsTab.has_continuation ? playlistsTab : null
         this.isElementListLoading = false
       } catch (err) {
@@ -1266,7 +1193,7 @@ export default defineComponent({
          */
         const continuation = await this.playlistContinuationData.getContinuation()
 
-        const parsedPlaylists = continuation.playlists.map(playlist => parseLocalListPlaylist(playlist, this.channelInstance.header.author))
+        const parsedPlaylists = continuation.playlists.map(playlist => parseLocalListPlaylist(playlist, this.id, this.channelName))
         this.latestPlaylists = this.latestPlaylists.concat(parsedPlaylists)
         this.playlistContinuationData = continuation.has_continuation ? continuation : null
       } catch (err) {
@@ -1364,7 +1291,7 @@ export default defineComponent({
           return
         }
 
-        this.latestReleases = releaseTab.playlists.map(playlist => parseLocalListPlaylist(playlist, channel.header.author))
+        this.latestReleases = releaseTab.playlists.map(playlist => parseLocalListPlaylist(playlist, this.id, this.channelName))
         this.releaseContinuationData = releaseTab.has_continuation ? releaseTab : null
         this.isElementListLoading = false
       } catch (err) {
@@ -1389,7 +1316,7 @@ export default defineComponent({
          */
         const continuation = await this.releaseContinuationData.getContinuation()
 
-        const parsedReleases = continuation.playlists.map(playlist => parseLocalListPlaylist(playlist, this.channelInstance.header.author))
+        const parsedReleases = continuation.playlists.map(playlist => parseLocalListPlaylist(playlist, this.id, this.channelName))
         this.latestReleases = this.latestReleases.concat(parsedReleases)
         this.releaseContinuationData = continuation.has_continuation ? continuation : null
       } catch (err) {
@@ -1477,7 +1404,7 @@ export default defineComponent({
           return
         }
 
-        this.latestPodcasts = podcastTab.playlists.map(playlist => parseLocalListPlaylist(playlist, channel.header.author))
+        this.latestPodcasts = podcastTab.playlists.map(playlist => parseLocalListPlaylist(playlist, this.id, this.channelName))
         this.podcastContinuationData = podcastTab.has_continuation ? podcastTab : null
         this.isElementListLoading = false
       } catch (err) {
@@ -1502,7 +1429,7 @@ export default defineComponent({
          */
         const continuation = await this.podcastContinuationData.getContinuation()
 
-        const parsedPodcasts = continuation.playlists.map(playlist => parseLocalListPlaylist(playlist, this.channelInstance.header.author))
+        const parsedPodcasts = continuation.playlists.map(playlist => parseLocalListPlaylist(playlist, this.id, this.channelName))
         this.latestPodcasts = this.latestPodcasts.concat(parsedPodcasts)
         this.releaseContinuationData = continuation.has_continuation ? continuation : null
       } catch (err) {
@@ -1828,7 +1755,7 @@ export default defineComponent({
             if (item.type === 'Video') {
               return parseLocalListVideo(item)
             } else {
-              return parseLocalListPlaylist(item, this.channelInstance.header.author)
+              return parseLocalListPlaylist(item, this.id, this.channelName)
             }
           })
 
diff --git a/yarn.lock b/yarn.lock
index f0c6ef1d438af..39cdac3d6b436 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8918,10 +8918,10 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
   integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
 
-youtubei.js@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-8.0.0.tgz#0fcbe332e263d9be6afe4e3d1917e9ddc1ffbed3"
-  integrity sha512-kUwHvqoB5vfaGaY1quAGcX5JPIyjr5fjj9Zj/ZwUDCrermz/r5uIkNiJ5cNHkmAJbZP9fdygzNMvGHd7fM445g==
+youtubei.js@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-9.0.2.tgz#77592a1144cdd51bb4258472265f5031b3966162"
+  integrity sha512-D7GoJmupYaJxTNQyHRWYw8MUdQTxRaa3c7nzM9etWQjaexepFGVlVtwl3CybLx7GopBNtBvr7RxSUUIUyNnYIg==
   dependencies:
     jintr "^1.1.0"
     tslib "^2.5.0"

From 8a298604c4a61ebe5de163ad846c18bcffbfe74b Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Thu, 15 Feb 2024 01:27:23 +0100
Subject: [PATCH 027/105] Fix the Invidious DASH manifest generation (#4672)

---
 src/renderer/helpers/api/invidious.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/helpers/api/invidious.js b/src/renderer/helpers/api/invidious.js
index daea27629cc47..a759fb98f0d80 100644
--- a/src/renderer/helpers/api/invidious.js
+++ b/src/renderer/helpers/api/invidious.js
@@ -366,7 +366,7 @@ export async function generateInvidiousDashManifestLocally(formats, invidiousIns
 
   return await FormatUtils.toDash({
     adaptive_formats: formats
-  }, urlTransformer, undefined, undefined, player)
+  }, false, urlTransformer, undefined, undefined, player)
 }
 
 export function convertInvidiousToLocalFormat(format) {

From 7b4c53c1c9d8c450fc2ac6aa2a25cad24561c9d3 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Thu, 22 Feb 2024 22:42:37 +0100
Subject: [PATCH 028/105] Fix local API search erroring, because the default
 parameter values were not getting applied (#4704)

---
 src/renderer/helpers/api/local.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 5b3d7e11222f3..f2821001b7448 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -35,23 +35,23 @@ const TRACKING_PARAM_NAMES = [
  * @param {boolean} options.generateSessionLocally generate the session locally or let YouTube generate it (local is faster, remote is more accurate)
  * @returns the Innertube instance
  */
-async function createInnertube(options = { withPlayer: false, location: undefined, safetyMode: false, clientType: undefined, generateSessionLocally: true }) {
+async function createInnertube({ withPlayer = false, location = undefined, safetyMode = false, clientType = undefined, generateSessionLocally = true } = {}) {
   let cache
-  if (options.withPlayer) {
+  if (withPlayer) {
     const userData = await getUserDataPath()
     cache = new PlayerCache(join(userData, 'player_cache'))
   }
 
   return await Innertube.create({
-    retrieve_player: !!options.withPlayer,
-    location: options.location,
-    enable_safety_mode: !!options.safetyMode,
-    client_type: options.clientType,
+    retrieve_player: !!withPlayer,
+    location: location,
+    enable_safety_mode: !!safetyMode,
+    client_type: clientType,
 
     // use browser fetch
     fetch: (input, init) => fetch(input, init),
     cache,
-    generate_session_locally: !!options.generateSessionLocally
+    generate_session_locally: !!generateSessionLocally
   })
 }
 

From b4ebca948a823faf77f9b5007287e3624ec82ef5 Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Sat, 24 Feb 2024 03:51:18 +0800
Subject: [PATCH 029/105] Bump youtubei.js to 9.1.0 for watch page fix (#4707)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 52f140d55ddc8..aff694fb15040 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "vue-router": "^3.6.5",
     "vue-tiny-slider": "^0.1.39",
     "vuex": "^3.6.2",
-    "youtubei.js": "^9.0.2"
+    "youtubei.js": "^9.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.23.0",
diff --git a/yarn.lock b/yarn.lock
index 39cdac3d6b436..6bb212dce47ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8918,10 +8918,10 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
   integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
 
-youtubei.js@^9.0.2:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-9.0.2.tgz#77592a1144cdd51bb4258472265f5031b3966162"
-  integrity sha512-D7GoJmupYaJxTNQyHRWYw8MUdQTxRaa3c7nzM9etWQjaexepFGVlVtwl3CybLx7GopBNtBvr7RxSUUIUyNnYIg==
+youtubei.js@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-9.1.0.tgz#bcf154c9fa21d3c8c1d00a5e10360d0a065c660e"
+  integrity sha512-C5GBJ4LgnS6vGAUkdIdQNOFFb5EZ1p3xBvUELNXmIG3Idr6vxWrKNBNy8ClZT3SuDVXaAJqDgF9b5jvY8lNKcg==
   dependencies:
     jintr "^1.1.0"
     tslib "^2.5.0"

From e231e4dbcc69036be6d6a27a78293b0cf0ddfd9e Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 2 Jan 2024 19:08:59 +0100
Subject: [PATCH 030/105] Cleanup shorts duration parsing now that YouTube has
 removed it (#4509)

---
 .../components/ft-list-video/ft-list-video.js | 11 +++-
 .../ft-list-video/ft-list-video.vue           |  2 +-
 src/renderer/helpers/api/local.js             | 66 +------------------
 3 files changed, 12 insertions(+), 67 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 9c5e399afe299..6fac05b8ba119 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.js
+++ b/src/renderer/components/ft-list-video/ft-list-video.js
@@ -64,6 +64,7 @@ export default defineComponent({
       viewCount: 0,
       parsedViewCount: '',
       uploadedTime: '',
+      lengthSeconds: 0,
       duration: '',
       description: '',
       watched: false,
@@ -156,7 +157,11 @@ export default defineComponent({
     },
 
     progressPercentage: function () {
-      return (this.watchProgress / this.data.lengthSeconds) * 100
+      if (typeof this.lengthSeconds !== 'number') {
+        return 0
+      }
+
+      return (this.watchProgress / this.lengthSeconds) * 100
     },
 
     hideSharingActions: function() {
@@ -445,9 +450,11 @@ export default defineComponent({
       this.channelName = this.data.author ?? null
       this.channelId = this.data.authorId ?? null
 
-      if (this.data.isRSS && this.historyEntryExists) {
+      if ((this.data.lengthSeconds === '' || this.data.lengthSeconds === '0:00') && this.historyEntryExists) {
+        this.lengthSeconds = this.historyEntry.lengthSeconds
         this.duration = formatDurationAsTimestamp(this.historyEntry.lengthSeconds)
       } else {
+        this.lengthSeconds = this.data.lengthSeconds
         this.duration = formatDurationAsTimestamp(this.data.lengthSeconds)
       }
 
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 2c2af9ee638b3..176e56c822809 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.vue
+++ b/src/renderer/components/ft-list-video/ft-list-video.vue
@@ -28,7 +28,7 @@
         >
       </router-link>
       <div
-        v-if="isLive || duration !== '0:00'"
+        v-if="isLive || isUpcoming || (duration !== '' && duration !== '0:00')"
         class="videoDuration"
         :class="{
           live: isLive,
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index f2821001b7448..783ff0ba8122e 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -526,9 +526,6 @@ export function parseLocalChannelVideos(videos, channelId, channelName) {
  */
 export function parseLocalChannelShorts(shorts, channelId, channelName) {
   return shorts.map(short => {
-    // unfortunately the only place with the duration is the accesibility string
-    const duration = parseShortDuration(short.accessibility_label, short.id)
-
     return {
       type: 'video',
       videoId: short.id,
@@ -536,67 +533,11 @@ export function parseLocalChannelShorts(shorts, channelId, channelName) {
       author: channelName,
       authorId: channelId,
       viewCount: parseLocalSubscriberCount(short.views.text),
-      lengthSeconds: isNaN(duration) ? '' : duration
+      lengthSeconds: ''
     }
   })
 }
 
-/**
- * Shorts can only be up to 60 seconds long, so we only need to handle seconds and minutes
- * Of course this is YouTube, so are edge cases that don't match the docs, like example 3 taken from LTT
- *
- * https://support.google.com/youtube/answer/10059070?hl=en
- *
- * Example input strings:
- * - These mice keep getting WEIRDER... - 59 seconds - play video
- * - How Low Can Our Resolution Go? - 1 minute - play video
- * - I just found out about Elon. #SHORTS - 1 minute, 1 second - play video
- * @param {string} accessibilityLabel
- * @param {string} videoId only used for error logging
- */
-function parseShortDuration(accessibilityLabel, videoId) {
-  // we want to count from the end of the array,
-  // as it's possible that the title could contain a `-` too
-  const timeString = accessibilityLabel.split('-').at(-2)
-
-  if (typeof timeString === 'undefined') {
-    console.error(`Failed to parse local API short duration from accessibility label. video ID: ${videoId}, text: "${accessibilityLabel}"`)
-    return NaN
-  }
-
-  let duration = 0
-
-  const matches = timeString.matchAll(/(\d+) (second|minute)s?/g)
-
-  // matchAll returns an iterator, which doesn't have a length property
-  // so we need to check if it's empty this way instead
-  let validDuration = false
-
-  for (const match of matches) {
-    let number = parseInt(match[1])
-
-    if (isNaN(number) || match[2].length === 0) {
-      validDuration = false
-      break
-    }
-
-    validDuration = true
-
-    if (match[2] === 'minute') {
-      number *= 60
-    }
-
-    duration += number
-  }
-
-  if (!validDuration) {
-    console.error(`Failed to parse local API short duration from accessibility label. video ID: ${videoId}, text: "${accessibilityLabel}"`)
-    return NaN
-  }
-
-  return duration
-}
-
 /**
  * @typedef {import('youtubei.js').YTNodes.Playlist} Playlist
  * @typedef {import('youtubei.js').YTNodes.GridPlaylist} GridPlaylist
@@ -678,15 +619,12 @@ export function parseLocalPlaylistVideo(video) {
     /** @type {import('youtubei.js').YTNodes.ReelItem} */
     const short = video
 
-    // unfortunately the only place with the duration is the accesibility string
-    const duration = parseShortDuration(video.accessibility_label, short.id)
-
     return {
       type: 'video',
       videoId: short.id,
       title: short.title.text,
       viewCount: parseLocalSubscriberCount(short.views.text),
-      lengthSeconds: isNaN(duration) ? '' : duration
+      lengthSeconds: ''
     }
   } else {
     /** @type {import('youtubei.js').YTNodes.PlaylistVideo} */

From c935fdbde64cb44b1a251838652755713d502bf6 Mon Sep 17 00:00:00 2001
From: PrestonN <freetubeapp@protonmail.com>
Date: Fri, 23 Feb 2024 17:48:25 -0500
Subject: [PATCH 031/105] Bump version number to v0.19.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index aff694fb15040..f998b67957f58 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.19.1",
+  "version": "0.19.2",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From bced63a5036889e10a9d84a08670ea547679fa30 Mon Sep 17 00:00:00 2001
From: PrestonN <freetubeapp@protonmail.com>
Date: Wed, 3 Apr 2024 15:50:59 -0400
Subject: [PATCH 032/105] Update package.json

---
 package.json | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)
 create mode 100644 package.json

diff --git a/package.json b/package.json
new file mode 100644
index 0000000000000..e1f30f06350e1
--- /dev/null
+++ b/package.json
@@ -0,0 +1,133 @@
+{
+  "name": "freetube",
+  "productName": "FreeTube",
+  "description": "A private YouTube client",
+  "version": "0.19.1",
+  "license": "AGPL-3.0-or-later",
+  "main": "./dist/main.js",
+  "private": true,
+  "author": {
+    "name": "PrestonN",
+    "email": "FreeTubeApp@protonmail.com",
+    "url": "https://github.com/FreeTubeApp/FreeTube"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/FreeTubeApp/FreeTube.git"
+  },
+  "bugs": {
+    "url": "https://github.com/FreeTubeApp/FreeTube/issues"
+  },
+  "scripts": {
+    "build": "run-s rebuild:electron pack build-release",
+    "build:arm64": "run-s rebuild:electron pack build-release:arm64",
+    "build:arm32": "run-s rebuild:electron pack build-release:arm32",
+    "build-release": "node _scripts/build.js",
+    "build-release:arm64": "node _scripts/build.js arm64",
+    "build-release:arm32": "node _scripts/build.js arm32",
+    "clean": "rimraf build/ static/dashFiles/ dist/ static/storyboards/",
+    "debug": "run-s rebuild:electron debug-runner",
+    "debug-runner": "node _scripts/dev-runner.js --remote-debug",
+    "dev": "run-s rebuild:electron dev-runner",
+    "dev:web": "node _scripts/dev-runner.js --web",
+    "dev-runner": "node _scripts/dev-runner.js",
+    "get-instances": "node _scripts/getInstances.js",
+    "get-regions": "node _scripts/getRegions.mjs",
+    "lint-all": "run-p lint lint-json",
+    "lint": "run-p eslint-lint lint-style",
+    "lint-fix": "run-p eslint-lint-fix lint-style-fix",
+    "eslint-lint": "eslint --ext .js,.vue ./",
+    "eslint-lint-fix": "eslint --fix --ext .js,.vue ./",
+    "lint-json": "eslint --ext .json ./",
+    "lint-style": "stylelint \"**/*.{css,scss}\"",
+    "lint-style-fix": "stylelint --fix \"**/*.{css,scss}\"",
+    "lint-yml": "eslint --ext .yml,.yaml ./",
+    "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",
+    "pack:web": "webpack --mode=production --node-env=production --config _scripts/webpack.web.config.js",
+    "postinstall": "yarn run --silent rebuild:electron",
+    "prettier": "prettier --write \"{src,_scripts}/**/*.{js,vue}\"",
+    "rebuild:electron": "electron-builder install-app-deps",
+    "release": "run-s test build",
+    "ci": "yarn install --silent --frozen-lockfile"
+  },
+  "dependencies": {
+    "@fortawesome/fontawesome-svg-core": "^6.5.1",
+    "@fortawesome/free-brands-svg-icons": "^6.5.1",
+    "@fortawesome/free-solid-svg-icons": "^6.5.1",
+    "@fortawesome/vue-fontawesome": "^2.0.10",
+    "@seald-io/nedb": "^4.0.4",
+    "@silvermine/videojs-quality-selector": "^1.3.1",
+    "autolinker": "^4.0.0",
+    "electron-context-menu": "^3.6.1",
+    "lodash.debounce": "^4.0.8",
+    "marked": "^12.0.1",
+    "path-browserify": "^1.0.1",
+    "process": "^0.11.10",
+    "swiper": "^11.1.0",
+    "video.js": "7.21.5",
+    "videojs-contrib-quality-levels": "^3.0.0",
+    "videojs-http-source-selector": "^1.1.6",
+    "videojs-mobile-ui": "^0.8.0",
+    "videojs-overlay": "^3.1.0",
+    "videojs-vtt-thumbnails-freetube": "0.0.15",
+    "vue": "^2.7.16",
+    "vue-i18n": "^8.28.2",
+    "vue-observe-visibility": "^1.0.0",
+    "vue-router": "^3.6.5",
+    "vuex": "^3.6.2",
+    "youtubei.js": "^9.2.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.24.3",
+    "@babel/eslint-parser": "^7.24.1",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/preset-env": "^7.24.3",
+    "@double-great/stylelint-a11y": "^3.0.2",
+    "babel-loader": "^9.1.3",
+    "copy-webpack-plugin": "^12.0.2",
+    "css-loader": "^6.10.0",
+    "css-minimizer-webpack-plugin": "^6.0.0",
+    "electron": "^29.1.6",
+    "electron-builder": "^24.13.3",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jsonc": "^2.14.1",
+    "eslint-plugin-n": "^16.6.2",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-unicorn": "^51.0.1",
+    "eslint-plugin-vue": "^9.24.0",
+    "eslint-plugin-vuejs-accessibility": "^2.2.1",
+    "eslint-plugin-yml": "^1.13.2",
+    "html-webpack-plugin": "^5.6.0",
+    "js-yaml": "^4.1.0",
+    "json-minimizer-webpack-plugin": "^5.0.0",
+    "lefthook": "^1.6.7",
+    "mini-css-extract-plugin": "^2.8.1",
+    "npm-run-all": "^4.1.5",
+    "postcss": "^8.4.38",
+    "postcss-scss": "^4.0.9",
+    "prettier": "^2.8.8",
+    "rimraf": "^5.0.5",
+    "sass": "^1.72.0",
+    "sass-loader": "^14.1.1",
+    "stylelint": "^16.3.1",
+    "stylelint-config-sass-guidelines": "^11.1.0",
+    "stylelint-config-standard": "^36.0.0",
+    "stylelint-high-performance-animation": "^1.10.0",
+    "stylelint-use-logical-spec": "^5.0.1",
+    "tree-kill": "1.2.2",
+    "vue-devtools": "^5.1.4",
+    "vue-eslint-parser": "^9.4.2",
+    "vue-loader": "^15.10.0",
+    "webpack": "^5.91.0",
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^5.0.4",
+    "webpack-watch-external-files-plugin": "^3.0.0",
+    "yaml-eslint-parser": "^1.2.2"
+  }
+}

From 54b49dc1b7f8ac2b9d955e575bf071ec4af2b0f3 Mon Sep 17 00:00:00 2001
From: PrestonN <freetubeapp@protonmail.com>
Date: Wed, 3 Apr 2024 16:09:15 -0400
Subject: [PATCH 033/105] Bump version number to v0.20.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e1f30f06350e1..f1ed1c9681fa8 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.19.1",
+  "version": "0.20.0",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From 972d5488b6a50e7d5efdcfb83eb1c02ca086c187 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Thu, 25 Jul 2024 17:13:07 +0200
Subject: [PATCH 034/105] Update YouTube.js to 10.2.0 (#5466)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index df0e6cc002ec1..bea9b3a3f3e8d 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
-    "youtubei.js": "^10.1.0"
+    "youtubei.js": "^10.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.24.7",
diff --git a/yarn.lock b/yarn.lock
index 5c3078d653318..a38e0bede8b30 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9016,10 +9016,10 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
   integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
 
-youtubei.js@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-10.1.0.tgz#38b3d95907441040df1e8031e04e0e6200ed52cf"
-  integrity sha512-MokZMAnpWH11VYvWuW6qjPiiPmgRl5rfDgPQOpif9qXcVHoVw1hi8ePuRSD0AZSZ+uvWGe8rvas2dzp+Jv5JKQ==
+youtubei.js@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-10.2.0.tgz#0f5fbacf3e64c965d6e7378c870a7329ceca7228"
+  integrity sha512-JLKW9AHQ1qrTwBbre1aDkH8UJFmNcc4+kOSaVou5jSY7AzfFPFJK0yvX6afnLst0UVC9wfXHrLiNx93sutVErA==
   dependencies:
     jintr "^2.0.0"
     tslib "^2.5.0"

From c627970668a204969a57ca3a929f795ddac6efe9 Mon Sep 17 00:00:00 2001
From: PrestonN <freetubeapp@protonmail.com>
Date: Thu, 25 Jul 2024 11:16:17 -0400
Subject: [PATCH 035/105] Bump version number to v0.21.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bea9b3a3f3e8d..90abf3286ce4a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.21.1",
+  "version": "0.21.2",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From 2f572498839b3392d189c8f5d599fc2b8bd8ddc8 Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Fri, 2 Aug 2024 23:11:48 +0800
Subject: [PATCH 036/105] (Master) Update YouTube.js 10.3.0 & Use streams from
 the iOS client to workaround playback issues (#5508)

* ^ Update youtubei.js

* Use streams from the iOS client to workaround playback issues (#5472)

* Use streams from the iOS client to workaround playback issues

* Fix for unplayable videos

* Hoist version arrays and introduce a randomArrayItem helper

---------

Co-authored-by: absidue <48293849+absidue@users.noreply.github.com>
---
 package.json                      |   2 +-
 src/main/index.js                 |  21 ++++-
 src/renderer/helpers/api/local.js | 125 ++++++++++++++++++++++++++----
 src/renderer/helpers/colors.js    |   4 +-
 src/renderer/helpers/utils.js     |   9 +++
 src/renderer/views/Watch/Watch.js |  35 +--------
 yarn.lock                         |  18 ++---
 7 files changed, 149 insertions(+), 65 deletions(-)

diff --git a/package.json b/package.json
index 90abf3286ce4a..deef1a2f128af 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
-    "youtubei.js": "^10.2.0"
+    "youtubei.js": "^10.3.0"
   },
   "devDependencies": {
     "@babel/core": "^7.24.7",
diff --git a/src/main/index.js b/src/main/index.js
index 07ed29a0ae565..d09bc6e98f1d8 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -408,9 +408,24 @@ function runApp() {
       requestHeaders.Origin = 'https://www.youtube.com'
 
       if (url.startsWith('https://www.youtube.com/youtubei/')) {
-        requestHeaders['Sec-Fetch-Site'] = 'same-origin'
-        requestHeaders['Sec-Fetch-Mode'] = 'same-origin'
-        requestHeaders['X-Youtube-Bootstrap-Logged-In'] = 'false'
+        // Make iOS requests work and look more realistic
+        if (requestHeaders['x-youtube-client-name'] === '5') {
+          delete requestHeaders.Referer
+          delete requestHeaders.Origin
+          delete requestHeaders['Sec-Fetch-Site']
+          delete requestHeaders['Sec-Fetch-Mode']
+          delete requestHeaders['Sec-Fetch-Dest']
+          delete requestHeaders['sec-ch-ua']
+          delete requestHeaders['sec-ch-ua-mobile']
+          delete requestHeaders['sec-ch-ua-platform']
+
+          requestHeaders['User-Agent'] = requestHeaders['x-user-agent']
+          delete requestHeaders['x-user-agent']
+        } else {
+          requestHeaders['Sec-Fetch-Site'] = 'same-origin'
+          requestHeaders['Sec-Fetch-Mode'] = 'same-origin'
+          requestHeaders['X-Youtube-Bootstrap-Logged-In'] = 'false'
+        }
       } else {
         // YouTube doesn't send the Content-Type header for the media requests, so we shouldn't either
         delete requestHeaders['Content-Type']
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 77b8f9a481a7f..e7fce2be2b5dc 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -8,6 +8,7 @@ import {
   calculatePublishedDate,
   escapeHTML,
   extractNumberFromString,
+  randomArrayItem,
   toLocalePublicationString
 } from '../utils'
 
@@ -19,6 +20,25 @@ const TRACKING_PARAM_NAMES = [
   'utm_content',
 ]
 
+const IOS_VERSIONS = [
+  '17.5.1',
+  '17.5',
+  '17.4.1',
+  '17.4',
+  '17.3.1',
+  '17.3',
+]
+
+const YOUTUBE_IOS_CLIENT_VERSIONS = [
+  '19.29.1',
+  '19.28.1',
+  '19.26.5',
+  '19.25.4',
+  '19.25.3',
+  '19.24.3',
+  '19.24.2',
+]
+
 /**
  * Creates a lightweight Innertube instance, which is faster to create or
  * an instance that can decode the streaming URLs, which is slower to create
@@ -56,7 +76,36 @@ async function createInnertube({ withPlayer = false, location = undefined, safet
     client_type: clientType,
 
     // use browser fetch
-    fetch: (input, init) => fetch(input, init),
+    fetch: (input, init) => {
+      // Make iOS requests work and look more realistic
+      if (init?.headers instanceof Headers && init.headers.get('x-youtube-client-name') === '5') {
+        // Use a random iOS version and YouTube iOS client version to make the requests look less suspicious
+        const clientVersion = randomArrayItem(YOUTUBE_IOS_CLIENT_VERSIONS)
+        const iosVersion = randomArrayItem(IOS_VERSIONS)
+
+        init.headers.set('x-youtube-client-version', clientVersion)
+
+        // We can't set the user-agent here, but in the main process we take the x-user-agent and set it as the user-agent
+        init.headers.delete('user-agent')
+        init.headers.set('x-user-agent', `com.google.ios.youtube/${clientVersion} (iPhone16,2; CPU iOS ${iosVersion.replaceAll('.', '_')} like Mac OS X; en_US)`)
+
+        const bodyJson = JSON.parse(init.body)
+
+        const client = bodyJson.context.client
+
+        client.clientVersion = clientVersion
+        client.deviceMake = 'Apple'
+        client.deviceModel = 'iPhone16,2' // iPhone 15 Pro Max
+        client.osName = 'iOS'
+        client.osVersion = iosVersion
+        delete client.browserName
+        delete client.browserVersion
+
+        init.body = JSON.stringify(bodyJson)
+      }
+
+      return fetch(input, init)
+    },
     cache,
     generate_session_locally: !!generateSessionLocally
   })
@@ -190,27 +239,69 @@ export async function getLocalSearchContinuation(continuationData) {
   return handleSearchResponse(response)
 }
 
-export async function getLocalVideoInfo(id, attemptBypass = false) {
-  let info
-  let player
+/**
+ * @param {string} id
+ */
+export async function getLocalVideoInfo(id) {
+  const webInnertube = await createInnertube({ withPlayer: true, generateSessionLocally: false })
 
-  if (attemptBypass) {
-    const innertube = await createInnertube({ withPlayer: true, clientType: ClientType.TV_EMBEDDED, generateSessionLocally: false })
-    player = innertube.actions.session.player
+  const info = await webInnertube.getInfo(id)
 
-    // 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
-    info = await innertube.getBasicInfo(id, 'TV_EMBEDDED')
-  } else {
-    const innertube = await createInnertube({ withPlayer: true, generateSessionLocally: false })
-    player = innertube.actions.session.player
+  const hasTrailer = info.has_trailer
+  const trailerIsAgeRestricted = info.getTrailerInfo() === null
 
-    info = await innertube.getInfo(id)
+  if (hasTrailer) {
+    /** @type {import('youtubei.js').YTNodes.PlayerLegacyDesktopYpcTrailer} */
+    const trailerScreen = info.playability_status.error_screen
+    id = trailerScreen.video_id
   }
 
-  if (info.streaming_data) {
-    decipherFormats(info.streaming_data.adaptive_formats, player)
-    decipherFormats(info.streaming_data.formats, player)
+  // try to bypass the age restriction
+  if (info.playability_status.status === 'LOGIN_REQUIRED' || (hasTrailer && trailerIsAgeRestricted)) {
+    const tvInnertube = await createInnertube({ withPlayer: true, clientType: ClientType.TV_EMBEDDED, generateSessionLocally: false })
+
+    const tvInfo = await tvInnertube.getBasicInfo(id, 'TV_EMBEDDED')
+
+    if (tvInfo.streaming_data) {
+      decipherFormats(tvInfo.streaming_data.adaptive_formats, tvInnertube.actions.session.player)
+      decipherFormats(tvInfo.streaming_data.formats, tvInnertube.actions.session.player)
+    }
+
+    info.playability_status = tvInfo.playability_status
+    info.streaming_data = tvInfo.streaming_data
+    info.basic_info.start_timestamp = tvInfo.basic_info.start_timestamp
+    info.basic_info.duration = tvInfo.basic_info.duration
+    info.captions = tvInfo.captions
+    info.storyboards = tvInfo.storyboards
+  } else {
+    const iosInnertube = await createInnertube({ clientType: ClientType.IOS })
+
+    const iosInfo = await iosInnertube.getBasicInfo(id, 'iOS')
+
+    if (hasTrailer) {
+      info.playability_status = iosInfo.playability_status
+      info.streaming_data = iosInfo.streaming_data
+      info.basic_info.start_timestamp = iosInfo.basic_info.start_timestamp
+      info.basic_info.duration = iosInfo.basic_info.duration
+      info.captions = iosInfo.captions
+      info.storyboards = iosInfo.storyboards
+    } else if (iosInfo.streaming_data) {
+      info.streaming_data.adaptive_formats = iosInfo.streaming_data.adaptive_formats
+      // Use the legacy formats from the original web response as the iOS client doesn't have any legacy formats
+
+      for (const format of info.streaming_data.adaptive_formats) {
+        format.freeTubeUrl = format.url
+      }
+
+      // don't overwrite for live streams
+      if (!info.streaming_data.hls_manifest_url) {
+        info.streaming_data.hls_manifest_url = iosInfo.streaming_data.hls_manifest_url
+      }
+    }
+
+    if (info.streaming_data) {
+      decipherFormats(info.streaming_data.formats, webInnertube.actions.session.player)
+    }
   }
 
   return info
diff --git a/src/renderer/helpers/colors.js b/src/renderer/helpers/colors.js
index fbd0f7a874d6a..cd1e1d4aebc1f 100644
--- a/src/renderer/helpers/colors.js
+++ b/src/renderer/helpers/colors.js
@@ -1,4 +1,5 @@
 import i18n from '../i18n/index'
+import { randomArrayItem } from './utils'
 
 export const colors = [
   { name: 'Red', value: '#d50000' },
@@ -103,8 +104,7 @@ export function getRandomColorClass() {
 }
 
 export function getRandomColor() {
-  const randomInt = Math.floor(Math.random() * colors.length)
-  return colors[randomInt]
+  return randomArrayItem(colors)
 }
 
 export function calculateColorLuminance(colorValue) {
diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index 3f645343d3a6e..f65161b4a60f4 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -868,3 +868,12 @@ export function ctrlFHandler(event, inputElement) {
       }
   }
 }
+
+/**
+ * @template T
+ * @param {T[]} array
+ * @returns {T}
+ */
+export function randomArrayItem(array) {
+  return array[Math.floor(Math.random() * array.length)]
+}
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 37799bf07a751..ff8d4ec69e79f 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -308,7 +308,7 @@ export default defineComponent({
       }
 
       try {
-        let result = await getLocalVideoInfo(this.videoId)
+        const result = await getLocalVideoInfo(this.videoId)
 
         this.isFamilyFriendly = result.basic_info.is_family_safe
 
@@ -328,31 +328,7 @@ export default defineComponent({
           return
         }
 
-        let playabilityStatus = result.playability_status
-        let bypassedResult = null
-        let streamingVideoId = this.videoId
-        let trailerIsNull = false
-
-        // if widevine support is added then we should check if playabilityStatus.status is UNPLAYABLE too
-        if (result.has_trailer) {
-          bypassedResult = result.getTrailerInfo()
-          /**
-           * @type {import ('youtubei.js').YTNodes.PlayerLegacyDesktopYpcTrailer}
-           */
-          const trailerScreen = result.playability_status.error_screen
-          streamingVideoId = trailerScreen.video_id
-          // if the trailer is null then it is likely age restricted.
-          trailerIsNull = bypassedResult == null
-          if (!trailerIsNull) {
-            playabilityStatus = bypassedResult.playability_status
-          }
-        }
-
-        if (playabilityStatus.status === 'LOGIN_REQUIRED' || trailerIsNull) {
-          // try to bypass the age restriction
-          bypassedResult = await getLocalVideoInfo(streamingVideoId, true)
-          playabilityStatus = bypassedResult.playability_status
-        }
+        const playabilityStatus = result.playability_status
 
         if (playabilityStatus.status === 'UNPLAYABLE') {
           /**
@@ -482,13 +458,6 @@ export default defineComponent({
         this.commentsEnabled = result.comments_entry_point_header != null
         // endregion No comment detection
 
-        // 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
-        }
-
         if ((this.isLive || this.isPostLiveDvr) && !this.isUpcoming) {
           try {
             const formats = await getFormatsFromHLSManifest(result.streaming_data.hls_manifest_url)
diff --git a/yarn.lock b/yarn.lock
index a38e0bede8b30..16e5f2303cfad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5497,10 +5497,10 @@ jest-worker@^29.7.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jintr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/jintr/-/jintr-2.0.0.tgz#bc8e78efc04743f5c67c625587ce4d1c94afad9a"
-  integrity sha512-RiVlevxttZ4eHEYB2dXKXDXluzHfRuw0DJQGsYuKCc5IvZj5/GbOakeqVX+Bar/G9kTty9xDJREcxukurkmYLA==
+jintr@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/jintr/-/jintr-2.1.1.tgz#84d555df06d26128c2a1d0e1eebd6fecdf8eb280"
+  integrity sha512-89cwX4ouogeDGOBsEVsVYsnWWvWjchmwXBB4kiBhmjOKw19FiOKhNhMhpxhTlK2ctl7DS+d/ethfmuBpzoNNgA==
   dependencies:
     acorn "^8.8.0"
 
@@ -9016,11 +9016,11 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
   integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
 
-youtubei.js@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-10.2.0.tgz#0f5fbacf3e64c965d6e7378c870a7329ceca7228"
-  integrity sha512-JLKW9AHQ1qrTwBbre1aDkH8UJFmNcc4+kOSaVou5jSY7AzfFPFJK0yvX6afnLst0UVC9wfXHrLiNx93sutVErA==
+youtubei.js@^10.3.0:
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-10.3.0.tgz#30a942e6b92ac8039a3d830563e383fdc9fd4772"
+  integrity sha512-tLmeJCECK2xF2hZZtF2nEqirdKVNLFSDpa0LhTaXY3tngtL7doQXyy7M2CLueramDTlmCnFaW+rctHirTPFaRQ==
   dependencies:
-    jintr "^2.0.0"
+    jintr "^2.1.1"
     tslib "^2.5.0"
     undici "^5.19.1"

From 8b66548607ef16136f9efbdc011bfd47dd1474a4 Mon Sep 17 00:00:00 2001
From: PrestonN <freetubeapp@protonmail.com>
Date: Fri, 2 Aug 2024 11:14:19 -0400
Subject: [PATCH 037/105] Bump version number to v0.21.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index deef1a2f128af..66bbed4be5c99 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.21.2",
+  "version": "0.21.3",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From 726f8a9b334100a3b8d7a7ef7bcabfc413f5ec53 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, 13 Dec 2024 02:22:39 +0100
Subject: [PATCH 038/105] Bump youtubei.js from 10.5.0 to 12.2.0 + Bump version
 number to from v022.0 to v0.22.1 + Fix incompatibility with upcoming
 YouTube.js version (#6343)

* Bump youtubei.js from 12.0.0 to 12.1.0 (#6341)

Bumps [youtubei.js](https://github.com/LuanRT/YouTube.js) from 12.0.0 to 12.1.0.
- [Release notes](https://github.com/LuanRT/YouTube.js/releases)
- [Changelog](https://github.com/LuanRT/YouTube.js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/LuanRT/YouTube.js/compare/v12.0.0...v12.1.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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix incompatibility with upcoming YouTube.js version (#6233)

* Bump version number to v0.22.1

* Bump youtubei.js from 12.1.0 to 12.2.0

Bumps [youtubei.js](https://github.com/LuanRT/YouTube.js) from 12.1.0 to 12.2.0.
- [Release notes](https://github.com/LuanRT/YouTube.js/releases)
- [Changelog](https://github.com/LuanRT/YouTube.js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/LuanRT/YouTube.js/compare/v12.1.0...v12.2.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>
Co-authored-by: absidue <48293849+absidue@users.noreply.github.com>
---
 package.json                      |  4 ++--
 src/renderer/helpers/api/local.js | 20 ++++++++++----------
 yarn.lock                         | 18 +++++++++---------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 64956715efd8f..4953f78334948 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.22.0",
+  "version": "0.22.1",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,
@@ -74,7 +74,7 @@
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
-    "youtubei.js": "^10.5.0"
+    "youtubei.js": "^12.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.25.8",
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index cd9f1da96c5b3..77afeda2636ad 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -1,4 +1,4 @@
-import { ClientType, Endpoints, Innertube, Misc, Parser, UniversalCache, Utils, YT } from 'youtubei.js'
+import { ClientType, Innertube, Misc, Parser, UniversalCache, Utils, YT, YTNodes } from 'youtubei.js'
 import Autolinker from 'autolinker'
 import { SEARCH_CHAR_LIMIT } from '../../../constants'
 
@@ -379,12 +379,12 @@ export async function getLocalChannelVideos(id) {
   const innertube = await createInnertube()
 
   try {
-    const response = await innertube.actions.execute(Endpoints.BrowseEndpoint.PATH, Endpoints.BrowseEndpoint.build({
-      browse_id: id,
+    const response = await innertube.actions.execute('/browse', {
+      browseId: id,
       params: 'EgZ2aWRlb3PyBgQKAjoA'
       // protobuf for the videos tab (this is the one that YouTube uses,
       // it has some empty fields in the protobuf but it doesn't work if you remove them)
-    }))
+    })
 
     const videosTab = new YT.Channel(null, response)
     const { id: channelId = id, name, thumbnailUrl } = parseLocalChannelHeader(videosTab, true)
@@ -436,12 +436,12 @@ export async function getLocalChannelLiveStreams(id) {
   const innertube = await createInnertube()
 
   try {
-    const response = await innertube.actions.execute(Endpoints.BrowseEndpoint.PATH, Endpoints.BrowseEndpoint.build({
-      browse_id: id,
+    const response = await innertube.actions.execute('/browse', {
+      browseId: id,
       params: 'EgdzdHJlYW1z8gYECgJ6AA%3D%3D'
       // protobuf for the live tab (this is the one that YouTube uses,
       // it has some empty fields in the protobuf but it doesn't work if you remove them)
-    }))
+    })
 
     let liveStreamsTab = new YT.Channel(innertube.actions, response)
     const { id: channelId = id, name, thumbnailUrl } = parseLocalChannelHeader(liveStreamsTab, true)
@@ -484,12 +484,12 @@ export async function getLocalChannelCommunity(id) {
   const innertube = await createInnertube()
 
   try {
-    const response = await innertube.actions.execute(Endpoints.BrowseEndpoint.PATH, Endpoints.BrowseEndpoint.build({
-      browse_id: id,
+    const response = await innertube.actions.execute('/browse', {
+      browseId: id,
       params: 'Egljb21tdW5pdHnyBgQKAkoA'
       // protobuf for the community tab (this is the one that YouTube uses,
       // it has some empty fields in the protobuf but it doesn't work if you remove them)
-    }))
+    })
 
     const communityTab = new YT.Channel(null, response)
 
diff --git a/yarn.lock b/yarn.lock
index f74ee514e8304..86a6b30804402 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5753,10 +5753,10 @@ jest-worker@^29.7.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jintr@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/jintr/-/jintr-2.1.1.tgz#84d555df06d26128c2a1d0e1eebd6fecdf8eb280"
-  integrity sha512-89cwX4ouogeDGOBsEVsVYsnWWvWjchmwXBB4kiBhmjOKw19FiOKhNhMhpxhTlK2ctl7DS+d/ethfmuBpzoNNgA==
+jintr@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/jintr/-/jintr-3.2.0.tgz#38bfc2311c7ed4412ebe0bfc5c2e700f8f433921"
+  integrity sha512-psD1yf05kMKDNsUdW1l5YhO59pHScQ6OIHHb8W5SKSM2dCOFPsqolmIuSHgVA8+3Dc47NJR181CXZ4alCAPTkA==
   dependencies:
     acorn "^8.8.0"
 
@@ -9412,12 +9412,12 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
   integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
 
-youtubei.js@^10.5.0:
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-10.5.0.tgz#3cf0c79cf73fb26e13d167f37dec7d65419e91b8"
-  integrity sha512-iyA+VF28c15tCCKH9ExM2RKC3zYiHzA/eixGlJ3vERANkuI+xYKzAZ4vtOhmyqwrAddu88R/DkzEsmpph5NWjg==
+youtubei.js@^12.2.0:
+  version "12.2.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-12.2.0.tgz#54f058b5d0892b5c7e35019e2be6a2a7f7ba4447"
+  integrity sha512-G+50qrbJCToMYhu8jbaHiS3Vf+RRul+CcDbz3hEGwHkGPh+zLiWwD6SS+YhYF+2/op4ZU5zDYQJrGqJ+wKh7Gw==
   dependencies:
     "@bufbuild/protobuf" "^2.0.0"
-    jintr "^2.1.1"
+    jintr "^3.2.0"
     tslib "^2.5.0"
     undici "^5.19.1"

From 3208308d53e3de70afbf4974f8dc42c4814d3c52 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Wed, 5 Feb 2025 23:23:53 +0100
Subject: [PATCH 039/105] Change the release workflow to accept the release ID
 as an input (#6751)

---
 .github/workflows/release.yml | 69 +++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 70075ee77e745..588793834699b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,6 +6,11 @@ name: Upload Release
 # or API.
 on:
   workflow_dispatch:
+    inputs:
+      releaseId:
+        type: string
+        required: true
+        description: Release ID
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -94,7 +99,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-x64-portable.zip
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.zip
         asset_content_type: application/zip
@@ -105,7 +110,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-x64-portable.7z
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.7z
         asset_content_type: application/x-7z-compressed
@@ -116,7 +121,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-armv7l-portable.zip
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.zip
         asset_content_type: application/zip
@@ -127,7 +132,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-armv7l-portable.7z
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.7z
         asset_content_type: application/x-7z-compressed
@@ -138,7 +143,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-arm64-portable.zip
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.zip
         asset_content_type: application/zip
@@ -149,7 +154,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-arm64-portable.7z
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.7z
         asset_content_type: application/x-7z-compressed
@@ -160,7 +165,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube_${{ steps.getPackageInfo.outputs.version }}_amd64.deb
         asset_path: build/freetube_${{ steps.getPackageInfo.outputs.version }}_amd64.deb
         asset_content_type: application/vnd.debian.binary-package
@@ -171,7 +176,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube_${{ steps.getPackageInfo.outputs.version }}_armv7l.deb
         asset_path: build/freetube_${{ steps.getPackageInfo.outputs.version }}_armv7l.deb
         asset_content_type: application/vnd.debian.binary-package
@@ -182,7 +187,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube_${{ steps.getPackageInfo.outputs.version }}_arm64.deb
         asset_path: build/freetube_${{ steps.getPackageInfo.outputs.version }}_arm64.deb
         asset_content_type: application/vnd.debian.binary-package
@@ -193,7 +198,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-amd64.AppImage
         asset_path: build/FreeTube-${{ steps.getPackageInfo.outputs.version }}.AppImage
         asset_content_type: application/vnd.appimage
@@ -204,7 +209,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.AppImage
         asset_path: build/FreeTube-${{ steps.getPackageInfo.outputs.version }}-armv7l.AppImage
         asset_content_type: application/vnd.appimage
@@ -215,7 +220,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.AppImage
         asset_path: build/FreeTube-${{ steps.getPackageInfo.outputs.version }}-arm64.AppImage
         asset_content_type: application/vnd.appimage
@@ -226,7 +231,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}.amd64.rpm
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.x86_64.rpm
         asset_content_type: application/x-rpm
@@ -239,7 +244,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}.arm64.rpm
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.aarch64.rpm
         asset_content_type: application/x-rpm
@@ -250,7 +255,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-amd64.apk
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.apk
         asset_content_type: application/octet-stream
@@ -261,7 +266,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-armv7l.apk
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.apk
         asset_content_type: application/octet-stream
@@ -272,7 +277,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-arm64.apk
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.apk
         asset_content_type: application/octet-stream
@@ -283,7 +288,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-amd64.pacman
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.pacman
         asset_content_type: application/x-zstd-compressed-tar
@@ -294,7 +299,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-setup-x64.exe
         asset_path: build/freetube Setup ${{ steps.getPackageInfo.outputs.version }}.exe
         asset_content_type: application/x-ms-dos-executable
@@ -305,7 +310,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-win-x64-portable.exe
         asset_path: build/FreeTube ${{ steps.getPackageInfo.outputs.version }}.exe
         asset_content_type: application/x-ms-dos-executable
@@ -316,7 +321,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-win-x64-portable.zip
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-win.zip
         asset_content_type: application/zip
@@ -327,7 +332,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-win-x64-portable.7z
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-win.7z
         asset_content_type: application/x-7z-compressed
@@ -338,7 +343,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-setup-arm64.exe
         asset_path: build/freetube Setup ${{ steps.getPackageInfo.outputs.version }}.exe
         asset_content_type: application/x-ms-dos-executable
@@ -349,7 +354,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-win-arm64-portable.exe
         asset_path: build/FreeTube ${{ steps.getPackageInfo.outputs.version }}.exe
         asset_content_type: application/x-ms-dos-executable
@@ -360,7 +365,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-win-arm64-portable.zip
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-win.zip
         asset_content_type: application/zip
@@ -371,7 +376,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-win-arm64-portable.7z
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-win.7z
         asset_content_type: application/x-7z-compressed
@@ -382,7 +387,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-x64.dmg
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.dmg
         asset_content_type: application/x-apple-diskimage
@@ -393,7 +398,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-x64.zip
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-mac.zip
         asset_content_type: application/zip
@@ -404,7 +409,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-x64.7z
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-mac.7z
         asset_content_type: application/x-7z-compressed
@@ -415,7 +420,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.dmg
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.dmg
         asset_content_type: application/x-apple-diskimage
@@ -426,7 +431,7 @@ jobs:
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.zip
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.zip
         asset_content_type: application/x-apple-diskimage
@@ -437,7 +442,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ secrets.UPLOAD_ID }}/assets{?name,label}
+        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
         asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.7z
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.7z
         asset_content_type: application/x-7z-compressed

From 19f7195fba62fee010ee6e846ee0af53a0cc2f7a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2025 20:13:43 -0500
Subject: [PATCH 040/105] Bump youtubei.js from 13.0.0 to 13.1.0 (#6867)

Bumps [youtubei.js](https://github.com/LuanRT/YouTube.js) from 13.0.0 to 13.1.0.
- [Release notes](https://github.com/LuanRT/YouTube.js/releases)
- [Changelog](https://github.com/LuanRT/YouTube.js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/LuanRT/YouTube.js/compare/v13.0.0...v13.1.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>
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 cd11646dbbfb4..e2a4d1b74aece 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": "^13.0.0"
+    "youtubei.js": "^13.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.26.7",
diff --git a/yarn.lock b/yarn.lock
index c10ec43b577e1..058a220b20202 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5949,10 +5949,10 @@ jest-worker@^29.7.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jintr@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jintr/-/jintr-3.2.0.tgz#38bfc2311c7ed4412ebe0bfc5c2e700f8f433921"
-  integrity sha512-psD1yf05kMKDNsUdW1l5YhO59pHScQ6OIHHb8W5SKSM2dCOFPsqolmIuSHgVA8+3Dc47NJR181CXZ4alCAPTkA==
+jintr@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jintr/-/jintr-3.2.1.tgz#ea6719485c9ff5f14ca7f9131990040d4fdfe1be"
+  integrity sha512-yjKUBuwTTg4nc4izMysxuIk0BKh45hnbc1KnXE6LxagIGZn5od+I2elpuRY9IIm3EiKiUZxhxV89a0iX+xoEZg==
   dependencies:
     acorn "^8.8.0"
 
@@ -9722,12 +9722,12 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
   integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
 
-youtubei.js@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-13.0.0.tgz#f036bc6f5cb9ef8bd73da7e1079a2b70776bb2f7"
-  integrity sha512-b1QkN9bfgphK+5tI4qteSK54kNxmPhoedvMw0jl4uSn+L8gbDbJ4z52amNuYNcOdp4X/SI3JuUb+f5V0DPJ8Vw==
+youtubei.js@^13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-13.1.0.tgz#1e15da01e58c782ab6fb7cc9191a1c99f821c57f"
+  integrity sha512-uL4TyojAYET0c5NGFD7+ScCod/k8Pc/B+D5tLrunFcz1GaBjRMOGRPcNGaRmnhwisegU7ibtw0iUxCN+BZ0ang==
   dependencies:
     "@bufbuild/protobuf" "^2.0.0"
-    jintr "^3.2.0"
+    jintr "^3.2.1"
     tslib "^2.5.0"
     undici "^5.19.1"

From cd16f896614eb8480b9f53975203920045cb2cff Mon Sep 17 00:00:00 2001
From: Jason Henriquez <jasonhenriquez@protonmail.com>
Date: Sat, 22 Feb 2025 08:26:39 -0600
Subject: [PATCH 041/105] Update version number

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e2a4d1b74aece..55f039543f8fd 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.23.1",
+  "version": "0.23.2",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From ed141224794e094712281b2aa9a726e486d365cf Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Sun, 23 Feb 2025 23:11:29 +0000
Subject: [PATCH 042/105] Update flatpak.yml (#6903)

---
 .github/workflows/flatpak.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 3696960a64f50..2a2f4a76a8694 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -19,17 +19,16 @@ jobs:
       with:
         repository: flathub/io.freetubeapp.FreeTube
         token: ${{ secrets.FLATHUB_TOKEN }}
-    - name: GitHub API exec action
+    - name: Get Repo Release List
       uses: moustacheful/github-api-exec-action@v0
-      id: api_results
+      id: list_results
       with:
         # Command to execute, (e.g: `pulls.create`), see https://octokit.github.io/rest.js/ for available commands
-        command: repos.getRelease
+        command: repos.listReleases
         payload: >
             {
               "owner": "FreeTubeApp",
-              "repo": "FreeTube",
-              "release_id": ${{ secrets.UPLOAD_ID }}
+              "repo": "FreeTube"
             }
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -39,7 +38,7 @@ jobs:
       uses: bluwy/substitute-string-action@v3
       id: sub
       with:
-        _input-text: ${{ fromJson(steps.api_results.outputs.result).tag_name }}
+        _input-text: ${{ fromJson(steps.list_results.outputs.result)[0].tag_name }}
         -beta: ''
         v: ''
     - name: Create Release Branch
@@ -97,7 +96,7 @@ jobs:
         # The Command which should be run
         cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml
     - name: Add Patch Notes to XML File
-      run: xmlstarlet ed -L -i /application/releases/release[1] -t elem -n releaseTMP -v "" -i //releaseTMP -t attr -n version -v "${{ steps.sub.outputs.result }} Beta" -i //releaseTMP -t attr -n date -v "${{ env.CURRENT_DATE }}" -s //releaseTMP -t elem -n url -v "" -s //releaseTMP/url -t text -n "" -v "https://github.com/FreeTubeApp/FreeTube/releases/tag/v${{ steps.sub.outputs.result }}-beta" -r //releaseTMP -v "release" io.freetubeapp.FreeTube.metainfo.xml
+      run: xmlstarlet ed -L -i /component/releases/release[1] -t elem -n releaseTMP -v "" -i //releaseTMP -t attr -n version -v "${{ steps.sub.outputs.result }} Beta" -i //releaseTMP -t attr -n date -v "${{ env.CURRENT_DATE }}" -s //releaseTMP -t elem -n url -v "" -s //releaseTMP/url -t text -n "" -v "https://github.com/FreeTubeApp/FreeTube/releases/tag/v${{ steps.sub.outputs.result }}-beta" -r //releaseTMP -v "release" io.freetubeapp.FreeTube.metainfo.xml
     - name: Remove Release Files
       run: |
         rm freetube-${{ steps.sub.outputs.result }}-linux-x64-portable.zip
@@ -108,7 +107,6 @@ jobs:
         # Optional but recommended
         # Defaults to "Apply automatic changes"
         commit_message: Update files for v${{ steps.sub.outputs.result }}
-        token: ${{ secrets.FLATHUB_TOKEN }}
 
         # Optional options appended to `git-commit`
         # See https://git-scm.com/docs/git-commit for a list of available options

From 10ca10d5e1e0489d17c004106b47301242067744 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Mon, 10 Mar 2025 01:56:00 +0100
Subject: [PATCH 043/105] Update Invidious DASH xtags handling for YouTube.js
 changes (#6944)

---
 src/renderer/helpers/api/invidious.js | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/renderer/helpers/api/invidious.js b/src/renderer/helpers/api/invidious.js
index dd1c85fecb1ac..e3378de74e8a3 100644
--- a/src/renderer/helpers/api/invidious.js
+++ b/src/renderer/helpers/api/invidious.js
@@ -859,7 +859,9 @@ export function convertInvidiousToLocalFormat(format) {
   const [initStart, initEnd] = format.init.split('-')
   const [indexStart, indexEnd] = format.index.split('-')
 
-  const duration = parseInt(parseFloat(new URL(format.url).searchParams.get('dur')) * 1000)
+  const url = new URL(format.url)
+
+  const duration = parseInt(parseFloat(url.searchParams.get('dur')) * 1000)
 
   // only converts the properties that are needed to generate a DASH manifest with YouTube.js
   // audioQuality and qualityLabel don't go inside the DASH manifest, but are used by YouTube.js
@@ -896,6 +898,27 @@ export function convertInvidiousToLocalFormat(format) {
         })
   })
 
+  if (localFormat.has_audio && url.searchParams.has('xtags')) {
+    const xtags = url.searchParams.get('xtags').split(':')
+
+    localFormat.language = xtags.find((tag) => tag.startsWith('lang='))?.split('=')[1] || null
+    localFormat.is_drc = xtags.includes('drc=1')
+
+    const audioContent = xtags.find((tag) => tag.startsWith('acont='))?.split('=')[1]
+    localFormat.is_dubbed = audioContent === 'dubbed'
+    localFormat.is_descriptive = audioContent === 'descriptive'
+    localFormat.is_secondary = audioContent === 'secondary'
+    localFormat.is_auto_dubbed = audioContent === 'dubbed-auto'
+    localFormat.is_original = audioContent === 'original' ||
+      (
+        !localFormat.is_dubbed &&
+        !localFormat.is_descriptive &&
+        !localFormat.is_secondary &&
+        !localFormat.is_auto_dubbed &&
+        !localFormat.is_drc
+      )
+  }
+
   return localFormat
 }
 

From 3de74bd4b06e9092fecf8d261335417db4bbef93 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sat, 8 Mar 2025 19:59:14 +0100
Subject: [PATCH 044/105] Allow legacy formats to be used even when dash and
 audio-only are unavailable (#6977)

---
 .../ft-shaka-video-player.js                  |  2 +-
 src/renderer/helpers/api/local.js             |  7 +++-
 src/renderer/views/Watch/Watch.js             | 38 ++++++++++---------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
index 2fa7df3495c8f..d23b59b719f21 100644
--- a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
+++ b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
@@ -65,7 +65,7 @@ export default defineComponent({
     },
     manifestSrc: {
       type: String,
-      required: true
+      default: null
     },
     manifestMimeType: {
       type: String,
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 3c75d60d874c7..35bebbeb01684 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -271,7 +271,12 @@ export async function getLocalVideoInfo(id) {
 
   if (info.streaming_data) {
     decipherFormats(info.streaming_data.formats, webInnertube.session.player)
-    decipherFormats(info.streaming_data.adaptive_formats, webInnertube.session.player)
+
+    const firstFormat = info.streaming_data.adaptive_formats[0]
+
+    if (firstFormat.url || firstFormat.signature_cipher || firstFormat.cipher) {
+      decipherFormats(info.streaming_data.adaptive_formats, webInnertube.session.player)
+    }
 
     if (info.streaming_data.dash_manifest_url) {
       let url = info.streaming_data.dash_manifest_url
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 8766736cf0ef6..719c96689aecf 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -695,25 +695,29 @@ export default defineComponent({
             /** @type {import('../../helpers/api/local').LocalFormat[]} */
             const formats = [...result.streaming_data.formats, ...result.streaming_data.adaptive_formats]
 
-            const downloadLinks = formats.map((format) => {
-              const qualityLabel = format.quality_label ?? format.bitrate
-              const fps = format.fps ? `${format.fps}fps` : 'kbps'
-              const type = format.mime_type.split(';')[0]
-              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')}`
+            const downloadLinks = []
+
+            for (const format of formats) {
+              if (format.freeTubeUrl) {
+                const qualityLabel = format.quality_label ?? format.bitrate
+                const fps = format.fps ? `${format.fps}fps` : 'kbps'
+                const type = format.mime_type.split(';')[0]
+                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 {
-                url: format.freeTubeUrl,
-                label: label
+                downloadLinks.push({
+                  url: format.freeTubeUrl,
+                  label: label
+                })
               }
-            })
+            }
 
             if (result.captions) {
               const captionTracks = result.captions?.caption_tracks?.map((caption) => {
@@ -779,7 +783,7 @@ export default defineComponent({
             return
           }
 
-          if (result.streaming_data?.adaptive_formats.length > 0) {
+          if (result.streaming_data?.adaptive_formats.length > 0 && result.streaming_data.adaptive_formats[0].freeTubeUrl) {
             this.vrProjection = result.streaming_data.adaptive_formats
               .find(format => {
                 return format.has_video &&

From 3710723f9456bfaeb9670cf860808220fd9ded8c Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 2 Mar 2025 16:06:59 +0100
Subject: [PATCH 045/105] Apply proxy settings to the PO token web views
 (#6922)

---
 src/main/index.js            | 10 ++++++++--
 src/main/poTokenGenerator.js |  9 ++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index 9fefe5d2a780f..deb6c85780431 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -287,6 +287,8 @@ function runApp() {
     })
   }
 
+  let proxyUrl
+
   app.on('ready', async (_, __) => {
     if (process.env.NODE_ENV === 'production') {
       protocol.handle('app', async (request) => {
@@ -400,8 +402,10 @@ function runApp() {
     }
 
     if (useProxy) {
+      proxyUrl = `${proxyProtocol}://${proxyHostname}:${proxyPort}`
+
       session.defaultSession.setProxy({
-        proxyRules: `${proxyProtocol}://${proxyHostname}:${proxyPort}`
+        proxyRules: proxyUrl
       })
     }
 
@@ -884,18 +888,20 @@ function runApp() {
   })
 
   ipcMain.handle(IpcChannels.GENERATE_PO_TOKEN, (_, visitorData) => {
-    return generatePoToken(visitorData)
+    return generatePoToken(visitorData, proxyUrl)
   })
 
   ipcMain.on(IpcChannels.ENABLE_PROXY, (_, url) => {
     session.defaultSession.setProxy({
       proxyRules: url
     })
+    proxyUrl = url
     session.defaultSession.closeAllConnections()
   })
 
   ipcMain.on(IpcChannels.DISABLE_PROXY, () => {
     session.defaultSession.setProxy({})
+    proxyUrl = undefined
     session.defaultSession.closeAllConnections()
   })
 
diff --git a/src/main/poTokenGenerator.js b/src/main/poTokenGenerator.js
index 5871d7483975d..dd8850ed6276b 100644
--- a/src/main/poTokenGenerator.js
+++ b/src/main/poTokenGenerator.js
@@ -10,9 +10,10 @@ import { join } from 'path'
  * as the BotGuard stuff accesses the global `document` and `window` objects and also requires making some requests.
  * So we definitely don't want it running in the same places as the rest of the FreeTube code with the user data.
  * @param {string} visitorData
+ * @param {string|undefined} proxyUrl
  * @returns {Promise<string>}
  */
-export async function generatePoToken(visitorData) {
+export async function generatePoToken(visitorData, proxyUrl) {
   const sessionUuid = crypto.randomUUID()
 
   const theSession = session.fromPartition(`potoken-${sessionUuid}`, { cache: false })
@@ -28,6 +29,12 @@ export async function generatePoToken(visitorData) {
       .join(' ')
   )
 
+  if (proxyUrl) {
+    await theSession.setProxy({
+      proxyRules: proxyUrl
+    })
+  }
+
   const webContentsView = new WebContentsView({
     webPreferences: {
       backgroundThrottling: false,

From 2b2e75c798bb5f382690061aa1579668f0962f29 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Mon, 17 Mar 2025 13:42:16 +0100
Subject: [PATCH 046/105] Implement content and session PO tokens (#6931)

* Implement content and session PO tokens

* Remove timeout after BgUtils update

* Trigger GitHub CI
---
 src/botGuardScript.js             | 87 +++++++++++++++++++++++++------
 src/constants.js                  |  2 +-
 src/main/index.js                 |  4 +-
 src/main/poTokenGenerator.js      | 86 +++++++++++++-----------------
 src/renderer/helpers/api/local.js | 26 +++++----
 5 files changed, 126 insertions(+), 79 deletions(-)

diff --git a/src/botGuardScript.js b/src/botGuardScript.js
index 11da8855a6472..f2f1a9dc52cf9 100644
--- a/src/botGuardScript.js
+++ b/src/botGuardScript.js
@@ -1,37 +1,90 @@
-import { BG } from 'bgutils-js'
+import { BG, buildURL, GOOG_API_KEY } from 'bgutils-js'
 
 // This script has it's own webpack config, as it gets passed as a string to Electron's evaluateJavaScript function
 // in src/main/poTokenGenerator.js
-export default async function(visitorData) {
+
+/**
+ * Based on: https://github.com/LuanRT/BgUtils/blob/main/examples/node/innertube-challenge-fetcher-example.ts
+ * @param {string} videoId
+ * @param {string} visitorData
+ * @param {import('youtubei.js').Session['context']} context
+ */
+export default async function (videoId, visitorData, context) {
   const requestKey = 'O43z0dpjhgX20SCx4KAo'
 
-  const bgConfig = {
-    fetch: (input, init) => fetch(input, init),
-    requestKey,
-    globalObj: window,
-    identifier: visitorData
+  const challengeResponse = await fetch(
+    'https://www.youtube.com/youtubei/v1/att/get?prettyPrint=false&alt=json',
+    {
+      method: 'POST',
+      headers: {
+        Accept: '*/*',
+        'Content-Type': 'application/json',
+        'X-Goog-Visitor-Id': visitorData,
+        'X-Youtube-Client-Version': context.client.clientVersion,
+        'X-Youtube-Client-Name': '1'
+      },
+      body: JSON.stringify({
+        engagementType: 'ENGAGEMENT_TYPE_UNBOUND',
+        context
+      }),
+    }
+  )
+
+  if (!challengeResponse.ok) {
+    throw new Error(`Request to ${challengeResponse.url} failed with status ${challengeResponse.status}\n${await challengeResponse.text()}`)
   }
 
-  const challenge = await BG.Challenge.create(bgConfig)
+  const challengeData = await challengeResponse.json()
 
-  if (!challenge) {
-    throw new Error('Could not get challenge')
+  if (!challengeData.bgChallenge) {
+    throw new Error('Failed to get BotGuard challenge')
   }
 
-  const interpreterJavascript = challenge.interpreterJavascript.privateDoNotAccessOrElseSafeScriptWrappedValue
+  let interpreterUrl = challengeData.bgChallenge.interpreterUrl.privateDoNotAccessOrElseTrustedResourceUrlWrappedValue
+
+  if (interpreterUrl.startsWith('//')) {
+    interpreterUrl = `https:${interpreterUrl}`
+  }
+
+  const bgScriptResponse = await fetch(interpreterUrl)
+  const interpreterJavascript = await bgScriptResponse.text()
 
   if (interpreterJavascript) {
     // eslint-disable-next-line no-new-func
     new Function(interpreterJavascript)()
   } else {
-    console.warn('Unable to load VM.')
+    throw new Error('Could not load VM.')
   }
 
-  const poTokenResult = await BG.PoToken.generate({
-    program: challenge.program,
-    globalName: challenge.globalName,
-    bgConfig
+  const botGuard = await BG.BotGuardClient.create({
+    program: challengeData.bgChallenge.program,
+    globalName: challengeData.bgChallenge.globalName,
+    globalObj: window
   })
 
-  return poTokenResult.poToken
+  const webPoSignalOutput = []
+  const botGuardResponse = await botGuard.snapshot({ webPoSignalOutput })
+
+  const integrityTokenResponse = await fetch(buildURL('GenerateIT', true), {
+    method: 'POST',
+    headers: {
+      'content-type': 'application/json+protobuf',
+      'x-goog-api-key': GOOG_API_KEY,
+      'x-user-agent': 'grpc-web-javascript/0.1',
+    },
+    body: JSON.stringify([requestKey, botGuardResponse])
+  })
+
+  const response = await integrityTokenResponse.json()
+
+  if (typeof response[0] !== 'string') {
+    throw new Error('Could not get integrity token')
+  }
+
+  const integrityTokenBasedMinter = await BG.WebPoMinter.create({ integrityToken: response[0] }, webPoSignalOutput)
+
+  const contentPoToken = await integrityTokenBasedMinter.mintAsWebsafeString(videoId)
+  const sessionPoToken = await integrityTokenBasedMinter.mintAsWebsafeString(visitorData)
+
+  return { contentPoToken, sessionPoToken }
 }
diff --git a/src/constants.js b/src/constants.js
index 66a2f73751195..2271764192348 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -47,7 +47,7 @@ const IpcChannels = {
 
   SET_INVIDIOUS_AUTHORIZATION: 'set-invidious-authorization',
 
-  GENERATE_PO_TOKEN: 'generate-po-token',
+  GENERATE_PO_TOKENS: 'generate-po-tokens',
 
   WRITE_SCREENSHOT: 'write-screenshot',
 }
diff --git a/src/main/index.js b/src/main/index.js
index deb6c85780431..457e5ae18dbf3 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -887,8 +887,8 @@ function runApp() {
     })
   })
 
-  ipcMain.handle(IpcChannels.GENERATE_PO_TOKEN, (_, visitorData) => {
-    return generatePoToken(visitorData, proxyUrl)
+  ipcMain.handle(IpcChannels.GENERATE_PO_TOKENS, (_, videoId, visitorData, context) => {
+    return generatePoToken(videoId, visitorData, context, proxyUrl)
   })
 
   ipcMain.on(IpcChannels.ENABLE_PROXY, (_, url) => {
diff --git a/src/main/poTokenGenerator.js b/src/main/poTokenGenerator.js
index dd8850ed6276b..01211766aa27d 100644
--- a/src/main/poTokenGenerator.js
+++ b/src/main/poTokenGenerator.js
@@ -9,11 +9,13 @@ import { join } from 'path'
  * This is intentionally split out into it's own thing, with it's own temporary in-memory session,
  * as the BotGuard stuff accesses the global `document` and `window` objects and also requires making some requests.
  * So we definitely don't want it running in the same places as the rest of the FreeTube code with the user data.
+ * @param {string} videoId
  * @param {string} visitorData
+ * @param {string} context
  * @param {string|undefined} proxyUrl
- * @returns {Promise<string>}
+ * @returns {Promise<{ contentPoToken: string, sessionPoToken: string }>}
  */
-export async function generatePoToken(visitorData, proxyUrl) {
+export async function generatePoToken(videoId, visitorData, context, proxyUrl) {
   const sessionUuid = crypto.randomUUID()
 
   const theSession = session.fromPartition(`potoken-${sessionUuid}`, { cache: false })
@@ -22,12 +24,7 @@ export async function generatePoToken(visitorData, proxyUrl) {
   // eslint-disable-next-line n/no-callback-literal
   theSession.setPermissionRequestHandler((webContents, permission, callback) => callback(false))
 
-  theSession.setUserAgent(
-    theSession.getUserAgent()
-      .split(' ')
-      .filter(part => !part.includes('Electron'))
-      .join(' ')
-  )
+  theSession.setUserAgent(session.defaultSession.getUserAgent())
 
   if (proxyUrl) {
     await theSession.setProxy({
@@ -35,6 +32,27 @@ export async function generatePoToken(visitorData, proxyUrl) {
     })
   }
 
+  theSession.webRequest.onBeforeSendHeaders({
+    urls: ['https://www.google.com/js/*', 'https://www.youtube.com/youtubei/*']
+  }, ({ requestHeaders, url }, callback) => {
+    if (url.startsWith('https://www.youtube.com/youtubei/')) {
+      // make InnerTube requests work with the fetch function
+      // InnerTube rejects requests if the referer isn't YouTube or empty
+      requestHeaders.Referer = 'https://www.youtube.com/'
+      requestHeaders.Origin = 'https://www.youtube.com'
+
+      requestHeaders['Sec-Fetch-Site'] = 'same-origin'
+      requestHeaders['Sec-Fetch-Mode'] = 'same-origin'
+      requestHeaders['X-Youtube-Bootstrap-Logged-In'] = 'false'
+    } else {
+      requestHeaders['Sec-Fetch-Dest'] = 'script'
+      requestHeaders['Sec-Fetch-Site'] = 'cross-site'
+      requestHeaders['Accept-Language'] = '*'
+    }
+
+    callback({ requestHeaders })
+  })
+
   const webContentsView = new WebContentsView({
     webPreferences: {
       backgroundThrottling: false,
@@ -42,7 +60,8 @@ export async function generatePoToken(visitorData, proxyUrl) {
       sandbox: true,
       v8CacheOptions: 'none',
       session: theSession,
-      offscreen: true
+      offscreen: true,
+      webSecurity: false
     }
   })
 
@@ -58,43 +77,8 @@ export async function generatePoToken(visitorData, proxyUrl) {
 
   webContentsView.webContents.debugger.attach()
 
-  await webContentsView.webContents.loadURL('data:text/html,', {
-    baseURLForDataURL: 'https://www.youtube.com'
-  })
-
-  await webContentsView.webContents.debugger.sendCommand('Emulation.setUserAgentOverride', {
-    userAgent: theSession.getUserAgent(),
-    acceptLanguage: 'en-US',
-    platform: 'Win32',
-    userAgentMetadata: {
-      brands: [
-        {
-          brand: 'Not/A)Brand',
-          version: '99'
-        },
-        {
-          brand: 'Chromium',
-          version: process.versions.chrome.split('.')[0]
-        }
-      ],
-      fullVersionList: [
-        {
-          brand: 'Not/A)Brand',
-          version: '99.0.0.0'
-        },
-        {
-          brand: 'Chromium',
-          version: process.versions.chrome
-        }
-      ],
-      platform: 'Windows',
-      platformVersion: '10.0.0',
-      architecture: 'x86',
-      model: '',
-      mobile: false,
-      bitness: '64',
-      wow64: false
-    }
+  await webContentsView.webContents.loadURL('data:text/html,<!DOCTYPE html><html lang="en"><head><title></title></head><body></body></html>', {
+    baseURLForDataURL: 'https://www.youtube.com/'
   })
 
   await webContentsView.webContents.debugger.sendCommand('Emulation.setDeviceMetricsOverride', {
@@ -112,7 +96,7 @@ export async function generatePoToken(visitorData, proxyUrl) {
     }
   })
 
-  const script = await getScript(visitorData)
+  const script = await getScript(videoId, visitorData, context)
 
   const response = await webContentsView.webContents.executeJavaScript(script)
 
@@ -125,9 +109,11 @@ export async function generatePoToken(visitorData, proxyUrl) {
 let cachedScript
 
 /**
+ * @param {string} videoId
  * @param {string} visitorData
+ * @param {string} context
  */
-async function getScript(visitorData) {
+async function getScript(videoId, visitorData, context) {
   if (!cachedScript) {
     const pathToScript = process.env.NODE_ENV === 'development'
       ? join(__dirname, '../../dist/botGuardScript.js')
@@ -140,8 +126,8 @@ async function getScript(visitorData) {
 
     const functionName = match[1]
 
-    cachedScript = content.replace(match[0], `;${functionName}("FT_VISITOR_DATA")`)
+    cachedScript = content.replace(match[0], `;${functionName}(FT_PARAMS)`)
   }
 
-  return cachedScript.replace('FT_VISITOR_DATA', visitorData)
+  return cachedScript.replace('FT_PARAMS', `"${videoId}","${visitorData}",${context}`)
 }
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 35bebbeb01684..ced408aa30b95 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -197,16 +197,24 @@ export async function getLocalSearchContinuation(continuationData) {
 export async function getLocalVideoInfo(id) {
   const webInnertube = await createInnertube({ withPlayer: true, generateSessionLocally: false })
 
-  let poToken
+  // based on the videoId (added to the body of the /player request)
+  let contentPoToken
+  // based on the visitor data (added to the streaming URLs)
+  let sessionPoToken
 
   if (process.env.IS_ELECTRON) {
     const { ipcRenderer } = require('electron')
 
     try {
-      poToken = await ipcRenderer.invoke(IpcChannels.GENERATE_PO_TOKEN, webInnertube.session.context.client.visitorData)
-
-      webInnertube.session.po_token = poToken
-      webInnertube.session.player.po_token = poToken
+      ({ contentPoToken, sessionPoToken } = await ipcRenderer.invoke(
+        IpcChannels.GENERATE_PO_TOKENS,
+        id,
+        webInnertube.session.context.client.visitorData,
+        JSON.stringify(webInnertube.session.context)
+      ))
+
+      webInnertube.session.po_token = contentPoToken
+      webInnertube.session.player.po_token = sessionPoToken
     } catch (error) {
       console.error('Local API, poToken generation failed', error)
       throw error
@@ -226,8 +234,8 @@ export async function getLocalVideoInfo(id) {
     const webEmbeddedInnertube = await createInnertube({ clientType: ClientType.WEB_EMBEDDED })
     webEmbeddedInnertube.session.context.client.visitorData = webInnertube.session.context.client.visitorData
 
-    if (poToken) {
-      webEmbeddedInnertube.session.po_token = poToken
+    if (contentPoToken) {
+      webEmbeddedInnertube.session.po_token = contentPoToken
     }
 
     const videoId = hasTrailer && trailerIsAgeRestricted ? info.playability_status.error_screen.video_id : id
@@ -282,9 +290,9 @@ export async function getLocalVideoInfo(id) {
       let url = info.streaming_data.dash_manifest_url
 
       if (url.includes('?')) {
-        url += `&pot=${encodeURIComponent(poToken)}&mpd_version=7`
+        url += `&pot=${encodeURIComponent(sessionPoToken)}&mpd_version=7`
       } else {
-        url += `${url.endsWith('/') ? '' : '/'}pot/${encodeURIComponent(poToken)}/mpd_version/7`
+        url += `${url.endsWith('/') ? '' : '/'}pot/${encodeURIComponent(sessionPoToken)}/mpd_version/7`
       }
 
       info.streaming_data.dash_manifest_url = url

From 9d9cc71197fb5d65d6ce6b54ceb7ad84dc8907fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Mar 2025 18:16:40 +0100
Subject: [PATCH 047/105] Bump youtubei.js from 13.1.0 to 13.3.0 (#7077)

* Bump youtubei.js from 13.1.0 to 13.3.0

Bumps [youtubei.js](https://github.com/LuanRT/YouTube.js) from 13.1.0 to 13.3.0.
- [Release notes](https://github.com/LuanRT/YouTube.js/releases)
- [Changelog](https://github.com/LuanRT/YouTube.js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/LuanRT/YouTube.js/compare/v13.1.0...v13.3.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>

* ! Fix video data parsing without view count

* Fix compatibility issues

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: PikachuEXE <git@pikachuexe.net>
Co-authored-by: absidue <48293849+absidue@users.noreply.github.com>
---
 package.json                      |  2 +-
 src/renderer/helpers/api/local.js | 20 ++++++++++++++------
 yarn.lock                         | 23 +++++++++--------------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 55f039543f8fd..2799f03da9db7 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": "^13.1.0"
+    "youtubei.js": "^13.3.0"
   },
   "devDependencies": {
     "@babel/core": "^7.26.7",
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index ced408aa30b95..c4bbb62085305 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -153,8 +153,8 @@ export async function getLocalTrending(location, tab, instance) {
     results = []
 
     resultsInstance.videos.forEach(video => {
-      if (video.type === 'Video' && !alreadySeenIds.includes(video.id)) {
-        alreadySeenIds.push(video.id)
+      if (video.type === 'Video' && !alreadySeenIds.includes(video.video_id)) {
+        alreadySeenIds.push(video.video_id)
         results.push(parseLocalListVideo(video))
       }
     })
@@ -1108,7 +1108,7 @@ export function parseLocalListVideo(item) {
 
     return {
       type: 'video',
-      videoId: video.id,
+      videoId: video.video_id,
       title: video.title.text,
       author: video.author?.name,
       authorId: video.author?.id,
@@ -1148,14 +1148,22 @@ export function parseLocalListVideo(item) {
       video.upcoming
     )
 
+    let viewCount = null
+
+    if (video.view_count?.text) {
+      viewCount = video.view_count.text.toLowerCase() === 'no views' ? 0 : extractNumberFromString(video.view_count.text)
+    } else if (video.short_view_count?.text) {
+      viewCount = video.short_view_count.text.toLowerCase() === 'no views' ? 0 : parseLocalSubscriberCount(video.short_view_count.text)
+    }
+
     return {
       type: 'video',
-      videoId: video.id,
+      videoId: video.video_id,
       title: video.title.text,
       author: video.author.name,
       authorId: video.author.id,
       description: video.description,
-      viewCount: video.view_count?.text == null ? (video.short_view_count.text == null ? null : parseLocalSubscriberCount(video.short_view_count.text)) : extractNumberFromString(video.view_count.text),
+      viewCount,
       published,
       lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds,
       liveNow: video.is_live,
@@ -1342,7 +1350,7 @@ export function parseLocalWatchNextVideo(video) {
 
   return {
     type: 'video',
-    videoId: video.id,
+    videoId: video.video_id,
     title: video.title.text,
     author: video.author.name,
     authorId: video.author.id,
diff --git a/yarn.lock b/yarn.lock
index 058a220b20202..f125fc5f0892c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5949,10 +5949,10 @@ jest-worker@^29.7.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jintr@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jintr/-/jintr-3.2.1.tgz#ea6719485c9ff5f14ca7f9131990040d4fdfe1be"
-  integrity sha512-yjKUBuwTTg4nc4izMysxuIk0BKh45hnbc1KnXE6LxagIGZn5od+I2elpuRY9IIm3EiKiUZxhxV89a0iX+xoEZg==
+jintr@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/jintr/-/jintr-3.3.0.tgz#74271197c260b9b2e435d961339263c515df603d"
+  integrity sha512-ZsaajJ4Hr5XR0tSPhOZOTjFhxA0qscKNSOs41NRjx7ZOGwpfdp8NKIBEUtvUPbA37JXyv1sJlgeOOZHjr3h76Q==
   dependencies:
     acorn "^8.8.0"
 
@@ -9717,17 +9717,12 @@ 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==
 
-yocto-queue@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
-  integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
-
-youtubei.js@^13.1.0:
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-13.1.0.tgz#1e15da01e58c782ab6fb7cc9191a1c99f821c57f"
-  integrity sha512-uL4TyojAYET0c5NGFD7+ScCod/k8Pc/B+D5tLrunFcz1GaBjRMOGRPcNGaRmnhwisegU7ibtw0iUxCN+BZ0ang==
+youtubei.js@^13.3.0:
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-13.3.0.tgz#31cca5fa295a146409b4858aca3283d8c8926c7a"
+  integrity sha512-tbl7rxltpgKoSsmfGUe9JqWUAzv6HFLqrOn0N85EbTn5DLt24EXrjClnXdxyr3PBARMJ3LC4vbll100a0ABsYw==
   dependencies:
     "@bufbuild/protobuf" "^2.0.0"
-    jintr "^3.2.1"
+    jintr "^3.3.0"
     tslib "^2.5.0"
     undici "^5.19.1"

From 33574d03f8b95bffed80f7a727ed807ba546d136 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, 26 Mar 2025 19:16:16 +0100
Subject: [PATCH 048/105] Bump package version from 0.23.2 to 0.23.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2799f03da9db7..6d45e95d1bc50 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.23.2",
+  "version": "0.23.3",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From e4843500d3036d9bacf68644facf2eaa8eb5cbeb 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, 26 Mar 2025 19:44:33 +0100
Subject: [PATCH 049/105] add back yocto-queue

---
 yarn.lock | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/yarn.lock b/yarn.lock
index f125fc5f0892c..9cd40a4283d87 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9717,6 +9717,11 @@ 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==
 
+yocto-queue@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
+  integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
+
 youtubei.js@^13.3.0:
   version "13.3.0"
   resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-13.3.0.tgz#31cca5fa295a146409b4858aca3283d8c8926c7a"

From 56f3b7399318d994425c486c5eac5d285b33b510 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Mar 2025 06:10:19 +0800
Subject: [PATCH 050/105] Bump bgutils-js from 3.1.3 to 3.2.0 (#6960)

Bumps [bgutils-js](https://github.com/LuanRT/BgUtils) from 3.1.3 to 3.2.0.
- [Release notes](https://github.com/LuanRT/BgUtils/releases)
- [Changelog](https://github.com/LuanRT/BgUtils/blob/main/CHANGELOG.md)
- [Commits](https://github.com/LuanRT/BgUtils/compare/v3.1.3...v3.2.0)

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

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 6d45e95d1bc50..b23c467916346 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "@fortawesome/vue-fontawesome": "^2.0.10",
     "@seald-io/nedb": "^4.0.4",
     "autolinker": "^4.1.0",
-    "bgutils-js": "^3.1.3",
+    "bgutils-js": "^3.2.0",
     "electron-context-menu": "^4.0.4",
     "marked": "^15.0.6",
     "path-browserify": "^1.0.1",
diff --git a/yarn.lock b/yarn.lock
index 9cd40a4283d87..3bd5bf4a1d876 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2511,10 +2511,10 @@ batch@0.6.1:
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
   integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
 
-bgutils-js@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/bgutils-js/-/bgutils-js-3.1.3.tgz#0bdd3aac1748ebe51777b72b346ecbe8722760f8"
-  integrity sha512-MHpm4hAHAwen0tzc0asziZ0FIsrM4q6zau8d49bzPtcyb5QzJge3OjtRVUzsjXdvrnbVOeETNrdA4q8IxkAL1g==
+bgutils-js@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/bgutils-js/-/bgutils-js-3.2.0.tgz#bfc892b2a39db737827dd204bf7868214a6283f0"
+  integrity sha512-CacO15JvxbclbLeCAAm9DETGlLuisRGWpPigoRvNsccSCPEC4pwYwA2g2x/pv7Om/sk79d4ib35V5HHmxPBpDg==
 
 big.js@^5.2.2:
   version "5.2.2"

From aec2100ed3de361f91ff3de4bf20ee0d940a872b 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, 23 Apr 2025 17:14:55 +0200
Subject: [PATCH 051/105] Bump package version from 0.23.3 to 0.23.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b23c467916346..a9a54cf224302 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.23.3",
+  "version": "0.23.4",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From c85c6c6bbea36bc4dda2688c8ea9a391fa7399b5 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 20 Apr 2025 20:45:44 +0200
Subject: [PATCH 052/105] Fix user-agent and referer for Innertube requests
 (#7213)

---
 src/main/index.js                 | 4 ++++
 src/renderer/helpers/api/local.js | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/main/index.js b/src/main/index.js
index 457e5ae18dbf3..64d58e315abf5 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -452,6 +452,10 @@ function runApp() {
         requestHeaders['Sec-Fetch-Site'] = 'same-origin'
         requestHeaders['Sec-Fetch-Mode'] = 'same-origin'
         requestHeaders['X-Youtube-Bootstrap-Logged-In'] = 'false'
+      } else if (url === 'https://www.youtube.com/sw.js_data') {
+        requestHeaders.Referer = 'https://www.youtube.com/sw.js'
+        requestHeaders['Sec-Fetch-Site'] = 'same-origin'
+        requestHeaders['Sec-Fetch-Mode'] = 'same-origin'
       } else if (urlObj.origin.endsWith('.googlevideo.com') && urlObj.pathname === '/videoplayback') {
         requestHeaders.Referer = 'https://www.youtube.com/'
         requestHeaders.Origin = 'https://www.youtube.com'
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index c4bbb62085305..25f3da75d9a46 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -50,6 +50,7 @@ async function createInnertube({ withPlayer = false, location = undefined, safet
     // This setting is enabled by default and results in YouTube.js reusing the same session across different Innertube instances.
     // That behavior is highly undesirable for FreeTube, as we want to create a new session every time to limit tracking.
     enable_session_cache: false,
+    user_agent: navigator.userAgent,
 
     retrieve_player: !!withPlayer,
     location: location,

From 705847dcadaec87b7a0c888776f4dc56175b46ec Mon Sep 17 00:00:00 2001
From: PikachuEXE <git@pikachuexe.net>
Date: Thu, 24 Apr 2025 04:55:30 +0800
Subject: [PATCH 053/105] Update youtubei.js to latest (#7252)

* ^ Update youtubei.js to latest

* Disable extra request for config fetching

---------

Co-authored-by: absidue <48293849+absidue@users.noreply.github.com>
---
 package.json                      |  2 +-
 src/renderer/helpers/api/local.js |  1 +
 yarn.lock                         | 18 +++++++++---------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index a9a54cf224302..aa6a1dd06fcdf 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": "^13.3.0"
+    "youtubei.js": "^13.4.0"
   },
   "devDependencies": {
     "@babel/core": "^7.26.7",
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 25f3da75d9a46..050bf87995b5e 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -50,6 +50,7 @@ async function createInnertube({ withPlayer = false, location = undefined, safet
     // This setting is enabled by default and results in YouTube.js reusing the same session across different Innertube instances.
     // That behavior is highly undesirable for FreeTube, as we want to create a new session every time to limit tracking.
     enable_session_cache: false,
+    retrieve_innertube_config: false,
     user_agent: navigator.userAgent,
 
     retrieve_player: !!withPlayer,
diff --git a/yarn.lock b/yarn.lock
index 3bd5bf4a1d876..37e9155270a30 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5949,10 +5949,10 @@ jest-worker@^29.7.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jintr@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/jintr/-/jintr-3.3.0.tgz#74271197c260b9b2e435d961339263c515df603d"
-  integrity sha512-ZsaajJ4Hr5XR0tSPhOZOTjFhxA0qscKNSOs41NRjx7ZOGwpfdp8NKIBEUtvUPbA37JXyv1sJlgeOOZHjr3h76Q==
+jintr@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/jintr/-/jintr-3.3.1.tgz#b88355af0c66603130b12d54721b8ab1d3be0b98"
+  integrity sha512-nnOzyhf0SLpbWuZ270Omwbj5LcXUkTcZkVnK8/veJXtSZOiATM5gMZMdmzN75FmTyj+NVgrGaPdH12zIJ24oIA==
   dependencies:
     acorn "^8.8.0"
 
@@ -9722,12 +9722,12 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
   integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
 
-youtubei.js@^13.3.0:
-  version "13.3.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-13.3.0.tgz#31cca5fa295a146409b4858aca3283d8c8926c7a"
-  integrity sha512-tbl7rxltpgKoSsmfGUe9JqWUAzv6HFLqrOn0N85EbTn5DLt24EXrjClnXdxyr3PBARMJ3LC4vbll100a0ABsYw==
+youtubei.js@^13.4.0:
+  version "13.4.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-13.4.0.tgz#1f52d7ed0ccabd5ba718eede84771aa32683d9e2"
+  integrity sha512-+fmIZU/dWAjsROONrASy1REwVpy6umAPVuoNLr/4iNmZXl84LyBef0n3hrd1Vn9035EuINToGyQcBmifwUEemA==
   dependencies:
     "@bufbuild/protobuf" "^2.0.0"
-    jintr "^3.3.0"
+    jintr "^3.3.1"
     tslib "^2.5.0"
     undici "^5.19.1"

From b422b4293e7e12e75ef6984fd69090acfb861f26 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Thu, 1 May 2025 02:17:53 +0200
Subject: [PATCH 054/105] Use the streaming data from MWEB to avoid SABR-only
 responses (#7327)

---
 src/renderer/helpers/api/local.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 050bf87995b5e..e10a42c1fc4b4 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -225,6 +225,14 @@ export async function getLocalVideoInfo(id) {
 
   const info = await webInnertube.getInfo(id)
 
+  // temporary workaround for SABR-only responses
+  const mwebInfo = await webInnertube.getBasicInfo(id, 'MWEB')
+
+  if (mwebInfo.playability_status.status === 'OK' && mwebInfo.streaming_data) {
+    info.playability_status = mwebInfo.playability_status
+    info.streaming_data = mwebInfo.streaming_data
+  }
+
   let hasTrailer = info.has_trailer
   let trailerIsAgeRestricted = info.getTrailerInfo() === null
 

From e1a8d4c4adb13dfcad4b0d96ead9a12bae671311 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 1 Apr 2025 04:21:41 +0200
Subject: [PATCH 055/105] Remove broken Alpine builds (#7129)

---
 .github/ISSUE_TEMPLATE/bug_report.yaml |  2 +-
 .github/workflows/build.yml            | 21 ----------------
 .github/workflows/release.yml          | 33 --------------------------
 _scripts/build.js                      |  2 +-
 _scripts/ebuilder.config.js            |  2 +-
 5 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index de14a7ba2f82d..67b7fa02478e4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -82,7 +82,6 @@ body:
       label: Installation Method
       description: When you select an unofficial installation method, you must have verified that the bug is also present in one of the official installation methods. Please make sure you uninstall the unofficial installation before installing one of the official installations. If you can't reproduce this in one of the official installation methods, you should report the bug to the maintainer of the unofficial installation method you used.
       options:
-        - .apk (Alpine Linux Package)
         - .AppImage
         - .deb
         - .dmg
@@ -93,6 +92,7 @@ body:
         - .rpm
         - .zip / .7z
         - .apk (FreeTubeAndroid Unofficial)
+        - .apk (Alpine Linux Package Unofficial)
         - AUR (Unofficial)
         - Chocolatey (Unofficial)
         - Homebrew (Unofficial)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d22e3d7a77d16..584bdc723b0a0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -213,27 +213,6 @@ jobs:
         name: freetube-${{ steps.versionNumber.outputs.result }}.arm64.rpm
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.aarch64.rpm
 
-    - name: Upload Alpine .apk x64 Artifact
-      uses: actions/upload-artifact@v4
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
-      with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-alpine-amd64.apk
-        path: build/freetube-${{ steps.versionNumber.outputs.result }}.apk
-
-    - name: Upload Alpine .apk ARMv7l Artifact
-      uses: actions/upload-artifact@v4
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
-      with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-alpine-armv7l.apk
-        path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.apk
-
-    - name: Upload Alpine .apk ARM64 Artifact
-      uses: actions/upload-artifact@v4
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
-      with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-alpine-arm64.apk
-        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.apk
-
     - name: Upload Pacman .pacman x64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 588793834699b..b0f226e5ec7c9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -249,39 +249,6 @@ jobs:
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.aarch64.rpm
         asset_content_type: application/x-rpm
 
-    - name: Upload Alpine .apk x64 Release
-      uses: actions/upload-release-asset@v1
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-amd64.apk
-        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.apk
-        asset_content_type: application/octet-stream
-
-    - name: Upload Alpine .apk ARMv7l Release
-      uses: actions/upload-release-asset@v1
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-armv7l.apk
-        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.apk
-        asset_content_type: application/octet-stream
-
-    - name: Upload Alpine .apk ARM64 Release
-      uses: actions/upload-release-asset@v1
-      if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-alpine-arm64.apk
-        asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.apk
-        asset_content_type: application/octet-stream
-
     - name: Upload Pacman .pacman x64 Release
       uses: actions/upload-release-asset@v1
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
diff --git a/_scripts/build.js b/_scripts/build.js
index de43f6f7e681b..ee1b7fa1c87e3 100644
--- a/_scripts/build.js
+++ b/_scripts/build.js
@@ -36,7 +36,7 @@ if (platform === 'darwin') {
     arch = Arch.armv7l
   }
 
-  targets = Platform.LINUX.createTarget(['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'], arch)
+  targets = Platform.LINUX.createTarget(['deb', 'zip', '7z', 'rpm', 'AppImage', 'pacman'], arch)
 }
 
 builder
diff --git a/_scripts/ebuilder.config.js b/_scripts/ebuilder.config.js
index 6929ef6ff2ded..14d0d9df1f262 100644
--- a/_scripts/ebuilder.config.js
+++ b/_scripts/ebuilder.config.js
@@ -46,7 +46,7 @@ const config = {
   linux: {
     category: 'Network',
     icon: '_icons/icon.svg',
-    target: ['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'],
+    target: ['deb', 'zip', '7z', 'rpm', 'AppImage', 'pacman'],
   },
   // See the following issues for more information
   // https://github.com/jordansissel/fpm/issues/1503

From 248f63275a4e1851367e389293fc299f3e8b9841 Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Thu, 1 May 2025 02:18:10 +0200
Subject: [PATCH 056/105] Bump package version from 0.23.4 to 0.23.5 (#7328)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index aa6a1dd06fcdf..7075b51c1df2a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.23.4",
+  "version": "0.23.5",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From 450273a4ff747cedcf62cf830ef6675a532ee5a1 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Mon, 7 Apr 2025 12:58:57 +0200
Subject: [PATCH 057/105] Increase PO token snapshot timeout from 3 to 10
 seconds (#7114)

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

diff --git a/src/botGuardScript.js b/src/botGuardScript.js
index f2f1a9dc52cf9..aac39ec88749d 100644
--- a/src/botGuardScript.js
+++ b/src/botGuardScript.js
@@ -63,7 +63,7 @@ export default async function (videoId, visitorData, context) {
   })
 
   const webPoSignalOutput = []
-  const botGuardResponse = await botGuard.snapshot({ webPoSignalOutput })
+  const botGuardResponse = await botGuard.snapshot({ webPoSignalOutput }, 10_000)
 
   const integrityTokenResponse = await fetch(buildURL('GenerateIT', true), {
     method: 'POST',

From 528e2808e83e2f65c57fc04dd3c716dd38583a82 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, 4 May 2025 14:17:45 +0200
Subject: [PATCH 058/105] tooltip corrections (#7351)

---
 static/locales/en-US.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 3012b22228be3..a41b9c3dd77c1 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -1015,7 +1015,7 @@ Tooltips:
       FreeTube will automatically attempt to use your non-preferred API as a fallback
       method when enabled.
     Thumbnail Preference: All thumbnails throughout FreeTube will be replaced with
-      a frame of the video instead of the default thumbnail.
+      a frame of the video, blurred or hidden instead of the default thumbnail.
     Invidious Instance: The Invidious instance that FreeTube will connect to for API
       calls.
     Region for Trending: The region of trends allows you to pick which country's trending
@@ -1029,7 +1029,7 @@ Tooltips:
     Proxy Videos Through Invidious: Will connect to Invidious to serve videos instead
       of making a direct connection to YouTube.
     Default Video Format: Set the formats used when a video plays. DASH formats can
-      play higher qualities. Legacy formats are limited to a max of 720p but use less
+      play higher qualities. Legacy formats are limited to a max of 360p but use less
       bandwidth. Audio formats are audio only streams.
     Scroll Playback Rate Over Video Player: While the cursor is over the video, press and
       hold the Control key (Command Key on Mac) and scroll the mouse wheel forwards or backwards to control
@@ -1059,7 +1059,7 @@ Tooltips:
       method for grabbing your subscription feed. RSS is faster and prevents IP blocking,
       but doesn't provide certain information like video duration, live status or community posts
     Fetch Automatically: When enabled, FreeTube will automatically fetch
-      your subscription feed when a new window is opened and when switching profile.
+      your subscription feed on startup and when a new window is opened.
   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.
   SponsorBlock Settings:

From 238391b1fe17786e586570371d54986e9d889f76 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2025 20:40:55 -0500
Subject: [PATCH 059/105] Bump shaka-player from 4.13.2 to 4.13.4 (#6868)

Bumps [shaka-player](https://github.com/shaka-project/shaka-player) from 4.13.2 to 4.13.4.
- [Release notes](https://github.com/shaka-project/shaka-player/releases)
- [Changelog](https://github.com/shaka-project/shaka-player/blob/v4.13.4/CHANGELOG.md)
- [Commits](https://github.com/shaka-project/shaka-player/compare/v4.13.2...v4.13.4)

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

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 7075b51c1df2a..4c66ba27989db 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "path-browserify": "^1.0.1",
     "portal-vue": "^2.1.7",
     "process": "^0.11.10",
-    "shaka-player": "^4.13.0",
+    "shaka-player": "^4.13.4",
     "swiper": "^11.2.1",
     "vue": "^2.7.16",
     "vue-i18n": "^8.28.2",
diff --git a/yarn.lock b/yarn.lock
index 37e9155270a30..b205401a22144 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8248,10 +8248,10 @@ setprototypeof@1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-shaka-player@^4.13.0:
-  version "4.13.0"
-  resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-4.13.0.tgz#03d4469ea2af6ab740f591c4e906503e7403b3d5"
-  integrity sha512-FZToyYl7IXvt1oMEWVbU0tjWJpJ+oSYpUibNMxSqVQx2pLfSBDfEuodGJV+pRgiydYQ58+VFLftAylDx/Qvfdw==
+shaka-player@^4.13.4:
+  version "4.13.4"
+  resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-4.13.4.tgz#c0b572e7bff9ed670986bd4530d0f1a68e022d26"
+  integrity sha512-dVEpbTO27gxM7GZO+4Ks9WVcL9xCLiZe9GTmlRIF7E8KaX8NlbCPHKtSK65HmJS1dfBeqd69/Kpm8724bJOWOw==
   dependencies:
     eme-encryption-scheme-polyfill "^2.2.0"
 

From bfa38f507d97c290c042be7bb6580bcbbb368350 Mon Sep 17 00:00:00 2001
From: Emma <MarmadileManteater@proton.me>
Date: Tue, 4 Mar 2025 17:36:48 -0500
Subject: [PATCH 060/105] Fix search not working on mobile because of undefined
 ref (#6706)

* Fix search not working because of undefined ref

* Add back missing ref

* move ref to correct spot

---------

Co-authored-by: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
---
 src/renderer/components/top-nav/top-nav.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/components/top-nav/top-nav.vue b/src/renderer/components/top-nav/top-nav.vue
index 328910ce4a78e..b4d509e55a866 100644
--- a/src/renderer/components/top-nav/top-nav.vue
+++ b/src/renderer/components/top-nav/top-nav.vue
@@ -84,6 +84,7 @@
       <div
         v-if="!hideSearchBar"
         v-show="showSearchContainer"
+        ref="searchContainer"
         class="searchContainer"
       >
         <ft-input

From 88bc7c8492395db9a53f1a3092a377e46aba9c91 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Tue, 3 Jun 2025 21:01:24 +0000
Subject: [PATCH 061/105] Move settings to `more` menu on smaller mobile
 devices (#7506)

---
 src/renderer/components/SideNav/SideNav.css    | 14 ++++++++++++++
 src/renderer/components/SideNav/SideNav.vue    |  2 +-
 .../SideNavMoreOptions/SideNavMoreOptions.css  | 13 +++++++++++++
 .../SideNavMoreOptions/SideNavMoreOptions.vue  | 18 ++++++++++++++++++
 4 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/SideNav/SideNav.css b/src/renderer/components/SideNav/SideNav.css
index 909d641151584..f41e5a1263461 100644
--- a/src/renderer/components/SideNav/SideNav.css
+++ b/src/renderer/components/SideNav/SideNav.css
@@ -249,3 +249,17 @@
     inline-size: 100%;
   }
 }
+
+@media only screen and (width <= 400px) {
+  /* Hide settings so that they appear in the more dropdown on smaller screens */
+  .smallMobileOnlyHidden {
+    display: none;
+  }
+}
+
+@media only screen and (width > 400px) {
+  .smallMobileOnlyHidden {
+    display: block;
+  }
+}
+
diff --git a/src/renderer/components/SideNav/SideNav.vue b/src/renderer/components/SideNav/SideNav.vue
index 8d3fc99a7c31f..e0542625131eb 100644
--- a/src/renderer/components/SideNav/SideNav.vue
+++ b/src/renderer/components/SideNav/SideNav.vue
@@ -152,7 +152,7 @@
       </router-link>
       <hr>
       <router-link
-        class="navOption mobileShow"
+        class="navOption mobileShow smallMobileOnlyHidden"
         role="button"
         to="/settings"
         :title="settingsTitle"
diff --git a/src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.css b/src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.css
index 46a71073bf5f1..89d744396bafe 100644
--- a/src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.css
+++ b/src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.css
@@ -82,3 +82,16 @@
     block-size: 1.3em;
   }
 }
+
+@media only screen and (width <= 400px) {
+  /* Show settings in more dropdown on smaller screens */
+  .smallMobileOnlyShow {
+    display: block;
+  }
+}
+
+@media only screen and (width > 400px) {
+  .smallMobileOnlyShow {
+    display: none;
+  }
+}
diff --git a/src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.vue b/src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.vue
index 6fd3b27f043b5..bfc41c885e4c5 100644
--- a/src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.vue
+++ b/src/renderer/components/SideNavMoreOptions/SideNavMoreOptions.vue
@@ -110,6 +110,24 @@
           {{ $t("About.About") }}
         </p>
       </router-link>
+      <router-link
+        class="navOption smallMobileOnlyShow"
+        :title="$t('Settings.Settings')"
+        :aria-label="hideLabelsSideBar ? $t('Settings.Settings') : null"
+        to="/settings"
+      >
+        <FontAwesomeIcon
+          :icon="['fas', 'sliders-h']"
+          class="navIcon"
+          :class="applyNavIconExpand"
+        />
+        <p
+          id="settingsNavLabel"
+          class="navLabel"
+        >
+          {{ $t("Settings.Settings") }}
+        </p>
+      </router-link>
     </div>
     <router-link
       class="navOption mobileShow"

From dfd72a4894c8bfcb40a67bb9b90806b52d403f0a Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Sat, 26 Apr 2025 00:27:24 +0200
Subject: [PATCH 062/105] Change author name (#7216)

* Change author name

* change to FreeTube Team
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4c66ba27989db..7c82bafc98dee 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "main": "./dist/main.js",
   "private": true,
   "author": {
-    "name": "PrestonN",
+    "name": "FreeTube Team",
     "email": "FreeTubeApp@protonmail.com",
     "url": "https://github.com/FreeTubeApp/FreeTube"
   },

From 76f2d5a35a3f1afcb03461b7f4f79b8b02989693 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sat, 10 May 2025 21:07:32 +0200
Subject: [PATCH 063/105] Migrate the FtToasts component to the composition API
 (#7390)

---
 src/renderer/App.js                           |   2 +-
 .../ft-toast.css => FtToast/FtToast.css}      |   0
 src/renderer/components/FtToast/FtToast.vue   | 103 ++++++++++++++++++
 .../components/ft-toast/ft-toast-events.js    |   2 -
 src/renderer/components/ft-toast/ft-toast.js  |  52 ---------
 src/renderer/components/ft-toast/ft-toast.vue |  22 ----
 src/renderer/helpers/utils.js                 |   5 +-
 7 files changed, 107 insertions(+), 79 deletions(-)
 rename src/renderer/components/{ft-toast/ft-toast.css => FtToast/FtToast.css} (100%)
 create mode 100644 src/renderer/components/FtToast/FtToast.vue
 delete mode 100644 src/renderer/components/ft-toast/ft-toast-events.js
 delete mode 100644 src/renderer/components/ft-toast/ft-toast.js
 delete mode 100644 src/renderer/components/ft-toast/ft-toast.vue

diff --git a/src/renderer/App.js b/src/renderer/App.js
index 6fd33974d3a53..eb700c3cce947 100644
--- a/src/renderer/App.js
+++ b/src/renderer/App.js
@@ -6,7 +6,7 @@ import SideNav from './components/SideNav/SideNav.vue'
 import FtNotificationBanner from './components/ft-notification-banner/ft-notification-banner.vue'
 import FtPrompt from './components/FtPrompt/FtPrompt.vue'
 import FtButton from './components/ft-button/ft-button.vue'
-import FtToast from './components/ft-toast/ft-toast.vue'
+import FtToast from './components/FtToast/FtToast.vue'
 import FtProgressBar from './components/FtProgressBar/FtProgressBar.vue'
 import FtPlaylistAddVideoPrompt from './components/ft-playlist-add-video-prompt/ft-playlist-add-video-prompt.vue'
 import FtCreatePlaylistPrompt from './components/ft-create-playlist-prompt/ft-create-playlist-prompt.vue'
diff --git a/src/renderer/components/ft-toast/ft-toast.css b/src/renderer/components/FtToast/FtToast.css
similarity index 100%
rename from src/renderer/components/ft-toast/ft-toast.css
rename to src/renderer/components/FtToast/FtToast.css
diff --git a/src/renderer/components/FtToast/FtToast.vue b/src/renderer/components/FtToast/FtToast.vue
new file mode 100644
index 0000000000000..5b977c1f24a01
--- /dev/null
+++ b/src/renderer/components/FtToast/FtToast.vue
@@ -0,0 +1,103 @@
+<template>
+  <div class="toast-holder">
+    <div
+      v-for="toast in toasts"
+      :key="toast.id"
+      class="toast"
+      :class="{ closed: !toast.isOpen, open: toast.isOpen }"
+      tabindex="0"
+      role="status"
+      @click="performAction(toast)"
+      @keydown.enter.prevent="performAction(toast)"
+      @keydown.space.prevent="performAction(toast)"
+    >
+      <p class="message">
+        {{ toast.message }}
+      </p>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { nextTick, onBeforeUnmount, onMounted, shallowReactive } from 'vue'
+import { ToastEventBus } from '../../helpers/utils'
+
+let idCounter = 0
+
+/**
+ * @typedef Toast
+ * @property {string} message
+ * @property {Function | null} action
+ * @property {boolean} isOpen
+ * @property {NodeJS.Timeout | number} timeout
+ * @property {number} id
+ */
+
+/** @type {import('vue').ShallowReactive<Toast[]>} */
+const toasts = shallowReactive([])
+
+/**
+ * @param {CustomEvent<{ message: string, time: number | null, action: Function | null }>} event
+ */
+function open({ detail: { message, time, action } }) {
+  /** @type {Toast} */
+  const toast = {
+    message,
+    action,
+    isOpen: false,
+    timeout: 0,
+    id: idCounter++
+  }
+
+  toast.timeout = setTimeout(close, time || 3000, toast)
+
+  nextTick(() => {
+    toast.isOpen = true
+  })
+
+  if (toasts.length > 4) {
+    remove(toasts[0])
+  }
+  toasts.push(toast)
+}
+
+/**
+ * @param {Toast} toast
+ */
+function close(toast) {
+  setTimeout(remove, 300, toast)
+
+  toast.isOpen = false
+}
+
+/**
+ * @param {Toast} toast
+ */
+function performAction(toast) {
+  toast.action?.()
+  remove(toast)
+}
+
+/**
+ * @param {Toast} toast
+ */
+function remove(toast) {
+  const index = toasts.indexOf(toast)
+
+  if (index !== -1) {
+    toasts.splice(index, 1)
+    clearTimeout(toast.timeout)
+  }
+}
+
+onMounted(() => {
+  ToastEventBus.addEventListener('toast-open', open)
+})
+
+onBeforeUnmount(() => {
+  ToastEventBus.removeEventListener('toast-open', open)
+  toasts.forEach((toast) => clearTimeout(toast.timeout))
+})
+</script>
+
+<style scoped src="./FtToast.css" />
diff --git a/src/renderer/components/ft-toast/ft-toast-events.js b/src/renderer/components/ft-toast/ft-toast-events.js
deleted file mode 100644
index 95b4ffbb1fe98..0000000000000
--- a/src/renderer/components/ft-toast/ft-toast-events.js
+++ /dev/null
@@ -1,2 +0,0 @@
-const events = new EventTarget()
-export default events
diff --git a/src/renderer/components/ft-toast/ft-toast.js b/src/renderer/components/ft-toast/ft-toast.js
deleted file mode 100644
index 15697ca25061d..0000000000000
--- a/src/renderer/components/ft-toast/ft-toast.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { defineComponent, nextTick } from 'vue'
-import FtToastEvents from './ft-toast-events.js'
-
-let id = 0
-
-export default defineComponent({
-  name: 'FtToast',
-  data: function () {
-    return {
-      toasts: []
-    }
-  },
-  mounted: function () {
-    FtToastEvents.addEventListener('toast-open', this.open)
-  },
-  beforeDestroy: function () {
-    FtToastEvents.removeEventListener('toast-open', this.open)
-  },
-  methods: {
-    performAction: function (id) {
-      const index = this.toasts.findIndex(toast => id === toast.id)
-
-      this.toasts[index].action()
-      this.remove(index)
-    },
-    close: function (toast) {
-      // Wait for fade-out to finish
-      setTimeout(this.remove, 300, 0)
-
-      toast.isOpen = false
-    },
-    open: function ({ detail: { message, time, action } }) {
-      const toast = {
-        message: message,
-        action: action || (() => { }),
-        isOpen: false,
-        timeout: null,
-        id: id++
-      }
-      toast.timeout = setTimeout(this.close, time || 3000, toast)
-      nextTick(() => { toast.isOpen = true })
-      if (this.toasts.length > 4) {
-        this.remove(0)
-      }
-      this.toasts.push(toast)
-    },
-    remove: function(index) {
-      const removed = this.toasts.splice(index, 1)
-      clearTimeout(removed[0].timeout)
-    }
-  }
-})
diff --git a/src/renderer/components/ft-toast/ft-toast.vue b/src/renderer/components/ft-toast/ft-toast.vue
deleted file mode 100644
index 6fddb89b3826f..0000000000000
--- a/src/renderer/components/ft-toast/ft-toast.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-  <div class="toast-holder">
-    <div
-      v-for="toast in toasts"
-      :key="toast.id"
-      class="toast"
-      :class="{ closed: !toast.isOpen, open: toast.isOpen }"
-      tabindex="0"
-      role="status"
-      @click="performAction(toast.id)"
-      @keydown.enter.prevent="performAction(toast.id)"
-      @keydown.space.prevent="performAction(toast.id)"
-    >
-      <p class="message">
-        {{ toast.message }}
-      </p>
-    </div>
-  </div>
-</template>
-
-<script src="./ft-toast.js" />
-<style scoped src="./ft-toast.css" />
diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index 1537bbc1fb1b0..f867d2453ff61 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -1,5 +1,4 @@
 import { IpcChannels } from '../../constants'
-import FtToastEvents from '../components/ft-toast/ft-toast-events'
 import i18n from '../i18n/index'
 import router from '../router/index'
 import { nextTick } from 'vue'
@@ -162,13 +161,15 @@ export function buildVTTFileLocally(storyboard, videoLengthSeconds) {
   return vttString
 }
 
+export const ToastEventBus = new EventTarget()
+
 /**
  * @param {string} message
  * @param {number} time
  * @param {Function} action
  */
 export function showToast(message, time = null, action = null) {
-  FtToastEvents.dispatchEvent(new CustomEvent('toast-open', {
+  ToastEventBus.dispatchEvent(new CustomEvent('toast-open', {
     detail: {
       message,
       time,

From 06a86c5c76cb7d57af1ccf169a06d7459420a652 Mon Sep 17 00:00:00 2001
From: PikachuEXE <git@pikachuexe.net>
Date: Fri, 4 Jul 2025 07:29:02 +0800
Subject: [PATCH 064/105] Update single user playlist view to remove videos
 immediately on exit (#7544)

* * Update single user playlist view to remove videos immediately on exit

* $ Update `removeVideos` usage to remove never used `videoIds`

* * Close toast early on view exit

* ! Fix unable to remove videos after clicking undo

* * Reverse toast message update

* * Update video count after remove (before actual remove)
---
 src/renderer/components/FtToast/FtToast.vue |  9 +++-
 src/renderer/helpers/utils.js               |  6 ++-
 src/renderer/views/Playlist/Playlist.js     | 50 ++++++++++++---------
 3 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/renderer/components/FtToast/FtToast.vue b/src/renderer/components/FtToast/FtToast.vue
index 5b977c1f24a01..dd207232d2724 100644
--- a/src/renderer/components/FtToast/FtToast.vue
+++ b/src/renderer/components/FtToast/FtToast.vue
@@ -37,9 +37,9 @@ let idCounter = 0
 const toasts = shallowReactive([])
 
 /**
- * @param {CustomEvent<{ message: string, time: number | null, action: Function | null }>} event
+ * @param {CustomEvent<{ message: string, time: number | null, action: Function | null, abortSignal: AbortSignal | null }>} event
  */
-function open({ detail: { message, time, action } }) {
+function open({ detail: { message, time, action, abortSignal } }) {
   /** @type {Toast} */
   const toast = {
     message,
@@ -50,6 +50,11 @@ function open({ detail: { message, time, action } }) {
   }
 
   toast.timeout = setTimeout(close, time || 3000, toast)
+  if (abortSignal != null) {
+    abortSignal.addEventListener('abort', () => {
+      close(toast)
+    })
+  }
 
   nextTick(() => {
     toast.isOpen = true
diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index f867d2453ff61..65e5e19ce947a 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -167,13 +167,15 @@ export const ToastEventBus = new EventTarget()
  * @param {string} message
  * @param {number} time
  * @param {Function} action
+ * @param {AbortSignal} abortSignal
  */
-export function showToast(message, time = null, action = null) {
+export function showToast(message, time = null, action = null, abortSignal = null) {
   ToastEventBus.dispatchEvent(new CustomEvent('toast-open', {
     detail: {
       message,
       time,
-      action
+      action,
+      abortSignal,
     }
   }))
 }
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index c3edb557ee193..570e3c9661252 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -51,6 +51,7 @@ export default defineComponent({
         continuationData: this.continuationData,
       })
     }
+    this.removeToBeDeletedVideosSometimes()
     next()
   },
   data: function () {
@@ -80,9 +81,9 @@ export default defineComponent({
       videoSearchQuery: '',
 
       promptOpen: false,
-      deletedVideoIds: [],
       deletedPlaylistItemIds: [],
-      isUndoToast: false
+      // Present = shown
+      undoToastAbortController: null,
     }
   },
   computed: {
@@ -591,44 +592,35 @@ export default defineComponent({
       try {
         const playlistItems = [].concat(this.playlistItems)
         const tempPlaylistItems = [].concat(this.playlistItems)
-        let isUndoClicked = false
 
         const videoIndex = this.playlistItems.findIndex((video) => {
           return video.videoId === videoId && video.playlistItemId === playlistItemId
         })
 
         if (videoIndex !== -1) {
-          this.deletedVideoIds.push(this.playlistItems[videoIndex].videoId)
           this.deletedPlaylistItemIds.push(this.playlistItems[videoIndex].playlistItemId)
           playlistItems.splice(videoIndex, 1)
           this.playlistItems = playlistItems
+          this.videoCount = playlistItems.length
 
           // Only show toast when no existing toast shown
-          if (!this.isUndoToast) {
-            this.isUndoToast = true
+          if (this.undoToastAbortController == null) {
+            this.undoToastAbortController = new AbortController()
+            const actualRemoveVideosTimeout = setTimeout(() => {
+              this.removeToBeDeletedVideosSometimes()
+            }, 5000)
             showToast(
               this.$t('User Playlists.SinglePlaylistView.Toast["Video has been removed. Click here to undo."]'),
               5000,
               () => {
                 this.playlistItems = tempPlaylistItems
-                isUndoClicked = true
-                this.isUndoToast = false
-                this.deletedVideoIds = []
+                this.videoCount = tempPlaylistItems.length
+                clearTimeout(actualRemoveVideosTimeout)
                 this.deletedPlaylistItemIds = []
-              }
+                this.undoToastAbortController = null
+              },
+              this.undoToastAbortController.signal,
             )
-            setTimeout(() => {
-              if (!isUndoClicked) {
-                this.removeVideos({
-                  _id: this.playlistId,
-                  videoIds: this.deletedVideoIds,
-                  playlistItemIds: this.deletedPlaylistItemIds,
-                })
-                this.deletedVideoIds = []
-                this.deletedPlaylistItemIds = []
-                this.isUndoToast = false
-              }
-            }, 5000)
           }
         }
       } catch (e) {
@@ -637,6 +629,20 @@ export default defineComponent({
       }
     },
 
+    removeToBeDeletedVideosSometimes() {
+      if (this.isLoading) { return }
+
+      if (this.deletedPlaylistItemIds.length > 0) {
+        this.removeVideos({
+          _id: this.playlistId,
+          playlistItemIds: this.deletedPlaylistItemIds,
+        })
+        this.deletedPlaylistItemIds = []
+        this.undoToastAbortController?.abort()
+        this.undoToastAbortController = null
+      }
+    },
+
     updatePageTitle() {
       const playlistTitle = this.playlistTitle
       const channelName = this.channelName

From a3950c8f04bef3917ad235b27969fdea5e215e14 Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Sat, 14 Jun 2025 13:22:57 +0200
Subject: [PATCH 065/105] add beta to asset name (#7512)

---
 .github/workflows/build.yml   | 60 +++++++++++++++++------------------
 .github/workflows/flatpak.yml | 16 +++++-----
 .github/workflows/release.yml | 58 ++++++++++++++++-----------------
 3 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 584bdc723b0a0..f1c840fd5b12e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -117,91 +117,91 @@ jobs:
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-linux-x64-portable.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-x64-portable.zip
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.zip
 
     - name: Upload Linux .7z x64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-linux-x64-portable.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-x64-portable.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.7z
 
     - name: Upload Linux .zip ARMv7l Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-linux-armv7l-portable.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-armv7l-portable.zip
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.zip
 
     - name: Upload Linux .7z ARMv7l Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-linux-armv7l-portable.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-armv7l-portable.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.7z
 
     - name: Upload Linux .zip ARM64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-linux-arm64-portable.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-arm64-portable.zip
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.zip
 
     - name: Upload Linux .7z ARM64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-linux-arm64-portable.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-arm64-portable.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.7z
 
     - name: Upload .deb x64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube_${{ steps.versionNumber.outputs.result }}_amd64.deb
+        name: freetube_${{ steps.versionNumber.outputs.result }}_beta_amd64.deb
         path: build/freetube_${{ steps.versionNumber.outputs.result }}_amd64.deb
 
     - name: Upload .deb ARMv7l Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
       with:
-        name: freetube_${{ steps.versionNumber.outputs.result }}_armv7l.deb
+        name: freetube_${{ steps.versionNumber.outputs.result }}_beta_armv7l.deb
         path: build/freetube_${{ steps.versionNumber.outputs.result }}_armv7l.deb
 
     - name: Upload .deb ARM64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube_${{ steps.versionNumber.outputs.result }}_arm64.deb
+        name: freetube_${{ steps.versionNumber.outputs.result }}_beta_arm64.deb
         path: build/freetube_${{ steps.versionNumber.outputs.result }}_arm64.deb
 
     - name: Upload AppImage x64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-amd64.AppImage
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-amd64.AppImage
         path: build/FreeTube-${{ steps.versionNumber.outputs.result }}.AppImage
 
     - name: Upload AppImage ARMv7l Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-armv7l.AppImage
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-armv7l.AppImage
         path: build/FreeTube-${{ steps.versionNumber.outputs.result }}-armv7l.AppImage
 
     - name: Upload AppImage ARM64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-arm64.AppImage
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-arm64.AppImage
         path: build/FreeTube-${{ steps.versionNumber.outputs.result }}-arm64.AppImage
 
     - name: Upload .rpm x64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}.amd64.rpm
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta.amd64.rpm
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.x86_64.rpm
 
     # rpm are not built for armv7l
@@ -210,117 +210,117 @@ jobs:
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}.arm64.rpm
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta.arm64.rpm
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.aarch64.rpm
 
     - name: Upload Pacman .pacman x64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-amd64.pacman
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-amd64.pacman
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.pacman
 
     # - name: Upload Web Build
       # uses: actions/upload-artifact@v4
       # if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       # with:
-        # name: freetube-${{ steps.versionNumber.outputs.result }}-static-web
+        # name: freetube-${{ steps.versionNumber.outputs.result }}-beta-static-web
         # path: dist/web
 
     - name: Upload Windows x64 .exe Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-setup-x64.exe
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-setup-x64.exe
         path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe
 
     - name: Upload Windows x64 Portable Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.exe
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-x64-portable.exe
         path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
 
     - name: Upload Windows x64 .zip Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-x64-portable.zip
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-win.zip
 
     - name: Upload Windows x64 .7z Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-x64-portable.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-win.7z
 
     - name: Upload Windows arm64 .exe Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-setup-arm64.exe
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-setup-arm64.exe
         path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe
 
     - name: Upload Windows arm64 Portable Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.exe
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-arm64-portable.exe
         path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
 
     - name: Upload Windows arm64 .zip Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-arm64-portable.zip
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.zip
 
     - name: Upload Windows arm64 .7z Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-arm64-portable.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.7z
 
     - name: Upload Mac x64 .dmg Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.dmg
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-x64.dmg
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg
 
     - name: Upload Mac x64 .zip Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-x64.zip
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.zip
 
     - name: Upload Mac x64 .7z Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-x64.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.7z
 
     - name: Upload Mac arm64 .dmg Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-arm64.dmg
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
 
     - name: Upload Mac arm64 .zip Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-arm64.zip
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip
 
     - name: Upload Mac arm64 .7z Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-arm64.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.7z
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 2a2f4a76a8694..2b9c10ac9861f 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -50,24 +50,24 @@ jobs:
       with:
         version: v${{ steps.sub.outputs.result }}-beta
         repository: FreeTubeApp/FreeTube
-        file: freetube-${{ steps.sub.outputs.result }}-linux-x64-portable.zip
+        file: freetube-${{ steps.sub.outputs.result }}-beta-linux-x64-portable.zip
     - name: Download ARM Release
       uses: fabriciobastian/download-release-asset-action@v1.0.6
       with:
         version: v${{ steps.sub.outputs.result }}-beta
         repository: FreeTubeApp/FreeTube
-        file: freetube-${{ steps.sub.outputs.result }}-linux-arm64-portable.zip
+        file: freetube-${{ steps.sub.outputs.result }}-beta-linux-arm64-portable.zip
     - name: Set x64 Hash Variable
       id: hash-x64
       run: |
         echo 'HASH_X64<<EOF' >> $GITHUB_ENV
-        sha256sum freetube-${{ steps.sub.outputs.result }}-linux-x64-portable.zip | awk '{print $1}' >> $GITHUB_ENV
+        sha256sum freetube-${{ steps.sub.outputs.result }}-beta-linux-x64-portable.zip | awk '{print $1}' >> $GITHUB_ENV
         echo 'EOF' >> $GITHUB_ENV
     - name: Set ARM Hash Variable
       id: hash-arm64
       run: |
         echo 'HASH_ARM64<<EOF' >> $GITHUB_ENV
-        sha256sum freetube-${{ steps.sub.outputs.result }}-linux-arm64-portable.zip | awk '{print $1}' >> $GITHUB_ENV
+        sha256sum freetube-${{ steps.sub.outputs.result }}-beta-linux-arm64-portable.zip | awk '{print $1}' >> $GITHUB_ENV
         echo 'EOF' >> $GITHUB_ENV
     - name: Set Date Variable
       id: current-date
@@ -79,7 +79,7 @@ jobs:
       uses: mikefarah/yq@v4.45.1
       with:
         # The Command which should be run
-        cmd: yq -i '.modules[0].sources[0].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-x64-portable.zip"' io.freetubeapp.FreeTube.yml
+        cmd: yq -i '.modules[0].sources[0].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-beta-linux-x64-portable.zip"' io.freetubeapp.FreeTube.yml
     - name: Update x64 Hash in yml File
       uses: mikefarah/yq@v4.45.1
       with:
@@ -89,7 +89,7 @@ jobs:
       uses: mikefarah/yq@v4.45.1
       with:
         # The Command which should be run
-        cmd: yq -i '.modules[0].sources[1].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-arm64-portable.zip"' io.freetubeapp.FreeTube.yml
+        cmd: yq -i '.modules[0].sources[1].url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-beta-linux-arm64-portable.zip"' io.freetubeapp.FreeTube.yml
     - name: Update ARM Hash in yml File
       uses: mikefarah/yq@v4.45.1
       with:
@@ -99,8 +99,8 @@ jobs:
       run: xmlstarlet ed -L -i /component/releases/release[1] -t elem -n releaseTMP -v "" -i //releaseTMP -t attr -n version -v "${{ steps.sub.outputs.result }} Beta" -i //releaseTMP -t attr -n date -v "${{ env.CURRENT_DATE }}" -s //releaseTMP -t elem -n url -v "" -s //releaseTMP/url -t text -n "" -v "https://github.com/FreeTubeApp/FreeTube/releases/tag/v${{ steps.sub.outputs.result }}-beta" -r //releaseTMP -v "release" io.freetubeapp.FreeTube.metainfo.xml
     - name: Remove Release Files
       run: |
-        rm freetube-${{ steps.sub.outputs.result }}-linux-x64-portable.zip
-        rm freetube-${{ steps.sub.outputs.result }}-linux-arm64-portable.zip
+        rm freetube-${{ steps.sub.outputs.result }}-beta-linux-x64-portable.zip
+        rm freetube-${{ steps.sub.outputs.result }}-beta-linux-arm64-portable.zip
     - name: Commit Files
       uses: stefanzweifel/git-auto-commit-action@v5
       with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b0f226e5ec7c9..40a3f89549672 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -100,7 +100,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-x64-portable.zip
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-linux-x64-portable.zip
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.zip
         asset_content_type: application/zip
 
@@ -111,7 +111,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-x64-portable.7z
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-linux-x64-portable.7z
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.7z
         asset_content_type: application/x-7z-compressed
 
@@ -122,7 +122,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-armv7l-portable.zip
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-linux-armv7l-portable.zip
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.zip
         asset_content_type: application/zip
 
@@ -133,7 +133,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-armv7l-portable.7z
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-linux-armv7l-portable.7z
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.7z
         asset_content_type: application/x-7z-compressed
 
@@ -144,7 +144,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-arm64-portable.zip
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-linux-arm64-portable.zip
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.zip
         asset_content_type: application/zip
 
@@ -155,7 +155,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-linux-arm64-portable.7z
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-linux-arm64-portable.7z
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.7z
         asset_content_type: application/x-7z-compressed
 
@@ -166,7 +166,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube_${{ steps.getPackageInfo.outputs.version }}_amd64.deb
+        asset_name: freetube_${{ steps.getPackageInfo.outputs.version }}_beta_amd64.deb
         asset_path: build/freetube_${{ steps.getPackageInfo.outputs.version }}_amd64.deb
         asset_content_type: application/vnd.debian.binary-package
 
@@ -177,7 +177,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube_${{ steps.getPackageInfo.outputs.version }}_armv7l.deb
+        asset_name: freetube_${{ steps.getPackageInfo.outputs.version }}_beta_armv7l.deb
         asset_path: build/freetube_${{ steps.getPackageInfo.outputs.version }}_armv7l.deb
         asset_content_type: application/vnd.debian.binary-package
 
@@ -188,7 +188,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube_${{ steps.getPackageInfo.outputs.version }}_arm64.deb
+        asset_name: freetube_${{ steps.getPackageInfo.outputs.version }}_beta_arm64.deb
         asset_path: build/freetube_${{ steps.getPackageInfo.outputs.version }}_arm64.deb
         asset_content_type: application/vnd.debian.binary-package
 
@@ -199,7 +199,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-amd64.AppImage
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-amd64.AppImage
         asset_path: build/FreeTube-${{ steps.getPackageInfo.outputs.version }}.AppImage
         asset_content_type: application/vnd.appimage
 
@@ -210,7 +210,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-armv7l.AppImage
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-armv7l.AppImage
         asset_path: build/FreeTube-${{ steps.getPackageInfo.outputs.version }}-armv7l.AppImage
         asset_content_type: application/vnd.appimage
 
@@ -221,7 +221,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.AppImage
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-arm64.AppImage
         asset_path: build/FreeTube-${{ steps.getPackageInfo.outputs.version }}-arm64.AppImage
         asset_content_type: application/vnd.appimage
 
@@ -232,7 +232,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}.amd64.rpm
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta.amd64.rpm
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.x86_64.rpm
         asset_content_type: application/x-rpm
 
@@ -245,7 +245,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}.arm64.rpm
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta.arm64.rpm
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.aarch64.rpm
         asset_content_type: application/x-rpm
 
@@ -256,7 +256,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-amd64.pacman
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-amd64.pacman
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.pacman
         asset_content_type: application/x-zstd-compressed-tar
 
@@ -267,7 +267,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-setup-x64.exe
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-setup-x64.exe
         asset_path: build/freetube Setup ${{ steps.getPackageInfo.outputs.version }}.exe
         asset_content_type: application/x-ms-dos-executable
 
@@ -278,7 +278,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-win-x64-portable.exe
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-win-x64-portable.exe
         asset_path: build/FreeTube ${{ steps.getPackageInfo.outputs.version }}.exe
         asset_content_type: application/x-ms-dos-executable
 
@@ -289,7 +289,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-win-x64-portable.zip
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-win-x64-portable.zip
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-win.zip
         asset_content_type: application/zip
 
@@ -300,7 +300,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-win-x64-portable.7z
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-win-x64-portable.7z
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-win.7z
         asset_content_type: application/x-7z-compressed
 
@@ -311,7 +311,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-setup-arm64.exe
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-setup-arm64.exe
         asset_path: build/freetube Setup ${{ steps.getPackageInfo.outputs.version }}.exe
         asset_content_type: application/x-ms-dos-executable
 
@@ -322,7 +322,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-win-arm64-portable.exe
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-win-arm64-portable.exe
         asset_path: build/FreeTube ${{ steps.getPackageInfo.outputs.version }}.exe
         asset_content_type: application/x-ms-dos-executable
 
@@ -333,7 +333,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-win-arm64-portable.zip
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-win-arm64-portable.zip
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-win.zip
         asset_content_type: application/zip
 
@@ -344,7 +344,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-win-arm64-portable.7z
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-win-arm64-portable.7z
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-win.7z
         asset_content_type: application/x-7z-compressed
 
@@ -355,7 +355,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-x64.dmg
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-mac-x64.dmg
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}.dmg
         asset_content_type: application/x-apple-diskimage
 
@@ -366,7 +366,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-x64.zip
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-mac-x64.zip
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-mac.zip
         asset_content_type: application/zip
 
@@ -377,7 +377,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-x64.7z
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-mac-x64.7z
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-mac.7z
         asset_content_type: application/x-7z-compressed
 
@@ -388,7 +388,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.dmg
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-mac-arm64.dmg
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64.dmg
         asset_content_type: application/x-apple-diskimage
 
@@ -399,7 +399,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.zip
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-mac-arm64.zip
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.zip
         asset_content_type: application/x-apple-diskimage
 
@@ -410,6 +410,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: https://uploads.github.com/repos/FreeTubeApp/FreeTube/releases/${{ inputs.releaseId }}/assets{?name,label}
-        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-mac-arm64.7z
+        asset_name: freetube-${{ steps.getPackageInfo.outputs.version }}-beta-mac-arm64.7z
         asset_path: build/freetube-${{ steps.getPackageInfo.outputs.version }}-arm64-mac.7z
         asset_content_type: application/x-7z-compressed

From f6c2c5f5fa700f0a1dbc8dfd09eb761a38bc5406 Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Thu, 10 Jul 2025 15:53:12 +0200
Subject: [PATCH 066/105] Revert beta labeling for nightly builds (#7606)

---
 .github/workflows/build.yml | 60 ++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f1c840fd5b12e..584bdc723b0a0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -117,91 +117,91 @@ jobs:
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-x64-portable.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-linux-x64-portable.zip
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.zip
 
     - name: Upload Linux .7z x64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-x64-portable.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-linux-x64-portable.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.7z
 
     - name: Upload Linux .zip ARMv7l Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-armv7l-portable.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-linux-armv7l-portable.zip
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.zip
 
     - name: Upload Linux .7z ARMv7l Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-armv7l-portable.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-linux-armv7l-portable.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-armv7l.7z
 
     - name: Upload Linux .zip ARM64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-arm64-portable.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-linux-arm64-portable.zip
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.zip
 
     - name: Upload Linux .7z ARM64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-linux-arm64-portable.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-linux-arm64-portable.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.7z
 
     - name: Upload .deb x64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube_${{ steps.versionNumber.outputs.result }}_beta_amd64.deb
+        name: freetube_${{ steps.versionNumber.outputs.result }}_amd64.deb
         path: build/freetube_${{ steps.versionNumber.outputs.result }}_amd64.deb
 
     - name: Upload .deb ARMv7l Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
       with:
-        name: freetube_${{ steps.versionNumber.outputs.result }}_beta_armv7l.deb
+        name: freetube_${{ steps.versionNumber.outputs.result }}_armv7l.deb
         path: build/freetube_${{ steps.versionNumber.outputs.result }}_armv7l.deb
 
     - name: Upload .deb ARM64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube_${{ steps.versionNumber.outputs.result }}_beta_arm64.deb
+        name: freetube_${{ steps.versionNumber.outputs.result }}_arm64.deb
         path: build/freetube_${{ steps.versionNumber.outputs.result }}_arm64.deb
 
     - name: Upload AppImage x64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-amd64.AppImage
+        name: freetube-${{ steps.versionNumber.outputs.result }}-amd64.AppImage
         path: build/FreeTube-${{ steps.versionNumber.outputs.result }}.AppImage
 
     - name: Upload AppImage ARMv7l Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-armv7l')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-armv7l.AppImage
+        name: freetube-${{ steps.versionNumber.outputs.result }}-armv7l.AppImage
         path: build/FreeTube-${{ steps.versionNumber.outputs.result }}-armv7l.AppImage
 
     - name: Upload AppImage ARM64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-arm64.AppImage
+        name: freetube-${{ steps.versionNumber.outputs.result }}-arm64.AppImage
         path: build/FreeTube-${{ steps.versionNumber.outputs.result }}-arm64.AppImage
 
     - name: Upload .rpm x64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta.amd64.rpm
+        name: freetube-${{ steps.versionNumber.outputs.result }}.amd64.rpm
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.x86_64.rpm
 
     # rpm are not built for armv7l
@@ -210,117 +210,117 @@ jobs:
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta.arm64.rpm
+        name: freetube-${{ steps.versionNumber.outputs.result }}.arm64.rpm
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.aarch64.rpm
 
     - name: Upload Pacman .pacman x64 Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-amd64.pacman
+        name: freetube-${{ steps.versionNumber.outputs.result }}-amd64.pacman
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.pacman
 
     # - name: Upload Web Build
       # uses: actions/upload-artifact@v4
       # if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       # with:
-        # name: freetube-${{ steps.versionNumber.outputs.result }}-beta-static-web
+        # name: freetube-${{ steps.versionNumber.outputs.result }}-static-web
         # path: dist/web
 
     - name: Upload Windows x64 .exe Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-setup-x64.exe
+        name: freetube-${{ steps.versionNumber.outputs.result }}-setup-x64.exe
         path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe
 
     - name: Upload Windows x64 Portable Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-x64-portable.exe
+        name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.exe
         path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
 
     - name: Upload Windows x64 .zip Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-x64-portable.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.zip
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-win.zip
 
     - name: Upload Windows x64 .7z Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-x64-portable.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-win.7z
 
     - name: Upload Windows arm64 .exe Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-setup-arm64.exe
+        name: freetube-${{ steps.versionNumber.outputs.result }}-setup-arm64.exe
         path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe
 
     - name: Upload Windows arm64 Portable Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-arm64-portable.exe
+        name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.exe
         path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
 
     - name: Upload Windows arm64 .zip Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-arm64-portable.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.zip
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.zip
 
     - name: Upload Windows arm64 .7z Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'windows') && startsWith(matrix.runtime, 'win-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-win-arm64-portable.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-win-arm64-portable.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-win.7z
 
     - name: Upload Mac x64 .dmg Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-x64.dmg
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.dmg
         path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg
 
     - name: Upload Mac x64 .zip Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-x64.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.zip
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.zip
 
     - name: Upload Mac x64 .7z Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-x64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-x64.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-x64.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-mac.7z
 
     - name: Upload Mac arm64 .dmg Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-arm64.dmg
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.dmg
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.dmg
 
     - name: Upload Mac arm64 .zip Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-arm64.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.zip
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.zip
 
     - name: Upload Mac arm64 .7z Artifact
       uses: actions/upload-artifact@v4
       if: startsWith(matrix.os, 'macos') && startsWith(matrix.runtime, 'osx-arm64')
       with:
-        name: freetube-${{ steps.versionNumber.outputs.result }}-beta-mac-arm64.7z
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac-arm64.7z
         path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64-mac.7z

From 7d48a3a9b56e3c97456443c3ee741684d33885bc Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Fri, 28 Mar 2025 13:46:44 +0100
Subject: [PATCH 067/105] Update electron-builder to 26.0.12 (#7084)

---
 package.json |   2 +-
 yarn.lock    | 301 ++++++++++++++++++++-------------------------------
 2 files changed, 120 insertions(+), 183 deletions(-)

diff --git a/package.json b/package.json
index 7c82bafc98dee..58cea7ac2402d 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.0",
     "electron": "^34.0.1",
-    "electron-builder": "^25.1.8",
+    "electron-builder": "^26.0.12",
     "eslint": "^9.19.0",
     "eslint-plugin-jsdoc": "^50.6.3",
     "eslint-plugin-jsonc": "^2.19.1",
diff --git a/yarn.lock b/yarn.lock
index b205401a22144..a4551b9d99fb5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -881,16 +881,24 @@
   resolved "https://registry.yarnpkg.com/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz#519c1549b0e147759e7825701ecffd25e5819f7b"
   integrity sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==
 
-"@electron/asar@^3.2.7":
-  version "3.2.13"
-  resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.13.tgz#56565ea423ead184465adfa72663b2c70d9835f2"
-  integrity sha512-pY5z2qQSwbFzJsBdgfJIzXf5ElHTVMutC2dxh0FD60njknMu3n1NnTABOcQwbb5/v5soqE79m9UjaJryBf3epg==
+"@electron/asar@3.2.18", "@electron/asar@^3.2.7":
+  version "3.2.18"
+  resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.18.tgz#fa607f829209bab8b9e0ce6658d3fe81b2cba517"
+  integrity sha512-2XyvMe3N3Nrs8cV39IKELRHTYUWFKrmqqSY1U+GMlc0jvqjIVnoxhNd2H4JolWQncbJi1DCvb5TNxZuI2fEjWg==
   dependencies:
-    "@types/glob" "^7.1.0"
     commander "^5.0.0"
     glob "^7.1.6"
     minimatch "^3.0.4"
 
+"@electron/fuses@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@electron/fuses/-/fuses-1.8.0.tgz#ad34d3cc4703b1258b83f6989917052cfc1490a0"
+  integrity sha512-zx0EIq78WlY/lBb1uXlziZmDZI4ubcCXIMJ4uGjXzZW0nS19TjSPeXPAjzzTmKQlJUZm0SbmZhPKP7tuQ1SsEw==
+  dependencies:
+    chalk "^4.1.1"
+    fs-extra "^9.0.1"
+    minimist "^1.2.5"
+
 "@electron/get@^2.0.0":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e"
@@ -906,6 +914,21 @@
   optionalDependencies:
     global-agent "^3.0.0"
 
+"@electron/node-gyp@https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2":
+  version "10.2.0-electron.1"
+  resolved "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2"
+  dependencies:
+    env-paths "^2.2.0"
+    exponential-backoff "^3.1.1"
+    glob "^8.1.0"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^10.2.1"
+    nopt "^6.0.0"
+    proc-log "^2.0.1"
+    semver "^7.3.5"
+    tar "^6.2.1"
+    which "^2.0.2"
+
 "@electron/notarize@2.5.0":
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.5.0.tgz#d4d25356adfa29df4a76bd64a8bd347237cd251e"
@@ -927,11 +950,12 @@
     minimist "^1.2.6"
     plist "^3.0.5"
 
-"@electron/rebuild@3.6.1":
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.6.1.tgz#59e8e36c3f6e6b94a699425dfb61f0394c3dd4df"
-  integrity sha512-f6596ZHpEq/YskUd8emYvOUne89ij8mQgjYFA5ru25QwbrRO+t1SImofdDv7kKOuWCmVOuU5tvfkbgGxIl3E/w==
+"@electron/rebuild@3.7.0":
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.7.0.tgz#82e20c467ddedbb295d7f641592c52e68c141e9f"
+  integrity sha512-VW++CNSlZwMYP7MyXEbrKjpzEwhB5kDNbzGtiPEjwYysqyTCF+YbNJ210Dj3AjWsGSV4iEEwNkmJN9yGZmVvmw==
   dependencies:
+    "@electron/node-gyp" "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2"
     "@malept/cross-spawn-promise" "^2.0.0"
     chalk "^4.0.0"
     debug "^4.1.1"
@@ -940,7 +964,6 @@
     got "^11.7.0"
     node-abi "^3.45.0"
     node-api-version "^0.2.0"
-    node-gyp "^9.0.0"
     ora "^5.1.0"
     read-binary-file-arch "^1.0.6"
     semver "^7.3.5"
@@ -1607,14 +1630,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/glob@^7.1.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
-  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
 "@types/html-minifier-terser@^6.0.0":
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35"
@@ -1678,11 +1693,6 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690"
   integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==
 
-"@types/minimatch@*":
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
-  integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
-
 "@types/ms@*":
   version "0.7.31"
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
@@ -2229,35 +2239,35 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-app-builder-bin@5.0.0-alpha.10:
-  version "5.0.0-alpha.10"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.10.tgz#cf12e593b6b847fb9d04027fa755c6c6610d778b"
-  integrity sha512-Ev4jj3D7Bo+O0GPD2NMvJl+PGiBAfS7pUGawntBNpCbxtpncfUixqFj9z9Jme7V7s3LBGqsWZZP54fxBX3JKJw==
+app-builder-bin@5.0.0-alpha.12:
+  version "5.0.0-alpha.12"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz#2daf82f8badc698e0adcc95ba36af4ff0650dc80"
+  integrity sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==
 
-app-builder-lib@25.1.8:
-  version "25.1.8"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-25.1.8.tgz#ae376039c5f269c7d562af494a087e5bc6310f1b"
-  integrity sha512-pCqe7dfsQFBABC1jeKZXQWhGcCPF3rPCXDdfqVKjIeWBcXzyC1iOWZdfFhGl+S9MyE/k//DFmC6FzuGAUudNDg==
+app-builder-lib@26.0.12:
+  version "26.0.12"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.0.12.tgz#2e33df936e0f78d4266b058ece90308ea981eefb"
+  integrity sha512-+/CEPH1fVKf6HowBUs6LcAIoRcjeqgvAeoSE+cl7Y7LndyQ9ViGPYibNk7wmhMHzNgHIuIbw4nWADPO+4mjgWw==
   dependencies:
     "@develar/schema-utils" "~2.6.5"
+    "@electron/asar" "3.2.18"
+    "@electron/fuses" "^1.8.0"
     "@electron/notarize" "2.5.0"
     "@electron/osx-sign" "1.3.1"
-    "@electron/rebuild" "3.6.1"
+    "@electron/rebuild" "3.7.0"
     "@electron/universal" "2.0.1"
     "@malept/flatpak-bundler" "^0.4.0"
     "@types/fs-extra" "9.0.13"
     async-exit-hook "^2.0.1"
-    bluebird-lst "^1.0.9"
-    builder-util "25.1.7"
-    builder-util-runtime "9.2.10"
+    builder-util "26.0.11"
+    builder-util-runtime "9.3.1"
     chromium-pickle-js "^0.2.0"
     config-file-ts "0.2.8-rc1"
     debug "^4.3.4"
     dotenv "^16.4.5"
     dotenv-expand "^11.0.6"
     ejs "^3.1.8"
-    electron-publish "25.1.7"
-    form-data "^4.0.0"
+    electron-publish "26.0.11"
     fs-extra "^10.1.0"
     hosted-git-info "^4.1.0"
     is-ci "^3.0.0"
@@ -2266,30 +2276,18 @@ app-builder-lib@25.1.8:
     json5 "^2.2.3"
     lazy-val "^1.0.5"
     minimatch "^10.0.0"
+    plist "3.1.0"
     resedit "^1.7.0"
-    sanitize-filename "^1.6.3"
     semver "^7.3.8"
     tar "^6.1.12"
     temp-file "^3.4.0"
-
-"aproba@^1.0.3 || ^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
-  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
+    tiny-async-pool "1.3.0"
 
 are-docs-informative@^0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
   integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
 
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^3.6.0"
-
 argparse@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
@@ -2535,14 +2533,7 @@ bl@^4.1.0:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-bluebird-lst@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c"
-  integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==
-  dependencies:
-    bluebird "^3.5.5"
-
-bluebird@^3.1.1, bluebird@^3.5.5:
+bluebird@^3.1.1:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -2641,35 +2632,36 @@ buffer@^6.0.3:
     base64-js "^1.3.1"
     ieee754 "^1.2.1"
 
-builder-util-runtime@9.2.10:
-  version "9.2.10"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz#a0f7d9e214158402e78b74a745c8d9f870c604bc"
-  integrity sha512-6p/gfG1RJSQeIbz8TK5aPNkoztgY1q5TgmGFMAXcY8itsGW6Y2ld1ALsZ5UJn8rog7hKF3zHx5iQbNQ8uLcRlw==
+builder-util-runtime@9.3.1:
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.3.1.tgz#0daedde0f6d381f2a00a50a407b166fe7dca1a67"
+  integrity sha512-2/egrNDDnRaxVwK3A+cJq6UOlqOdedGA7JPqCeJjN2Zjk1/QB/6QUi3b714ScIGS7HafFXTyzJEOr5b44I3kvQ==
   dependencies:
     debug "^4.3.4"
     sax "^1.2.4"
 
-builder-util@25.1.7:
-  version "25.1.7"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-25.1.7.tgz#a07b404f0cb1a635aa165902be65297d58932ff8"
-  integrity sha512-7jPjzBwEGRbwNcep0gGNpLXG9P94VA3CPAZQCzxkFXiV2GMQKlziMbY//rXPI7WKfhsvGgFXjTcXdBEwgXw9ww==
+builder-util@26.0.11:
+  version "26.0.11"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-26.0.11.tgz#ad85b92c93f2b976b973e1d87337e0c6813fcb8f"
+  integrity sha512-xNjXfsldUEe153h1DraD0XvDOpqGR0L5eKFkdReB7eFW5HqysDZFfly4rckda6y9dF39N3pkPlOblcfHKGw+uA==
   dependencies:
     "7zip-bin" "~5.2.0"
     "@types/debug" "^4.1.6"
-    app-builder-bin "5.0.0-alpha.10"
-    bluebird-lst "^1.0.9"
-    builder-util-runtime "9.2.10"
+    app-builder-bin "5.0.0-alpha.12"
+    builder-util-runtime "9.3.1"
     chalk "^4.1.2"
-    cross-spawn "^7.0.3"
+    cross-spawn "^7.0.6"
     debug "^4.3.4"
     fs-extra "^10.1.0"
     http-proxy-agent "^7.0.0"
     https-proxy-agent "^7.0.0"
     is-ci "^3.0.0"
     js-yaml "^4.1.0"
+    sanitize-filename "^1.6.3"
     source-map-support "^0.5.19"
     stat-mode "^1.0.0"
     temp-file "^3.4.0"
+    tiny-async-pool "1.3.0"
 
 builtin-modules@^3.3.0:
   version "3.3.0"
@@ -2804,7 +2796,7 @@ caniuse-lite@^1.0.30001663:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz#99fc5ea0d9c6e96897a104a8352604378377f949"
   integrity sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==
 
-chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -2948,11 +2940,6 @@ 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==
 
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
 colord@^2.9.3:
   version "2.9.3"
   resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
@@ -3048,11 +3035,6 @@ connect-history-api-fallback@^2.0.0:
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
   integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==
 
-console-control-strings@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
-
 consolidate@^0.15.1:
   version "0.15.1"
   resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
@@ -3438,11 +3420,6 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
-
 depd@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
@@ -3493,14 +3470,14 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-dmg-builder@25.1.8:
-  version "25.1.8"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-25.1.8.tgz#41f3b725edd896156e891016a44129e1bd580430"
-  integrity sha512-NoXo6Liy2heSklTI5OIZbCgXC1RzrDQsZkeEwXhdOro3FT1VBOvbubvscdPnjVuQ4AMwwv61oaH96AbiYg9EnQ==
+dmg-builder@26.0.12:
+  version "26.0.12"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.0.12.tgz#6996ad0bab80a861c9a7b33ee9734d4f60566b46"
+  integrity sha512-59CAAjAhTaIMCN8y9kD573vDkxbs1uhDcrFLHSgutYdPcGOU35Rf95725snvzEOy4BFB7+eLJ8djCNPmGwG67w==
   dependencies:
-    app-builder-lib "25.1.8"
-    builder-util "25.1.7"
-    builder-util-runtime "9.2.10"
+    app-builder-lib "26.0.12"
+    builder-util "26.0.11"
+    builder-util-runtime "9.3.1"
     fs-extra "^10.1.0"
     iconv-lite "^0.6.2"
     js-yaml "^4.1.0"
@@ -3641,16 +3618,16 @@ ejs@^3.1.8:
   dependencies:
     jake "^10.8.5"
 
-electron-builder@^25.1.8:
-  version "25.1.8"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-25.1.8.tgz#b0e310f1600787610bb84c3f39bc7aadb2548486"
-  integrity sha512-poRgAtUHHOnlzZnc9PK4nzG53xh74wj2Jy7jkTrqZ0MWPoHGh1M2+C//hGeYdA+4K8w4yiVCNYoLXF7ySj2Wig==
+electron-builder@^26.0.12:
+  version "26.0.12"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.12.tgz#797af2e70efdd96c9ea5d8a8164b8728c90d65ff"
+  integrity sha512-cD1kz5g2sgPTMFHjLxfMjUK5JABq3//J4jPswi93tOPFz6btzXYtK5NrDt717NRbukCUDOrrvmYVOWERlqoiXA==
   dependencies:
-    app-builder-lib "25.1.8"
-    builder-util "25.1.7"
-    builder-util-runtime "9.2.10"
+    app-builder-lib "26.0.12"
+    builder-util "26.0.11"
+    builder-util-runtime "9.3.1"
     chalk "^4.1.2"
-    dmg-builder "25.1.8"
+    dmg-builder "26.0.12"
     fs-extra "^10.1.0"
     is-ci "^3.0.0"
     lazy-val "^1.0.5"
@@ -3680,15 +3657,16 @@ electron-is-dev@^3.0.1:
   resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-3.0.1.tgz#1cbc79b1dd046787903acd357efdfab6549dc17a"
   integrity sha512-8TjjAh8Ec51hUi3o4TaU0mD3GMTOESi866oRNavj9A3IQJ7pmv+MJVmdZBFGw4GFT36X7bkqnuDNYvkQgvyI8Q==
 
-electron-publish@25.1.7:
-  version "25.1.7"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-25.1.7.tgz#14e50c2a3fafdc1c454eadbbc47ead89a48bb554"
-  integrity sha512-+jbTkR9m39eDBMP4gfbqglDd6UvBC7RLh5Y0MhFSsc6UkGHj9Vj9TWobxevHYMMqmoujL11ZLjfPpMX+Pt6YEg==
+electron-publish@26.0.11:
+  version "26.0.11"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-26.0.11.tgz#92c9329a101af2836d9d228c82966eca1eee9a7b"
+  integrity sha512-a8QRH0rAPIWH9WyyS5LbNvW9Ark6qe63/LqDB7vu2JXYpi0Gma5Q60Dh4tmTqhOBQt0xsrzD8qE7C+D7j+B24A==
   dependencies:
     "@types/fs-extra" "^9.0.11"
-    builder-util "25.1.7"
-    builder-util-runtime "9.2.10"
+    builder-util "26.0.11"
+    builder-util-runtime "9.3.1"
     chalk "^4.1.2"
+    form-data "^4.0.0"
     fs-extra "^10.1.0"
     lazy-val "^1.0.5"
     mime "^2.5.2"
@@ -4779,20 +4757,6 @@ functions-have-names@^1.2.2, functions-have-names@^1.2.3:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
-  dependencies:
-    aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
-    has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
-
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -4919,7 +4883,7 @@ glob@^10.3.12, glob@^10.3.3:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
-glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+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==
@@ -4931,7 +4895,7 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.1:
+glob@^8.0.1, glob@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
   integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
@@ -5145,11 +5109,6 @@ has-tostringtag@^1.0.2:
   dependencies:
     has-symbols "^1.0.3"
 
-has-unicode@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
-
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -6349,7 +6308,7 @@ lru-cache@^7.7.1:
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
   integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
 
-make-fetch-happen@^10.0.3:
+make-fetch-happen@^10.2.1:
   version "10.2.1"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
   integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
@@ -6548,6 +6507,11 @@ minimist@^1.2.0, minimist@^1.2.6:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
+minimist@^1.2.5:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
 minipass-collect@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
@@ -6721,23 +6685,6 @@ node-forge@^1:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
-node-gyp@^9.0.0:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.1.tgz#8a1023e0d6766ecb52764cc3a734b36ff275e185"
-  integrity sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==
-  dependencies:
-    env-paths "^2.2.0"
-    exponential-backoff "^3.1.1"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
-    nopt "^6.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
 node-releases@^2.0.18:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
@@ -6789,16 +6736,6 @@ npm-run-all2@^7.0.2:
     shell-quote "^1.7.3"
     which "^5.0.0"
 
-npmlog@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
-  dependencies:
-    are-we-there-yet "^3.0.0"
-    console-control-strings "^1.1.0"
-    gauge "^4.0.3"
-    set-blocking "^2.0.0"
-
 nth-check@^2.0.1, nth-check@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
@@ -7190,15 +7127,7 @@ pkg-dir@^7.0.0:
   dependencies:
     find-up "^6.3.0"
 
-plist@^3.0.4:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987"
-  integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==
-  dependencies:
-    base64-js "^1.5.1"
-    xmlbuilder "^9.0.7"
-
-plist@^3.0.5, plist@^3.1.0:
+plist@3.1.0, plist@^3.0.5, plist@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9"
   integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==
@@ -7207,6 +7136,14 @@ plist@^3.0.5, plist@^3.1.0:
     base64-js "^1.5.1"
     xmlbuilder "^15.1.1"
 
+plist@^3.0.4:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987"
+  integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==
+  dependencies:
+    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"
@@ -7522,6 +7459,11 @@ pretty-error@^4.0.0:
     lodash "^4.17.20"
     renderkid "^3.0.0"
 
+proc-log@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
+  integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
+
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -7692,7 +7634,7 @@ readable-stream@^3.0.6:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^3.4.0, readable-stream@^3.6.0:
+readable-stream@^3.4.0:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
@@ -8192,11 +8134,6 @@ serve-static@1.16.2:
     parseurl "~1.3.3"
     send "0.19.0"
 
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
-
 set-function-length@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
@@ -8298,7 +8235,7 @@ side-channel@^1.0.6:
     get-intrinsic "^1.2.4"
     object-inspect "^1.13.1"
 
-signal-exit@^3.0.2, signal-exit@^3.0.7:
+signal-exit@^3.0.2:
   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==
@@ -8522,7 +8459,7 @@ statuses@2.0.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+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"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -8866,7 +8803,7 @@ tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.1.2:
+tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
   integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
@@ -8922,6 +8859,13 @@ thunky@^1.0.2:
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
+tiny-async-pool@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/tiny-async-pool/-/tiny-async-pool-1.3.0.tgz#c013e1b369095e7005db5595f95e646cca6ef8a5"
+  integrity sha512-01EAw5EDrcVrdgyCLgoSPvqznC0sVxDSVeiOz09FUpjh71G79VCqneOr+xvt7T1r76CF6ZZfPjHorN2+d+3mqA==
+  dependencies:
+    semver "^5.5.0"
+
 tmp-promise@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"
@@ -9580,13 +9524,6 @@ which@^5.0.0:
   dependencies:
     isexe "^3.1.1"
 
-wide-align@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
-  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
-  dependencies:
-    string-width "^1.0.2 || 2 || 3 || 4"
-
 wildcard@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"

From fe600c416ebe08e6c24bd09db3589ebd29be5100 Mon Sep 17 00:00:00 2001
From: PikachuEXE <git@pikachuexe.net>
Date: Mon, 21 Apr 2025 07:59:33 +0800
Subject: [PATCH 068/105] ^ Update electron-builder to latest pre-release
 version (#7206)

---
 package.json |  2 +-
 yarn.lock    | 88 ++++++++++++++++++++++++++--------------------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/package.json b/package.json
index 58cea7ac2402d..e54699d1dae69 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.0",
     "electron": "^34.0.1",
-    "electron-builder": "^26.0.12",
+    "electron-builder": "^26.0.13",
     "eslint": "^9.19.0",
     "eslint-plugin-jsdoc": "^50.6.3",
     "eslint-plugin-jsonc": "^2.19.1",
diff --git a/yarn.lock b/yarn.lock
index a4551b9d99fb5..7618e7d82bc42 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -914,9 +914,9 @@
   optionalDependencies:
     global-agent "^3.0.0"
 
-"@electron/node-gyp@https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2":
+"@electron/node-gyp@git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2":
   version "10.2.0-electron.1"
-  resolved "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2"
+  resolved "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2"
   dependencies:
     env-paths "^2.2.0"
     exponential-backoff "^3.1.1"
@@ -950,10 +950,10 @@
     minimist "^1.2.6"
     plist "^3.0.5"
 
-"@electron/rebuild@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.7.0.tgz#82e20c467ddedbb295d7f641592c52e68c141e9f"
-  integrity sha512-VW++CNSlZwMYP7MyXEbrKjpzEwhB5kDNbzGtiPEjwYysqyTCF+YbNJ210Dj3AjWsGSV4iEEwNkmJN9yGZmVvmw==
+"@electron/rebuild@3.7.2":
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-3.7.2.tgz#8d808b29159c50086d27a5dec72b40bf16b4b582"
+  integrity sha512-19/KbIR/DAxbsCkiaGMXIdPnMCJLkcf8AvGnduJtWBs/CBwiAjY1apCqOLVxrXg+rtXFCngbXhBanWjxLUt1Mg==
   dependencies:
     "@electron/node-gyp" "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2"
     "@malept/cross-spawn-promise" "^2.0.0"
@@ -2244,30 +2244,30 @@ app-builder-bin@5.0.0-alpha.12:
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz#2daf82f8badc698e0adcc95ba36af4ff0650dc80"
   integrity sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==
 
-app-builder-lib@26.0.12:
-  version "26.0.12"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.0.12.tgz#2e33df936e0f78d4266b058ece90308ea981eefb"
-  integrity sha512-+/CEPH1fVKf6HowBUs6LcAIoRcjeqgvAeoSE+cl7Y7LndyQ9ViGPYibNk7wmhMHzNgHIuIbw4nWADPO+4mjgWw==
+app-builder-lib@26.0.13:
+  version "26.0.13"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.0.13.tgz#d70efc3107ff20944853419aabe34c3663d302f6"
+  integrity sha512-Iov4wX9dHRiI1rxRFk7k3X4QtltsTXN+8Kge7B5DO+pTjKxSNhJ1S+wjJAQM5VatxGxwX7HnxmHLt5PRI5AYSw==
   dependencies:
     "@develar/schema-utils" "~2.6.5"
     "@electron/asar" "3.2.18"
     "@electron/fuses" "^1.8.0"
     "@electron/notarize" "2.5.0"
     "@electron/osx-sign" "1.3.1"
-    "@electron/rebuild" "3.7.0"
+    "@electron/rebuild" "3.7.2"
     "@electron/universal" "2.0.1"
     "@malept/flatpak-bundler" "^0.4.0"
     "@types/fs-extra" "9.0.13"
     async-exit-hook "^2.0.1"
-    builder-util "26.0.11"
-    builder-util-runtime "9.3.1"
+    builder-util "26.0.13"
+    builder-util-runtime "9.3.2"
     chromium-pickle-js "^0.2.0"
     config-file-ts "0.2.8-rc1"
     debug "^4.3.4"
     dotenv "^16.4.5"
     dotenv-expand "^11.0.6"
     ejs "^3.1.8"
-    electron-publish "26.0.11"
+    electron-publish "26.0.13"
     fs-extra "^10.1.0"
     hosted-git-info "^4.1.0"
     is-ci "^3.0.0"
@@ -2632,23 +2632,23 @@ buffer@^6.0.3:
     base64-js "^1.3.1"
     ieee754 "^1.2.1"
 
-builder-util-runtime@9.3.1:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.3.1.tgz#0daedde0f6d381f2a00a50a407b166fe7dca1a67"
-  integrity sha512-2/egrNDDnRaxVwK3A+cJq6UOlqOdedGA7JPqCeJjN2Zjk1/QB/6QUi3b714ScIGS7HafFXTyzJEOr5b44I3kvQ==
+builder-util-runtime@9.3.2:
+  version "9.3.2"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.3.2.tgz#2a69a239b50e26accf4ed4ea1730406a3117213c"
+  integrity sha512-7QDXJ1FwT6d9ZhG4kuObUUPY8/ENBS/Ky26O4hR5vbeoRGavgekS2Jxv+8sCn/v23aPGU2DXRWEeJuijN2ooYA==
   dependencies:
     debug "^4.3.4"
     sax "^1.2.4"
 
-builder-util@26.0.11:
-  version "26.0.11"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-26.0.11.tgz#ad85b92c93f2b976b973e1d87337e0c6813fcb8f"
-  integrity sha512-xNjXfsldUEe153h1DraD0XvDOpqGR0L5eKFkdReB7eFW5HqysDZFfly4rckda6y9dF39N3pkPlOblcfHKGw+uA==
+builder-util@26.0.13:
+  version "26.0.13"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-26.0.13.tgz#a2c11f8e89e5392719e540d610d70d8413943d74"
+  integrity sha512-6b64uHzywaL2KAG+rVcqk/Prta1m3I2Jo1d4d2CrApb6EeSk2V384tmSL0EniH+P8jaNbMp6qhg7cIALw32zRA==
   dependencies:
     "7zip-bin" "~5.2.0"
     "@types/debug" "^4.1.6"
     app-builder-bin "5.0.0-alpha.12"
-    builder-util-runtime "9.3.1"
+    builder-util-runtime "9.3.2"
     chalk "^4.1.2"
     cross-spawn "^7.0.6"
     debug "^4.3.4"
@@ -3470,14 +3470,14 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-dmg-builder@26.0.12:
-  version "26.0.12"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.0.12.tgz#6996ad0bab80a861c9a7b33ee9734d4f60566b46"
-  integrity sha512-59CAAjAhTaIMCN8y9kD573vDkxbs1uhDcrFLHSgutYdPcGOU35Rf95725snvzEOy4BFB7+eLJ8djCNPmGwG67w==
+dmg-builder@26.0.13:
+  version "26.0.13"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.0.13.tgz#c5dc2db3b23e278ce146e68b45523b3f5f1780c9"
+  integrity sha512-OBa6xbQwFAm6gbbClkuGrxnOLbrPauv3yaugnGtIHsn7BvFSmMhZzhmcJQMrAGzDW2M3n/RmG/5mgOYUagqoeg==
   dependencies:
-    app-builder-lib "26.0.12"
-    builder-util "26.0.11"
-    builder-util-runtime "9.3.1"
+    app-builder-lib "26.0.13"
+    builder-util "26.0.13"
+    builder-util-runtime "9.3.2"
     fs-extra "^10.1.0"
     iconv-lite "^0.6.2"
     js-yaml "^4.1.0"
@@ -3618,16 +3618,16 @@ ejs@^3.1.8:
   dependencies:
     jake "^10.8.5"
 
-electron-builder@^26.0.12:
-  version "26.0.12"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.12.tgz#797af2e70efdd96c9ea5d8a8164b8728c90d65ff"
-  integrity sha512-cD1kz5g2sgPTMFHjLxfMjUK5JABq3//J4jPswi93tOPFz6btzXYtK5NrDt717NRbukCUDOrrvmYVOWERlqoiXA==
+electron-builder@^26.0.13:
+  version "26.0.13"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.13.tgz#7ae15b8a61e428f436cae61831dfd28f6d977540"
+  integrity sha512-DbTHV16W03TcGImDXeFulmCGIaFIh4nyXTLm5CE3ml47R54AaAlEWI+Jj1/kMsK2rproHw3eoR4l/3P7hlJ0fA==
   dependencies:
-    app-builder-lib "26.0.12"
-    builder-util "26.0.11"
-    builder-util-runtime "9.3.1"
+    app-builder-lib "26.0.13"
+    builder-util "26.0.13"
+    builder-util-runtime "9.3.2"
     chalk "^4.1.2"
-    dmg-builder "26.0.12"
+    dmg-builder "26.0.13"
     fs-extra "^10.1.0"
     is-ci "^3.0.0"
     lazy-val "^1.0.5"
@@ -3657,14 +3657,14 @@ electron-is-dev@^3.0.1:
   resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-3.0.1.tgz#1cbc79b1dd046787903acd357efdfab6549dc17a"
   integrity sha512-8TjjAh8Ec51hUi3o4TaU0mD3GMTOESi866oRNavj9A3IQJ7pmv+MJVmdZBFGw4GFT36X7bkqnuDNYvkQgvyI8Q==
 
-electron-publish@26.0.11:
-  version "26.0.11"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-26.0.11.tgz#92c9329a101af2836d9d228c82966eca1eee9a7b"
-  integrity sha512-a8QRH0rAPIWH9WyyS5LbNvW9Ark6qe63/LqDB7vu2JXYpi0Gma5Q60Dh4tmTqhOBQt0xsrzD8qE7C+D7j+B24A==
+electron-publish@26.0.13:
+  version "26.0.13"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-26.0.13.tgz#04340520e6e9de5262fecfa011658cfcc3fc8917"
+  integrity sha512-O5hfHSwli5cegQ4JS3Dp0dZcheex6UCRE/qYyRQvhB6DhSwojiwTnAGEuQCJXc8K8Zxz2lku5Du3VwYHf8d5Lw==
   dependencies:
     "@types/fs-extra" "^9.0.11"
-    builder-util "26.0.11"
-    builder-util-runtime "9.3.1"
+    builder-util "26.0.13"
+    builder-util-runtime "9.3.2"
     chalk "^4.1.2"
     form-data "^4.0.0"
     fs-extra "^10.1.0"

From 92d15854e2be678900662d313f782f9ef1a95a5d 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, 13 Jul 2025 23:09:20 +0200
Subject: [PATCH 069/105] fix yarn.lock

---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7618e7d82bc42..76e246a4b2915 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -914,9 +914,9 @@
   optionalDependencies:
     global-agent "^3.0.0"
 
-"@electron/node-gyp@git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2":
+"@electron/node-gyp@https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2":
   version "10.2.0-electron.1"
-  resolved "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2"
+  resolved "https://github.com/electron/node-gyp#06b29aafb7708acef8b3669835c8a7857ebc92d2"
   dependencies:
     env-paths "^2.2.0"
     exponential-backoff "^3.1.1"
@@ -8063,7 +8063,7 @@ semver-compare@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
   integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
 
-"semver@2 || 3 || 4 || 5":
+"semver@2 || 3 || 4 || 5", semver@^5.5.0:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
@@ -8190,7 +8190,7 @@ shaka-player@^4.13.4:
   resolved "https://registry.yarnpkg.com/shaka-player/-/shaka-player-4.13.4.tgz#c0b572e7bff9ed670986bd4530d0f1a68e022d26"
   integrity sha512-dVEpbTO27gxM7GZO+4Ks9WVcL9xCLiZe9GTmlRIF7E8KaX8NlbCPHKtSK65HmJS1dfBeqd69/Kpm8724bJOWOw==
   dependencies:
-    eme-encryption-scheme-polyfill "^2.2.0"
+    eme-encryption-scheme-polyfill "^2.2.1"
 
 shallow-clone@^3.0.0:
   version "3.0.1"

From 1d913520b308546e42c3aecc5ef9411a7c888636 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 20 Apr 2025 22:08:30 +0200
Subject: [PATCH 070/105] Support LockupView videos in the up next feed (#7186)

---
 src/renderer/helpers/api/local.js | 93 +++++++++++++++++++++++++------
 src/renderer/views/Watch/Watch.js |  5 +-
 2 files changed, 80 insertions(+), 18 deletions(-)

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index e10a42c1fc4b4..a932048f3994a 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -1229,6 +1229,52 @@ function parseLockupView(lockupView, channelId = undefined, channelName = undefi
         videoCount: extractNumberFromString(thumbnailOverlayBadgeView.badges[0].text)
       }
     }
+    case 'VIDEO': {
+      let publishedText
+      let lengthSeconds = ''
+      let liveNow = false
+
+      /** @type {YTNodes.ThumbnailOverlayBadgeView | undefined} */
+      const thumbnailOverlayBadgeView = lockupView.content_image?.overlays?.firstOfType(YTNodes.ThumbnailOverlayBadgeView)
+
+      if (thumbnailOverlayBadgeView) {
+        if (thumbnailOverlayBadgeView.badges.some(badge => badge.badge_style === 'THUMBNAIL_OVERLAY_BADGE_STYLE_LIVE')) {
+          liveNow = true
+        } else {
+          const durationBadge = thumbnailOverlayBadgeView.badges.find(badge => /^[\d:]+$/.test(badge.text))
+
+          if (durationBadge) {
+            lengthSeconds = Utils.timeToSeconds(durationBadge.text)
+          }
+
+          publishedText = lockupView.metadata.metadata?.metadata_rows[1].metadata_parts?.[1].text?.text
+        }
+      }
+
+      let viewCount = null
+
+      const viewsText = lockupView.metadata.metadata?.metadata_rows[1].metadata_parts?.[0].text?.text
+
+      if (viewsText) {
+        const views = parseLocalSubscriberCount(viewsText)
+
+        if (!isNaN(views)) {
+          viewCount = views
+        }
+      }
+
+      return {
+        type: 'video',
+        videoId: lockupView.content_id,
+        title: lockupView.metadata.title.text,
+        author: lockupView.metadata.metadata?.metadata_rows[0].metadata_parts?.[0].text?.text,
+        authorId: lockupView.metadata.image?.renderer_context?.command_context?.on_tap?.payload.browseId,
+        viewCount,
+        published: calculatePublishedDate(publishedText, liveNow),
+        lengthSeconds,
+        liveNow
+      }
+    }
     default:
       console.warn(`Unknown lockup content type: ${lockupView.content_type}`, lockupView)
       return null
@@ -1347,28 +1393,41 @@ function parseListItem(item) {
 }
 
 /**
- * @param {import('youtubei.js').YTNodes.CompactVideo} video
+ * @param {YTNodes.CompactVideo | YTNodes.CompactMovie | YTNodes.LockupView} video
  */
 export function parseLocalWatchNextVideo(video) {
-  let publishedText
+  if (video.is(YTNodes.CompactMovie)) {
+    return {
+      type: 'video',
+      videoId: video.id,
+      title: video.title.text,
+      author: video.author.name,
+      authorId: video.author.id,
+      lengthSeconds: video.duration.seconds
+    }
+  } else if (video.is(YTNodes.LockupView)) {
+    return parseLockupView(video)
+  } else {
+    let publishedText
 
-  if (video.published != null && !video.published.isEmpty()) {
-    publishedText = video.published.text
-  }
+    if (video.published != null && !video.published.isEmpty()) {
+      publishedText = video.published.text
+    }
 
-  const published = calculatePublishedDate(publishedText, video.is_live, video.is_premiere)
+    const published = calculatePublishedDate(publishedText, video.is_live, video.is_premiere)
 
-  return {
-    type: 'video',
-    videoId: video.video_id,
-    title: video.title.text,
-    author: video.author.name,
-    authorId: video.author.id,
-    viewCount: video.view_count == null ? null : extractNumberFromString(video.view_count.text),
-    published,
-    lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds,
-    liveNow: video.is_live,
-    isUpcoming: video.is_premiere
+    return {
+      type: 'video',
+      videoId: video.video_id,
+      title: video.title.text,
+      author: video.author.name,
+      authorId: video.author.id,
+      viewCount: video.view_count == null ? null : extractNumberFromString(video.view_count.text),
+      published,
+      lengthSeconds: isNaN(video.duration.seconds) ? '' : video.duration.seconds,
+      liveNow: video.is_live,
+      isUpcoming: video.is_premiere
+    }
   }
 }
 
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 719c96689aecf..333d31b73d993 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -395,7 +395,10 @@ export default defineComponent({
         this.isFamilyFriendly = result.basic_info.is_family_safe
 
         const recommendedVideos = result.watch_next_feed
-          ?.filter((item) => item.type === 'CompactVideo' || item.type === 'CompactMovie')
+          ?.filter((item) => {
+            return item.type === 'CompactVideo' || item.type === 'CompactMovie' ||
+              (item.type === 'LockupView' && item.content_type === 'VIDEO')
+          })
           .map(parseLocalWatchNextVideo) ?? []
 
         // place watched recommended videos last

From 2359f5d1ce094b645fb32885e309c490b05f577a Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Fri, 30 May 2025 00:38:44 +0200
Subject: [PATCH 071/105] Local API: Add PO tokens to the caption URLs (#7484)

---
 src/renderer/helpers/api/local.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index a932048f3994a..c5a4cc59f4e71 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -199,7 +199,7 @@ export async function getLocalSearchContinuation(continuationData) {
 export async function getLocalVideoInfo(id) {
   const webInnertube = await createInnertube({ withPlayer: true, generateSessionLocally: false })
 
-  // based on the videoId (added to the body of the /player request)
+  // based on the videoId (added to the body of the /player request and to caption URLs)
   let contentPoToken
   // based on the visitor data (added to the streaming URLs)
   let sessionPoToken
@@ -223,6 +223,8 @@ export async function getLocalVideoInfo(id) {
     }
   }
 
+  let clientName = webInnertube.session.context.client.clientName
+
   const info = await webInnertube.getInfo(id)
 
   // temporary workaround for SABR-only responses
@@ -231,6 +233,8 @@ export async function getLocalVideoInfo(id) {
   if (mwebInfo.playability_status.status === 'OK' && mwebInfo.streaming_data) {
     info.playability_status = mwebInfo.playability_status
     info.streaming_data = mwebInfo.streaming_data
+
+    clientName = 'MWEB'
   }
 
   let hasTrailer = info.has_trailer
@@ -265,6 +269,8 @@ export async function getLocalVideoInfo(id) {
 
       hasTrailer = false
       trailerIsAgeRestricted = false
+
+      clientName = webEmbeddedInnertube.session.context.client.clientName
     }
   }
 
@@ -309,6 +315,18 @@ export async function getLocalVideoInfo(id) {
     }
   }
 
+  if (info.captions?.caption_tracks) {
+    for (const captionTrack of info.captions.caption_tracks) {
+      const url = new URL(captionTrack.base_url)
+
+      url.searchParams.set('potc', '1')
+      url.searchParams.set('pot', contentPoToken)
+      url.searchParams.set('c', clientName)
+
+      captionTrack.base_url = url.toString()
+    }
+  }
+
   return info
 }
 

From 26c43bc8df1bb2bbfa5afa6558cc297732450797 Mon Sep 17 00:00:00 2001
From: PikachuEXE <git@pikachuexe.net>
Date: Wed, 18 Jun 2025 05:40:54 +0800
Subject: [PATCH 072/105] ! Fix variant selection when no variant's audio role
 marked as main (#7571)

---
 .../ft-shaka-video-player/ft-shaka-video-player.js          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
index d23b59b719f21..35ab11b8cc043 100644
--- a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
+++ b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
@@ -1305,7 +1305,11 @@ export default defineComponent({
         variants = variants.filter(variant => variant.label === label)
       } else if (hasMultipleAudioTracks.value) {
         // default audio track
-        variants = variants.filter(variant => variant.audioRoles.includes('main'))
+        const filteredVariants = variants.filter(variant => variant.audioRoles.includes('main'))
+        // Sometimes there is nothing marked as main, don't filter in this case
+        if (filteredVariants.length > 0) {
+          variants = filteredVariants
+        }
       }
 
       const isPortrait = variants[0].height > variants[0].width

From 8de6fbc63de9e5f10e2dfe40899cf5a2e5e058a0 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Fri, 27 Jun 2025 13:19:54 +0000
Subject: [PATCH 073/105] Fix getting community posts on subscription page
 (#7603)

* Fix getting community posts on subscription page

* use newer params as well (old params still worked but no idea how long they will work for?)
---
 src/renderer/helpers/api/local.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index c5a4cc59f4e71..150a9a906a5bd 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -518,7 +518,7 @@ export async function getLocalChannelCommunity(id) {
   try {
     const response = await innertube.actions.execute('/browse', {
       browseId: id,
-      params: 'Egljb21tdW5pdHnyBgQKAkoA'
+      params: 'EgVwb3N0c_IGBAoCSgA%3D'
       // protobuf for the community tab (this is the one that YouTube uses,
       // it has some empty fields in the protobuf but it doesn't work if you remove them)
     })
@@ -527,7 +527,7 @@ export async function getLocalChannelCommunity(id) {
 
     // if the channel doesn't have a community tab, YouTube returns the home tab instead
     // so we need to check that we got the right tab
-    if (communityTab.current_tab?.endpoint.metadata.url?.endsWith('/community')) {
+    if (communityTab.current_tab?.endpoint.metadata.url?.endsWith('/posts')) {
       return parseLocalCommunityPosts(communityTab.posts)
     } else {
       return []

From 0a33e38a0ee2921fe67b64445251f5b1aec02fc4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 19 Jul 2025 20:51:54 +0000
Subject: [PATCH 074/105] Bump youtubei.js from 13.4.0 to 15.0.0 (#7701)

* Bump youtubei.js from 13.4.0 to 15.0.0

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

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

* Fixes related to the breaking changes

* ! Fix our usage on API with breaking changes

* ! Fix license property not defined

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: absidue <48293849+absidue@users.noreply.github.com>
Co-authored-by: PikachuEXE <git@pikachuexe.net>
---
 package.json                      |  2 +-
 src/renderer/helpers/api/local.js | 15 +++++----------
 src/renderer/views/Watch/Watch.js |  7 +++++--
 yarn.lock                         | 30 +++++++++---------------------
 4 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index e54699d1dae69..5770001f01714 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": "^13.4.0"
+    "youtubei.js": "^15.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.26.7",
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 150a9a906a5bd..078053b2a7d5c 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -50,7 +50,7 @@ async function createInnertube({ withPlayer = false, location = undefined, safet
     // This setting is enabled by default and results in YouTube.js reusing the same session across different Innertube instances.
     // That behavior is highly undesirable for FreeTube, as we want to create a new session every time to limit tracking.
     enable_session_cache: false,
-    retrieve_innertube_config: false,
+    retrieve_innertube_config: !generateSessionLocally,
     user_agent: navigator.userAgent,
 
     retrieve_player: !!withPlayer,
@@ -215,7 +215,6 @@ export async function getLocalVideoInfo(id) {
         JSON.stringify(webInnertube.session.context)
       ))
 
-      webInnertube.session.po_token = contentPoToken
       webInnertube.session.player.po_token = sessionPoToken
     } catch (error) {
       console.error('Local API, poToken generation failed', error)
@@ -225,10 +224,10 @@ export async function getLocalVideoInfo(id) {
 
   let clientName = webInnertube.session.context.client.clientName
 
-  const info = await webInnertube.getInfo(id)
+  const info = await webInnertube.getInfo(id, { po_token: contentPoToken })
 
   // temporary workaround for SABR-only responses
-  const mwebInfo = await webInnertube.getBasicInfo(id, 'MWEB')
+  const mwebInfo = await webInnertube.getBasicInfo(id, { client: 'MWEB', po_token: contentPoToken })
 
   if (mwebInfo.playability_status.status === 'OK' && mwebInfo.streaming_data) {
     info.playability_status = mwebInfo.playability_status
@@ -248,16 +247,12 @@ export async function getLocalVideoInfo(id) {
     const webEmbeddedInnertube = await createInnertube({ clientType: ClientType.WEB_EMBEDDED })
     webEmbeddedInnertube.session.context.client.visitorData = webInnertube.session.context.client.visitorData
 
-    if (contentPoToken) {
-      webEmbeddedInnertube.session.po_token = contentPoToken
-    }
-
     const videoId = hasTrailer && trailerIsAgeRestricted ? info.playability_status.error_screen.video_id : id
 
     // getBasicInfo needs the signature timestamp (sts) from inside the player
     webEmbeddedInnertube.session.player = webInnertube.session.player
 
-    const bypassedInfo = await webEmbeddedInnertube.getBasicInfo(videoId, 'WEB_EMBEDDED')
+    const bypassedInfo = await webEmbeddedInnertube.getBasicInfo(videoId, { client: 'WEB_EMBEDDED', po_token: contentPoToken })
 
     if (bypassedInfo.playability_status.status === 'OK' && bypassedInfo.streaming_data) {
       info.playability_status = bypassedInfo.playability_status
@@ -1271,7 +1266,7 @@ function parseLockupView(lockupView, channelId = undefined, channelName = undefi
 
       let viewCount = null
 
-      const viewsText = lockupView.metadata.metadata?.metadata_rows[1].metadata_parts?.[0].text?.text
+      const viewsText = lockupView.metadata.metadata?.metadata_rows[1]?.metadata_parts?.[0].text?.text
 
       if (viewsText) {
         const views = parseLocalSubscriberCount(viewsText)
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 333d31b73d993..5e479771cbc33 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -91,6 +91,7 @@ export default defineComponent({
       videoTitle: '',
       videoDescription: '',
       videoDescriptionHtml: '',
+      license: '',
       videoViewCount: 0,
       videoLikeCount: 0,
       videoDislikeCount: 0,
@@ -1455,8 +1456,10 @@ export default defineComponent({
      * @param {boolean} includeThumbnails
      */
     createLocalDashManifest: async function (videoInfo, includeThumbnails = false) {
-      const xmlData = await videoInfo.toDash(undefined, undefined, {
-        include_thumbnails: includeThumbnails
+      const xmlData = await videoInfo.toDash({
+        manifest_options: {
+          include_thumbnails: includeThumbnails,
+        },
       })
 
       return `data:application/dash+xml;charset=UTF-8,${encodeURIComponent(xmlData)}`
diff --git a/yarn.lock b/yarn.lock
index 76e246a4b2915..72b502b6aad20 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1053,11 +1053,6 @@
     "@eslint/core" "^0.10.0"
     levn "^0.4.1"
 
-"@fastify/busboy@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.0.0.tgz#f22824caff3ae506b18207bad4126dbc6ccdb6b8"
-  integrity sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==
-
 "@fortawesome/fontawesome-common-types@6.7.2":
   version "6.7.2"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.7.2.tgz#7123d74b0c1e726794aed1184795dbce12186470"
@@ -9061,12 +9056,10 @@ undici-types@~5.26.4:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-undici@^5.19.1:
-  version "5.28.5"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.5.tgz#b2b94b6bf8f1d919bc5a6f31f2c01deb02e54d4b"
-  integrity sha512-zICwjrDrcrUE0pyyJc1I2QzBkLM8FINsgOrt6WjA+BgajVq9Nxu2PbFFXUrAggLfDXlZGZBVZYw7WNV5KiBiBA==
-  dependencies:
-    "@fastify/busboy" "^2.0.0"
+undici@^6.21.3:
+  version "6.21.3"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-6.21.3.tgz#185752ad92c3d0efe7a7d1f6854a50f83b552d7a"
+  integrity sha512-gBLkYIlEnSp8pFbT64yFgGE6UIB9tAkhukC23PmMDCe5Nd+cRqKxSjw5y54MK2AZMgZfJWMaNE4nYUHgi1XEOw==
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
@@ -9654,17 +9647,12 @@ 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==
 
-yocto-queue@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
-  integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
-
-youtubei.js@^13.4.0:
-  version "13.4.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-13.4.0.tgz#1f52d7ed0ccabd5ba718eede84771aa32683d9e2"
-  integrity sha512-+fmIZU/dWAjsROONrASy1REwVpy6umAPVuoNLr/4iNmZXl84LyBef0n3hrd1Vn9035EuINToGyQcBmifwUEemA==
+youtubei.js@^15.0.0:
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-15.0.0.tgz#c5ca88c6a1a289846aca2f7ce7147fce1316b40b"
+  integrity sha512-giPZREn+q0z8Jr45NUcJUXE7QA2+UD2jx5FR+ULdnexvtHg5uQZr9Am8aYcECPKzbBNe6ksBD1yT4SKNbhpRqA==
   dependencies:
     "@bufbuild/protobuf" "^2.0.0"
     jintr "^3.3.1"
     tslib "^2.5.0"
-    undici "^5.19.1"
+    undici "^6.21.3"

From 2a89e58d46542c91e2a19441388aa7920d9625c5 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, 20 Jul 2025 16:24:03 +0200
Subject: [PATCH 075/105] fix yarn.lock again

---
 yarn.lock | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 72b502b6aad20..79c151b27266d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3680,10 +3680,10 @@ electron@^34.0.1:
     "@types/node" "^20.9.0"
     extract-zip "^2.0.1"
 
-eme-encryption-scheme-polyfill@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.2.0.tgz#b642e460b0cb46a9a51a1069fde3ba2c01565af9"
-  integrity sha512-wfgRcR2cGAX0WKbPahhI13dr2mzFQ/rMnoDibRIdScQlv9S0rtnXd25XF17IUdNJw/voJoFpYQp33C3xkFnyEw==
+eme-encryption-scheme-polyfill@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.2.3.tgz#420608d56b995dfc440cfefba3cc06faaf02a95d"
+  integrity sha512-N0nlJZVaBqGWzvvFb6ZAxvTVeZ4v9cXCzrSFE0zCbNbviiygWI0gDJiRc4o5SqFrPVYBSQr5z5SzKjIvvxL+Vw==
 
 emoji-regex@^10.0.0, emoji-regex@^10.3.0:
   version "10.3.0"
@@ -9647,6 +9647,11 @@ 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==
 
+yocto-queue@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.2.1.tgz#36d7c4739f775b3cbc28e6136e21aa057adec418"
+  integrity sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==
+
 youtubei.js@^15.0.0:
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-15.0.0.tgz#c5ca88c6a1a289846aca2f7ce7147fce1316b40b"

From 24a344a032a1a2d805a2117c966c96e41fa10605 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 22 Jul 2025 01:15:09 +0000
Subject: [PATCH 076/105] Fix HTTP 429 errors for auto-translated subtitles
 (#7711)

---
 src/main/index.js                                           | 2 +-
 .../ft-shaka-video-player/ft-shaka-video-player.js          | 6 +++++-
 src/renderer/views/Watch/Watch.js                           | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index 64d58e315abf5..c7934becd7b53 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -452,7 +452,7 @@ function runApp() {
         requestHeaders['Sec-Fetch-Site'] = 'same-origin'
         requestHeaders['Sec-Fetch-Mode'] = 'same-origin'
         requestHeaders['X-Youtube-Bootstrap-Logged-In'] = 'false'
-      } else if (url === 'https://www.youtube.com/sw.js_data') {
+      } else if (url === 'https://www.youtube.com/sw.js_data' || url.startsWith('https://www.youtube.com/api/timedtext')) {
         requestHeaders.Referer = 'https://www.youtube.com/sw.js'
         requestHeaders['Sec-Fetch-Site'] = 'same-origin'
         requestHeaders['Sec-Fetch-Mode'] = 'same-origin'
diff --git a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
index 35ab11b8cc043..149c002c3d0a0 100644
--- a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
+++ b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
@@ -2261,7 +2261,11 @@ export default defineComponent({
 
       // text related errors aren't serious (captions and seek bar thumbnails), so we should just log them
       // TODO: consider only emitting when the severity is crititcal?
-      if (!ignoreErrors && error.category !== shaka.util.Error.Category.TEXT) {
+      if (
+        !ignoreErrors &&
+        error.category !== shaka.util.Error.Category.TEXT &&
+        !(error.code === shaka.util.Error.Code.BAD_HTTP_STATUS && error.data[0].startsWith('https://www.youtube.com/api/timedtext'))
+      ) {
         // don't react to multiple consecutive errors, otherwise we don't give the format fallback from the previous error a chance to work
         ignoreErrors = true
 
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 5e479771cbc33..cbb20e3265fe1 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -1620,7 +1620,8 @@ export default defineComponent({
       }
 
       const url = new URL(trackToTranslate.base_url)
-      url.searchParams.set('fmt', 'vtt')
+      // Requesting fmt=vtt with the tlang parameter set returns HTTP 429 errors, but requesting srt instead seems to work
+      url.searchParams.set('fmt', 'srt')
       url.searchParams.set('tlang', translationCode)
 
       const label = this.$t('Video.Player.TranslatedCaptionTemplate', {
@@ -1632,7 +1633,7 @@ export default defineComponent({
         url: url.toString(),
         label,
         language: translationCode,
-        mimeType: 'text/vtt',
+        mimeType: 'text/srt',
         isAutotranslated: true
       }
     },

From ab81c7d2f8750bfab5cbb624b010d7f5227bc1d6 Mon Sep 17 00:00:00 2001
From: PikachuEXE <git@pikachuexe.net>
Date: Mon, 28 Jul 2025 09:17:25 +0800
Subject: [PATCH 077/105] Fix deleted videos appears when another video added
 to another playlist (#7681)

* $ Rename local data, extra timeout value

* ! Fix deleted videos appears when another video added to another playlist
---
 src/renderer/views/Playlist/Playlist.js  | 73 ++++++++++++++++--------
 src/renderer/views/Playlist/Playlist.vue | 26 ++++-----
 2 files changed, 61 insertions(+), 38 deletions(-)

diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index 570e3c9661252..3493208f24b7f 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -81,7 +81,7 @@ export default defineComponent({
       videoSearchQuery: '',
 
       promptOpen: false,
-      deletedPlaylistItemIds: [],
+      toBeDeletedPlaylistItemIds: [],
       // Present = shown
       undoToastAbortController: null,
     }
@@ -193,7 +193,7 @@ export default defineComponent({
         const playlistItems = this.getPlaylistItemsWithDuration()
         return getSortedPlaylistItems(playlistItems, this.sortOrder, this.currentLocale)
       }
-      return getSortedPlaylistItems(this.playlistItems, this.sortOrder, this.currentLocale)
+      return getSortedPlaylistItems(this.shownPlaylistItems, this.sortOrder, this.currentLocale)
     },
     visiblePlaylistItems: function () {
       if (!this.isUserPlaylistRequested) {
@@ -244,6 +244,35 @@ export default defineComponent({
     sortBySelectValues() {
       return this.sortByValues
     },
+    totalPlaylistDuration() {
+      const totalSeconds = this.shownPlaylistItems.reduce((acc, video) => {
+        if (typeof video.lengthSeconds !== 'number') {
+          return NaN
+        }
+        return acc + video.lengthSeconds
+      }, 0)
+      return totalSeconds
+    },
+    noPlaylistItemsPendingDeletion() {
+      return this.toBeDeletedPlaylistItemIds.length === 0
+    },
+    shownPlaylistItems() {
+      if (this.noPlaylistItemsPendingDeletion) {
+        return this.playlistItems
+      }
+
+      return this.playlistItems.filter((v) => !this.toBeDeletedPlaylistItemIds.includes(v.playlistItemId))
+    },
+    shownPlaylistItemCount() {
+      return this.shownPlaylistItems.length
+    },
+    shownVideoCount() {
+      if (this.isUserPlaylistRequested) {
+        return this.shownPlaylistItemCount
+      }
+
+      return this.videoCount
+    },
   },
   watch: {
     $route() {
@@ -264,14 +293,16 @@ export default defineComponent({
       // Re-fetch from local store when current user playlist updated
       this.getPlaylistInfoDebounce()
     },
-    selectedUserPlaylistVideoCount() {
+    async selectedUserPlaylistVideoCount() {
       // Monitoring `selectedUserPlaylistVideos` makes this function called
       // Even when the same array object is returned
       // So length is monitored instead
       // Assuming in user playlist video cannot be swapped without length change
 
       // Re-fetch from local store when current user playlist videos updated
-      this.getPlaylistInfoDebounce()
+      // MUST NOT use `getPlaylistInfoDebounce` as it will cause delay in data update
+      // Causing deleted videos to reappear for one frame
+      this.getPlaylistInfo()
     },
   },
   created: function () {
@@ -424,7 +455,6 @@ export default defineComponent({
         this.firstVideoPlaylistItemId = ''
       }
       this.viewCount = 0
-      this.videoCount = playlist.videos.length
       const dateString = new Date(playlist.lastUpdatedAt)
       this.lastUpdated = dateString.toLocaleDateString(this.currentLocale, { year: 'numeric', month: 'short', day: 'numeric' })
       this.channelName = ''
@@ -444,7 +474,7 @@ export default defineComponent({
     },
 
     getPlaylistItemsWithDuration() {
-      const modifiedPlaylistItems = deepCopy(this.playlistItems)
+      const modifiedPlaylistItems = deepCopy(this.shownPlaylistItems)
       let anyVideoMissingDuration = false
       modifiedPlaylistItems.forEach(video => {
         if (videoDurationPresent(video)) { return }
@@ -482,10 +512,10 @@ export default defineComponent({
           this.isLoadingMore = true
 
           nextTick(() => {
-            if (this.userPlaylistVisibleLimit + 100 < this.videoCount) {
+            if (this.userPlaylistVisibleLimit + 100 < this.shownVideoCount) {
               this.userPlaylistVisibleLimit += 100
             } else {
-              this.userPlaylistVisibleLimit = this.videoCount
+              this.userPlaylistVisibleLimit = this.shownVideoCount
             }
 
             this.isLoadingMore = false
@@ -590,33 +620,26 @@ export default defineComponent({
 
     removeVideoFromPlaylist: function (videoId, playlistItemId) {
       try {
-        const playlistItems = [].concat(this.playlistItems)
-        const tempPlaylistItems = [].concat(this.playlistItems)
-
         const videoIndex = this.playlistItems.findIndex((video) => {
           return video.videoId === videoId && video.playlistItemId === playlistItemId
         })
 
         if (videoIndex !== -1) {
-          this.deletedPlaylistItemIds.push(this.playlistItems[videoIndex].playlistItemId)
-          playlistItems.splice(videoIndex, 1)
-          this.playlistItems = playlistItems
-          this.videoCount = playlistItems.length
+          this.toBeDeletedPlaylistItemIds.push(this.playlistItems[videoIndex].playlistItemId)
 
           // Only show toast when no existing toast shown
           if (this.undoToastAbortController == null) {
             this.undoToastAbortController = new AbortController()
+            const timeoutMs = 5 * 1000
             const actualRemoveVideosTimeout = setTimeout(() => {
               this.removeToBeDeletedVideosSometimes()
-            }, 5000)
+            }, timeoutMs)
             showToast(
               this.$t('User Playlists.SinglePlaylistView.Toast["Video has been removed. Click here to undo."]'),
-              5000,
+              timeoutMs,
               () => {
-                this.playlistItems = tempPlaylistItems
-                this.videoCount = tempPlaylistItems.length
                 clearTimeout(actualRemoveVideosTimeout)
-                this.deletedPlaylistItemIds = []
+                this.toBeDeletedPlaylistItemIds = []
                 this.undoToastAbortController = null
               },
               this.undoToastAbortController.signal,
@@ -629,15 +652,15 @@ export default defineComponent({
       }
     },
 
-    removeToBeDeletedVideosSometimes() {
+    async removeToBeDeletedVideosSometimes() {
       if (this.isLoading) { return }
 
-      if (this.deletedPlaylistItemIds.length > 0) {
-        this.removeVideos({
+      if (this.toBeDeletedPlaylistItemIds.length > 0) {
+        await this.removeVideos({
           _id: this.playlistId,
-          playlistItemIds: this.deletedPlaylistItemIds,
+          playlistItemIds: this.toBeDeletedPlaylistItemIds,
         })
-        this.deletedPlaylistItemIds = []
+        this.toBeDeletedPlaylistItemIds = []
         this.undoToastAbortController?.abort()
         this.undoToastAbortController = null
       }
diff --git a/src/renderer/views/Playlist/Playlist.vue b/src/renderer/views/Playlist/Playlist.vue
index 8a673fbdd138c..c23997bc0fa9c 100644
--- a/src/renderer/views/Playlist/Playlist.vue
+++ b/src/renderer/views/Playlist/Playlist.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    :class="{ [listType]: true, playlistInEditMode, hasNoPlaylistDescription: !playlistDescription, oneOrFewer: videoCount < 2 }"
+    :class="{ [listType]: true, playlistInEditMode, hasNoPlaylistDescription: !playlistDescription, oneOrFewer: shownVideoCount < 2 }"
     class="playlistPage"
   >
     <ft-loader
@@ -25,12 +25,12 @@
         :channel-id="channelId"
         :last-updated="lastUpdated"
         :description="playlistDescription"
-        :video-count="videoCount"
-        :videos="playlistItems"
+        :video-count="shownVideoCount"
+        :videos="shownPlaylistItems"
         :view-count="viewCount"
         :info-source="infoSource"
         :more-video-data-available="moreVideoDataAvailable"
-        :search-video-mode-allowed="isUserPlaylistRequested && videoCount > 1"
+        :search-video-mode-allowed="isUserPlaylistRequested && shownVideoCount > 1"
         :search-video-mode-enabled="playlistInVideoSearchMode"
         :search-query-text="searchQueryTextRequested"
         :theme="listType === 'list' ? 'base' : 'top-bar'"
@@ -48,10 +48,10 @@
       class="playlistItemsCard"
     >
       <template
-        v-if="playlistItems.length > 0"
+        v-if="shownPlaylistItems.length > 0"
       >
         <ft-select
-          v-if="isUserPlaylistRequested && playlistItems.length > 1"
+          v-if="isUserPlaylistRequested && shownPlaylistItems.length > 1"
           class="sortSelect"
           :value="sortOrder"
           :select-names="sortBySelectNames"
@@ -74,9 +74,9 @@
             :hide-forbidden-titles="false"
             :always-show-add-to-playlist-button="true"
             :quick-bookmark-button-enabled="quickBookmarkButtonEnabled"
-            :can-move-video-up="!playlistInVideoSearchMode && isSortOrderCustom"
-            :can-move-video-down="!playlistInVideoSearchMode && isSortOrderCustom"
-            :playlist-items-length="playlistItems.length"
+            :can-move-video-up="!playlistInVideoSearchMode && isSortOrderCustom && noPlaylistItemsPendingDeletion"
+            :can-move-video-down="!playlistInVideoSearchMode && isSortOrderCustom && noPlaylistItemsPendingDeletion"
+            :playlist-items-length="shownPlaylistItems.length"
             :can-remove-from-playlist="true"
             @move-video-up="moveVideoUp"
             @move-video-down="moveVideoDown"
@@ -95,15 +95,15 @@
               :data="item"
               :playlist-id="playlistId"
               :playlist-type="infoSource"
-              :playlist-index="playlistInVideoSearchMode ? playlistItems.findIndex(i => i === item) : index"
+              :playlist-index="playlistInVideoSearchMode ? shownPlaylistItems.findIndex(i => i === item) : index"
               :playlist-item-id="item.playlistItemId"
               appearance="result"
               :always-show-add-to-playlist-button="true"
               :quick-bookmark-button-enabled="quickBookmarkButtonEnabled"
-              :can-move-video-up="index > 0 && !playlistInVideoSearchMode && isSortOrderCustom"
-              :can-move-video-down="index < playlistItems.length - 1 && !playlistInVideoSearchMode && isSortOrderCustom"
+              :can-move-video-up="index > 0 && !playlistInVideoSearchMode && isSortOrderCustom && noPlaylistItemsPendingDeletion"
+              :can-move-video-down="index < shownPlaylistItems.length - 1 && !playlistInVideoSearchMode && isSortOrderCustom && noPlaylistItemsPendingDeletion"
               :can-remove-from-playlist="true"
-              :video-index="playlistInVideoSearchMode ? playlistItems.findIndex(i => i === item) : index"
+              :video-index="playlistInVideoSearchMode ? shownPlaylistItems.findIndex(i => i === item) : index"
               :initial-visible-state="index < 10"
               @move-video-up="moveVideoUp(item.videoId, item.playlistItemId)"
               @move-video-down="moveVideoDown(item.videoId, item.playlistItemId)"

From cdc3f124d46fe7e7ab915e9022a5eaa26d1a6e4e Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Tue, 17 Jun 2025 21:29:48 +0000
Subject: [PATCH 078/105] Make sure description isn't null when extracting
 chapters from description (#7505)

* Make sure description isn't null when extracting chapters from description

* set default value for description to empty string
---
 .../WatchVideoDescription/WatchVideoDescription.vue         | 2 +-
 src/renderer/views/Watch/Watch.js                           | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/WatchVideoDescription/WatchVideoDescription.vue b/src/renderer/components/WatchVideoDescription/WatchVideoDescription.vue
index 31a8d784f248f..2fedbb0b4a526 100644
--- a/src/renderer/components/WatchVideoDescription/WatchVideoDescription.vue
+++ b/src/renderer/components/WatchVideoDescription/WatchVideoDescription.vue
@@ -52,7 +52,7 @@ import FtTimestampCatcher from '../FtTimestampCatcher.vue'
 const props = defineProps({
   description: {
     type: String,
-    required: true
+    default: ''
   },
   descriptionHtml: {
     type: String,
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index cbb20e3265fe1..a87cb3b68d4eb 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -1039,10 +1039,14 @@ export default defineComponent({
     },
 
     /**
-     * @param {string} description
+     * @param {string?} description
      */
     extractChaptersFromDescription: function (description) {
+      if (description == null) { return [] }
+
+      /** @type {{title: string, timestamp: string, startSeconds: number, endSeconds: number}[]} */
       const chapters = []
+
       // HH:MM:SS Text
       // MM:SS Text
       // HH:MM:SS - Text // separator is one of '-', '–', '•', '—'

From fb6f7d4040475842ec8b2139cffa0d55fd5c54d0 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Fri, 8 Aug 2025 16:32:14 +0200
Subject: [PATCH 079/105] Add shorts player parameters to help with 403s
 (#7763)

---
 src/renderer/helpers/api/local.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 078053b2a7d5c..cb642e0b11c0d 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -59,7 +59,13 @@ async function createInnertube({ withPlayer = false, location = undefined, safet
     client_type: clientType,
 
     // use browser fetch
-    fetch: (input, init) => fetch(input, init),
+    fetch: (input, init) => {
+      if (input.url?.startsWith('https://www.youtube.com/youtubei/v1/player')) {
+        init.body = init.body.replace('"videoId":', '"params":"8AEB","videoId":')
+      }
+
+      return fetch(input, init)
+    },
     cache,
     generate_session_locally: !!generateSessionLocally
   })

From 04d690e95f117bf34c913e3221d7bbd1a5bc3a81 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, 8 Aug 2025 21:45:06 +0200
Subject: [PATCH 080/105] Bump package version from 0.23.5 to 0.23.6 (#7794)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5770001f01714..3a14ee6b0120d 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.23.5",
+  "version": "0.23.6",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From 681ee31a23e6d7c5fec61f3d684bcc3f965b1a59 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 12 Aug 2025 02:09:19 +0200
Subject: [PATCH 081/105] Fix subtitles being in the top right corner (#7841)

---
 src/renderer/helpers/api/local.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index cb642e0b11c0d..56eb8b7f996b7 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -324,6 +324,10 @@ export async function getLocalVideoInfo(id) {
       url.searchParams.set('pot', contentPoToken)
       url.searchParams.set('c', clientName)
 
+      // Remove &xosf=1 as it adds `position:63% line:0%` to the subtitle lines
+      // placing them in the top right corner
+      url.searchParams.delete('xosf')
+
       captionTrack.base_url = url.toString()
     }
   }

From dfd88c86e20f9143fdcdd0bd7f452e5a0e0db621 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Fri, 15 Aug 2025 04:03:20 +0200
Subject: [PATCH 082/105] Make MWEB return the original audio track (#7846)

---
 src/renderer/helpers/api/local.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 56eb8b7f996b7..0325a8ec5fee0 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -232,7 +232,18 @@ export async function getLocalVideoInfo(id) {
 
   const info = await webInnertube.getInfo(id, { po_token: contentPoToken })
 
-  // temporary workaround for SABR-only responses
+  // #region temporary workaround for SABR-only responses
+
+  // MWEB doesn't have an audio track selector so it picks the audio track on the server based on the request language.
+
+  const originalAudioTrackFormat = info.streaming_data?.adaptive_formats.find(format => {
+    return format.has_audio && format.is_original && format.language
+  })
+
+  if (originalAudioTrackFormat) {
+    webInnertube.session.context.client.hl = originalAudioTrackFormat.language
+  }
+
   const mwebInfo = await webInnertube.getBasicInfo(id, { client: 'MWEB', po_token: contentPoToken })
 
   if (mwebInfo.playability_status.status === 'OK' && mwebInfo.streaming_data) {
@@ -242,6 +253,8 @@ export async function getLocalVideoInfo(id) {
     clientName = 'MWEB'
   }
 
+  // #endregion temporary workaround for SABR-only responses
+
   let hasTrailer = info.has_trailer
   let trailerIsAgeRestricted = info.getTrailerInfo() === null
 

From cfc656a447e01a296927c152114f3d32d489ef24 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, 15 Aug 2025 08:00:53 +0200
Subject: [PATCH 083/105] Bump package version from 0.23.6 to 0.23.7 (#7849)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3a14ee6b0120d..af98af22103a0 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.23.6",
+  "version": "0.23.7",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From 920746ed9c306f57b556a3e2a5ff31f40a4f327b Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Fri, 22 Aug 2025 20:38:51 +0200
Subject: [PATCH 084/105] Wait for pre-roll ads to finish in /player request
 (#7887)

---
 src/renderer/helpers/api/local.js | 48 +++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 0325a8ec5fee0..660630e4a5bb3 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -59,13 +59,49 @@ async function createInnertube({ withPlayer = false, location = undefined, safet
     client_type: clientType,
 
     // use browser fetch
-    fetch: (input, init) => {
-      if (input.url?.startsWith('https://www.youtube.com/youtubei/v1/player')) {
-        init.body = init.body.replace('"videoId":', '"params":"8AEB","videoId":')
-      }
+    fetch: !withPlayer
+      ? (input, init) => fetch(input, init)
+      : async (input, init) => {
+        if (input.url?.startsWith('https://www.youtube.com/youtubei/v1/player') && init?.headers?.get('X-Youtube-Client-Name') === '2') {
+          const response = await fetch(input, init)
+
+          const responseText = await response.text()
+
+          const json = JSON.parse(responseText)
+
+          if (Array.isArray(json.adSlots)) {
+            let waitSeconds = 0
+
+            for (const adSlot of json.adSlots) {
+              if (adSlot.adSlotRenderer?.adSlotMetadata?.triggerEvent === 'SLOT_TRIGGER_EVENT_BEFORE_CONTENT') {
+                const playerVars = adSlot.adSlotRenderer.fulfillmentContent?.fulfilledLayout?.playerBytesAdLayoutRenderer
+                  ?.renderingContent?.instreamVideoAdRenderer?.playerVars
+
+                if (playerVars) {
+                  const match = playerVars.match(/length_seconds=([\d.]+)/)
+
+                  if (match) {
+                    waitSeconds += parseFloat(match[1])
+                  }
+                }
+              }
+            }
+
+            if (waitSeconds > 0) {
+              await new Promise((resolve) => setTimeout(resolve, waitSeconds * 1000))
+            }
+          }
+
+          // Need to return a new response object, as you can only read the response body once.
+          return new Response(responseText, {
+            status: response.status,
+            statusText: response.statusText,
+            headers: response.headers
+          })
+        }
 
-      return fetch(input, init)
-    },
+        return fetch(input, init)
+      },
     cache,
     generate_session_locally: !!generateSessionLocally
   })

From e87a9b7da4970a3d215d1abb9f6ffae96f65f984 Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Sat, 23 Aug 2025 12:06:56 +0200
Subject: [PATCH 085/105] Bump package version from 0.23.7 to 0.23.8 (#7889)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index af98af22103a0..1ba6d1530188b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.23.7",
+  "version": "0.23.8",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From f71af4c81430707346324444693b678a3aac058e Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Thu, 11 Sep 2025 19:33:48 +0000
Subject: [PATCH 086/105] Add Workflow to Automate Updating the Website Version
 Number (#7989)

* Create updateSite.yaml

* Rename updateSite.yaml to updateSite.yml

* Update updateSite.yml

* Update updateSite.yml

* Update updateSite.yml

* Update updateSite.yml

* Update updateSite.yml
---
 .github/workflows/updateSite.yml | 68 ++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 .github/workflows/updateSite.yml

diff --git a/.github/workflows/updateSite.yml b/.github/workflows/updateSite.yml
new file mode 100644
index 0000000000000..cfc565c06e33c
--- /dev/null
+++ b/.github/workflows/updateSite.yml
@@ -0,0 +1,68 @@
+# This is a basic workflow that is manually triggered
+
+name: Update Site Version Number
+
+# Controls when the action will run. Workflow runs when manually triggered using the UI
+# or API.
+on:
+  workflow_dispatch:
+  release:
+    types: [published]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v5
+      with:
+        repository: FreeTubeApp/FreeTubeApp.io
+        token: ${{ secrets.FLATHUB_TOKEN }}
+    - name: Get Repo Release List
+      uses: moustacheful/github-api-exec-action@v0
+      id: list_results
+      with:
+        # Command to execute, (e.g: `pulls.create`), see https://octokit.github.io/rest.js/ for available commands
+        command: repos.listReleases
+        payload: >
+            {
+              "owner": "FreeTubeApp",
+              "repo": "FreeTube"
+            }
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Create Current Version Variable
+      uses: bluwy/substitute-string-action@v3
+      id: current
+      with:
+        _input-text: ${{ fromJson(steps.list_results.outputs.result)[0].tag_name }}
+        -beta: ''
+        v: ''
+    - name: Create Previous Version Variable
+      uses: bluwy/substitute-string-action@v3
+      id: previous
+      with:
+        _input-text: ${{ fromJson(steps.list_results.outputs.result)[1].tag_name }}
+        -beta: ''
+        v: ''
+    - name: Set Master Branch
+    # Currently the default branch is master, but if that changes later, then this acts as a failsafe.
+      run: |
+        git checkout master
+    - name: Update index.php
+      run: |
+        sed -in 's/${{ steps.previous.outputs.result  }}/${{ steps.current.outputs.result }}/' src/index.php
+    - name: Commit Files
+      uses: stefanzweifel/git-auto-commit-action@v6
+      with:
+        # Optional but recommended
+        # Defaults to "Apply automatic changes"
+        commit_message: Update version number to v${{ steps.current.outputs.result }}
+
+        # Optional options appended to `git-commit`
+        # See https://git-scm.com/docs/git-commit for a list of available options
+        commit_options: '--no-verify --signoff'
+
+        # Optional: Disable dirty check and always try to create a commit and push
+        skip_dirty_check: true

From 0e839f5fa995419fb580075ee8e02657239e75b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Sep 2025 01:04:22 +0200
Subject: [PATCH 087/105] Bump youtubei.js from 15.0.1 to 15.1.0 (#8022)

Bumps [youtubei.js](https://github.com/LuanRT/YouTube.js) from 15.0.1 to 15.1.0.
- [Release notes](https://github.com/LuanRT/YouTube.js/releases)
- [Changelog](https://github.com/LuanRT/YouTube.js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/LuanRT/YouTube.js/compare/v15.0.1...v15.1.0)

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

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 1ba6d1530188b..3ba94ed1283aa 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": "^15.0.0"
+    "youtubei.js": "^15.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.26.7",
diff --git a/yarn.lock b/yarn.lock
index 79c151b27266d..75bf817ad6983 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9652,10 +9652,10 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.2.1.tgz#36d7c4739f775b3cbc28e6136e21aa057adec418"
   integrity sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==
 
-youtubei.js@^15.0.0:
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-15.0.0.tgz#c5ca88c6a1a289846aca2f7ce7147fce1316b40b"
-  integrity sha512-giPZREn+q0z8Jr45NUcJUXE7QA2+UD2jx5FR+ULdnexvtHg5uQZr9Am8aYcECPKzbBNe6ksBD1yT4SKNbhpRqA==
+youtubei.js@^15.1.0:
+  version "15.1.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-15.1.0.tgz#166a77cc394a0acced0096ea39ac7a47ff6c914c"
+  integrity sha512-XwSXrbLpeER4gXArQ0NPRwfR9cUC3jVSZfHe4+LFGrambSHLO5wDR+vUm8tjDTC/SpGWj2Jxd9oQ5OXQolT9iQ==
   dependencies:
     "@bufbuild/protobuf" "^2.0.0"
     jintr "^3.3.1"

From de18b27df09748f198c5a25ef1688b45f132547b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 14 Sep 2025 04:53:59 +0200
Subject: [PATCH 088/105] Bump youtubei.js from 15.1.0 to 15.1.1 (#8031)

Bumps [youtubei.js](https://github.com/LuanRT/YouTube.js) from 15.1.0 to 15.1.1.
- [Release notes](https://github.com/LuanRT/YouTube.js/releases)
- [Changelog](https://github.com/LuanRT/YouTube.js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/LuanRT/YouTube.js/compare/v15.1.0...v15.1.1)

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

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 3ba94ed1283aa..b0d3deb11c5a5 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": "^15.1.0"
+    "youtubei.js": "^15.1.1"
   },
   "devDependencies": {
     "@babel/core": "^7.26.7",
diff --git a/yarn.lock b/yarn.lock
index 75bf817ad6983..38e2c3675bc4c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9652,10 +9652,10 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.2.1.tgz#36d7c4739f775b3cbc28e6136e21aa057adec418"
   integrity sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==
 
-youtubei.js@^15.1.0:
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-15.1.0.tgz#166a77cc394a0acced0096ea39ac7a47ff6c914c"
-  integrity sha512-XwSXrbLpeER4gXArQ0NPRwfR9cUC3jVSZfHe4+LFGrambSHLO5wDR+vUm8tjDTC/SpGWj2Jxd9oQ5OXQolT9iQ==
+youtubei.js@^15.1.1:
+  version "15.1.1"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-15.1.1.tgz#a5cfbfb24e7e3d4233ec9f245b2a8ade0ad28128"
+  integrity sha512-fuEDj9Ky6cAQg93BrRVCbr+GTYNZQAIFZrx/a3oDRuGc3Mf5bS0dQfoYwwgjtSV7sgAKQEEdGtzRdBzOc8g72Q==
   dependencies:
     "@bufbuild/protobuf" "^2.0.0"
     jintr "^3.3.1"

From 5697a60162572abe70e72391cb5c8d1740d77edc 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, 12 Sep 2025 01:24:56 +0200
Subject: [PATCH 089/105] Bump package version from 0.23.8 to 0.23.9 (#8027)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b0d3deb11c5a5..1b43609522f12 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.23.8",
+  "version": "0.23.9",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From d57336af5eb014ac25981e86b840d56e90864aee Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Mon, 15 Sep 2025 00:24:52 +0200
Subject: [PATCH 090/105] Remove n argument in sed (#8033)

* remove n argument in sed

* Update .github/workflows/updateSite.yml

Co-authored-by: PikachuEXE <git@pikachuexe.net>

---------

Co-authored-by: PikachuEXE <git@pikachuexe.net>
---
 .github/workflows/updateSite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/updateSite.yml b/.github/workflows/updateSite.yml
index cfc565c06e33c..f38a2e58aff59 100644
--- a/.github/workflows/updateSite.yml
+++ b/.github/workflows/updateSite.yml
@@ -52,7 +52,7 @@ jobs:
         git checkout master
     - name: Update index.php
       run: |
-        sed -in 's/${{ steps.previous.outputs.result  }}/${{ steps.current.outputs.result }}/' src/index.php
+        sed -i 's/${{ steps.previous.outputs.result  }}/${{ steps.current.outputs.result }}/g' src/index.php
     - name: Commit Files
       uses: stefanzweifel/git-auto-commit-action@v6
       with:

From c98598ce806044152c3b4dc8f2d6bf942891a992 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 12 Oct 2025 14:27:24 -0400
Subject: [PATCH 091/105] Bump youtubei.js from 15.1.1 to 16.0.0 (#8115)

* Bump youtubei.js from 15.1.1 to 16.0.0

Bumps [youtubei.js](https://github.com/LuanRT/YouTube.js) from 15.1.1 to 16.0.0.
- [Release notes](https://github.com/LuanRT/YouTube.js/releases)
- [Changelog](https://github.com/LuanRT/YouTube.js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/LuanRT/YouTube.js/compare/v15.1.1...v16.0.0)

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

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

* Implement an iframe based custom sig eval function

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: absidue <48293849+absidue@users.noreply.github.com>
---
 _scripts/sigFrameConfig.js            | 15 ++++++++
 _scripts/webpack.renderer.config.js   |  5 ++-
 package.json                          |  2 +-
 src/index.ejs                         | 12 ++++++
 src/renderer/helpers/api/invidious.js |  2 +-
 src/renderer/helpers/api/local.js     | 54 ++++++++++++++++++++++++---
 src/renderer/sigFrameScript.js        | 11 ++++++
 yarn.lock                             | 40 +++++++++-----------
 8 files changed, 110 insertions(+), 31 deletions(-)
 create mode 100644 _scripts/sigFrameConfig.js
 create mode 100644 src/renderer/sigFrameScript.js

diff --git a/_scripts/sigFrameConfig.js b/_scripts/sigFrameConfig.js
new file mode 100644
index 0000000000000..ec36378e20a36
--- /dev/null
+++ b/_scripts/sigFrameConfig.js
@@ -0,0 +1,15 @@
+const { hash } = require('crypto')
+const { join } = require('path')
+const { readFileSync } = require('fs')
+
+const path = join(__dirname, '../src/renderer/sigFrameScript.js')
+const rawScript = readFileSync(path, 'utf8')
+
+const script = process.env.NODE_ENV === 'development'
+  ? rawScript
+  : require('terser').minify_sync({ [path]: rawScript }).code
+
+module.exports.sigFrameTemplateParameters = {
+  sigFrameSrc: `data:text/html,${encodeURIComponent(`<!doctype html><script>${script}</script>`)}`,
+  sigFrameCspHash: `sha512-${hash('sha512', script, 'base64')}`
+}
diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
index 11f1cf828711c..f3e8c8e59870f 100644
--- a/_scripts/webpack.renderer.config.js
+++ b/_scripts/webpack.renderer.config.js
@@ -12,6 +12,7 @@ const {
   SHAKA_LOCALES_PREBUNDLED,
   SHAKA_LOCALES_TO_BE_BUNDLED
 } = require('./getShakaLocales')
+const { sigFrameTemplateParameters } = require('./sigFrameConfig')
 
 const isDevMode = process.env.NODE_ENV === 'development'
 
@@ -132,9 +133,9 @@ const config = {
       'process.env.SHAKA_LOCALES_PREBUNDLED': JSON.stringify(SHAKA_LOCALES_PREBUNDLED)
     }),
     new HtmlWebpackPlugin({
-      excludeChunks: ['processTaskWorker'],
       filename: 'index.html',
-      template: path.resolve(__dirname, '../src/index.ejs')
+      template: path.resolve(__dirname, '../src/index.ejs'),
+      templateParameters: sigFrameTemplateParameters
     }),
     new VueLoaderPlugin(),
     new MiniCssExtractPlugin({
diff --git a/package.json b/package.json
index 1b43609522f12..2578742ec32cc 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": "^15.1.1"
+    "youtubei.js": "^16.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.26.7",
diff --git a/src/index.ejs b/src/index.ejs
index 40f7075a171a6..7a3aa8aa92971 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -13,6 +13,18 @@
 
   <body>
     <div id="app"></div>
+    <% if (process.env.SUPPORTS_LOCAL_API) { %>
+    <iframe
+      id="sigFrame"
+      src="<%= sigFrameSrc %>"
+      csp="default-src 'none'; script-src '<%= sigFrameCspHash %>' 'unsafe-eval'"
+      sandbox="allow-scripts"
+      height="1"
+      width="1"
+      style="display: none; pointer-events: none"
+      tabindex="-1"
+    ></iframe>
+    <% } %>
     <% if (!process.env.IS_ELECTRON) { %>
     <script>
     // This is the service worker with the Advanced caching
diff --git a/src/renderer/helpers/api/invidious.js b/src/renderer/helpers/api/invidious.js
index e3378de74e8a3..0a900ece7c908 100644
--- a/src/renderer/helpers/api/invidious.js
+++ b/src/renderer/helpers/api/invidious.js
@@ -837,7 +837,7 @@ export async function generateInvidiousDashManifestLocally(formats) {
   // create a dummy player, as deciphering requires making requests to YouTube,
   // which we want to avoid when Invidious is selected as the backend
   const player = new Player()
-  player.decipher = (url) => url
+  player.decipher = async (url) => url
 
   let urlTransformer
 
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 660630e4a5bb3..9eaa67a4a0cad 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -1,4 +1,4 @@
-import { ClientType, Innertube, Misc, Mixins, Parser, UniversalCache, Utils, YT, YTNodes } from 'youtubei.js'
+import { ClientType, Innertube, Misc, Mixins, Parser, Platform, UniversalCache, Utils, YT, YTNodes } from 'youtubei.js'
 import Autolinker from 'autolinker'
 import { IpcChannels, SEARCH_CHAR_LIMIT } from '../../../constants'
 
@@ -20,6 +20,50 @@ const TRACKING_PARAM_NAMES = [
   'utm_content',
 ]
 
+if (process.env.SUPPORTS_LOCAL_API) {
+  Platform.shim.eval = (data, env) => {
+    return new Promise((resolve) => {
+      const properties = []
+
+      if (env.n) {
+        properties.push(`n: exportedVars.nFunction("${env.n}")`)
+      }
+
+      if (env.sig) {
+        properties.push(`sig: exportedVars.sigFunction("${env.sig}")`)
+      }
+
+      // Triggers permission errors if we don't remove it (added by YouTube.js), as sessionStorage isn't accessible in sandboxed cross-origin iframes
+      const modifiedOutput = data.output.replace('const window = Object.assign({}, globalThis);', '')
+
+      const code = `${modifiedOutput}\nreturn {${properties.join(', ')}}`
+
+      // Generate a unique ID, as there may be multiple eval calls going on at the same time (e.g. DASH manifest generation)
+      const messageId = process.env.IS_ELECTRON || crypto.randomUUID
+        ? crypto.randomUUID()
+        : `${Date.now()}-${Math.floor(Math.random() * 10000)}`
+
+      const iframe = document.getElementById('sigFrame')
+
+      /** @param {MessageEvent} event */
+      const listener = (event) => {
+        if (event.source === iframe.contentWindow && typeof event.data === 'string') {
+          const data = JSON.parse(event.data)
+
+          if (data.id === messageId) {
+            window.removeEventListener('message', listener)
+
+            resolve(data.result)
+          }
+        }
+      }
+
+      window.addEventListener('message', listener)
+      iframe.contentWindow.postMessage(JSON.stringify({ id: messageId, code }), '*')
+    })
+  }
+}
+
 /**
  * Creates a lightweight Innertube instance, which is faster to create or
  * an instance that can decode the streaming URLs, which is slower to create
@@ -344,12 +388,12 @@ export async function getLocalVideoInfo(id) {
   }
 
   if (info.streaming_data) {
-    decipherFormats(info.streaming_data.formats, webInnertube.session.player)
+    await decipherFormats(info.streaming_data.formats, webInnertube.session.player)
 
     const firstFormat = info.streaming_data.adaptive_formats[0]
 
     if (firstFormat.url || firstFormat.signature_cipher || firstFormat.cipher) {
-      decipherFormats(info.streaming_data.adaptive_formats, webInnertube.session.player)
+      await decipherFormats(info.streaming_data.adaptive_formats, webInnertube.session.player)
     }
 
     if (info.streaming_data.dash_manifest_url) {
@@ -405,11 +449,11 @@ export async function getLocalComments(id) {
  * @param {Misc.Format[]} formats
  * @param {import('youtubei.js').Player} player
  */
-function decipherFormats(formats, player) {
+async function decipherFormats(formats, player) {
   for (const format of formats) {
     // toDash deciphers the format again, so if we overwrite the original URL,
     // it breaks because the n param would get deciphered twice and then be incorrect
-    format.freeTubeUrl = format.decipher(player)
+    format.freeTubeUrl = await format.decipher(player)
   }
 }
 
diff --git a/src/renderer/sigFrameScript.js b/src/renderer/sigFrameScript.js
new file mode 100644
index 0000000000000..3747d45b7c91c
--- /dev/null
+++ b/src/renderer/sigFrameScript.js
@@ -0,0 +1,11 @@
+// This is injected into the sigFrame iframe
+// See index.ejs and webpack.renderer.config.js
+window.addEventListener('message', (event) => {
+  const data = JSON.parse(event.data)
+
+  window.parent.postMessage(JSON.stringify({
+    id: data.id,
+    // eslint-disable-next-line no-new-func
+    result: new Function(data.code)()
+  }), '*')
+})
diff --git a/yarn.lock b/yarn.lock
index 38e2c3675bc4c..7dc4031b33a6f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2126,10 +2126,10 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.14.0, acorn@^8.5.0, acorn@^8.8.0, acorn@^8.8.2, acorn@^8.9.0:
-  version "8.14.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
-  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
+acorn@^8.15.0, acorn@^8.5.0, acorn@^8.8.2, acorn@^8.9.0:
+  version "8.15.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
+  integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
 
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
@@ -5903,12 +5903,10 @@ jest-worker@^29.7.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jintr@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/jintr/-/jintr-3.3.1.tgz#b88355af0c66603130b12d54721b8ab1d3be0b98"
-  integrity sha512-nnOzyhf0SLpbWuZ270Omwbj5LcXUkTcZkVnK8/veJXtSZOiATM5gMZMdmzN75FmTyj+NVgrGaPdH12zIJ24oIA==
-  dependencies:
-    acorn "^8.8.0"
+jiti@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.4.2.tgz#d19b7732ebb6116b06e2038da74a55366faef560"
+  integrity sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
@@ -6401,6 +6399,11 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
+meriyah@^6.1.4:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/meriyah/-/meriyah-6.1.4.tgz#2d49a8934fbcd9205c20564579c3560d9b1e077b"
+  integrity sha512-Sz8FzjzI0kN13GK/6MVEsVzMZEPvOhnmmI1lU5+/1cGOiK3QUahntrNNtdVeihrO7t9JpoH75iMNXg6R6uWflQ==
+
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -9056,11 +9059,6 @@ undici-types@~5.26.4:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-undici@^6.21.3:
-  version "6.21.3"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-6.21.3.tgz#185752ad92c3d0efe7a7d1f6854a50f83b552d7a"
-  integrity sha512-gBLkYIlEnSp8pFbT64yFgGE6UIB9tAkhukC23PmMDCe5Nd+cRqKxSjw5y54MK2AZMgZfJWMaNE4nYUHgi1XEOw==
-
 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"
@@ -9652,12 +9650,10 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.2.1.tgz#36d7c4739f775b3cbc28e6136e21aa057adec418"
   integrity sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg==
 
-youtubei.js@^15.1.1:
-  version "15.1.1"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-15.1.1.tgz#a5cfbfb24e7e3d4233ec9f245b2a8ade0ad28128"
-  integrity sha512-fuEDj9Ky6cAQg93BrRVCbr+GTYNZQAIFZrx/a3oDRuGc3Mf5bS0dQfoYwwgjtSV7sgAKQEEdGtzRdBzOc8g72Q==
+youtubei.js@^16.0.0:
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-16.0.0.tgz#b88537c4d89468216c50058cd295ce3c1da8adf2"
+  integrity sha512-aMx+ulnrxzsgVsxTr7gbBVnIjti2NQUlMwCoo1/MzICCJS3iMLOPUFdo7bSpwskL6ljzQ/LxmmB4WQC3FtkBlA==
   dependencies:
     "@bufbuild/protobuf" "^2.0.0"
-    jintr "^3.3.1"
-    tslib "^2.5.0"
-    undici "^6.21.3"
+    meriyah "^6.1.4"

From 41fecbb5779d880d6f9838fbf27fc998056105f6 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, 12 Oct 2025 21:20:43 +0200
Subject: [PATCH 092/105] fix yarn.lock

---
 yarn.lock | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7dc4031b33a6f..2872afb23d7d4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2126,7 +2126,7 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.15.0, acorn@^8.5.0, acorn@^8.8.2, acorn@^8.9.0:
+acorn@^8.14.0, acorn@^8.5.0, acorn@^8.8.2, acorn@^8.9.0:
   version "8.15.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
   integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
@@ -5903,11 +5903,6 @@ jest-worker@^29.7.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jiti@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-2.4.2.tgz#d19b7732ebb6116b06e2038da74a55366faef560"
-  integrity sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -8907,7 +8902,7 @@ ts-api-utils@^1.3.0:
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
   integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
-tslib@^2.0.0, tslib@^2.0.3, tslib@^2.3.1, tslib@^2.5.0, tslib@^2.6.2, tslib@^2.6.3, tslib@^2.8.1:
+tslib@^2.0.0, tslib@^2.0.3, tslib@^2.3.1, tslib@^2.6.2, tslib@^2.6.3, tslib@^2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==

From 7fa96f8b42ca3165ab9c9260a4aeec0ddce89a91 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, 12 Oct 2025 20:55:47 +0200
Subject: [PATCH 093/105] Bump package version from 0.23.9 to 0.23.10 (#8118)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2578742ec32cc..55046b77d45c1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.23.9",
+  "version": "0.23.10",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From 6e5baefef50d470a16721794e4d78943e5fff7e6 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 12 Oct 2025 21:54:37 +0200
Subject: [PATCH 094/105] Fix the build

---
 _scripts/sigFrameConfig.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/_scripts/sigFrameConfig.js b/_scripts/sigFrameConfig.js
index ec36378e20a36..a30b25b0c0661 100644
--- a/_scripts/sigFrameConfig.js
+++ b/_scripts/sigFrameConfig.js
@@ -5,9 +5,7 @@ const { readFileSync } = require('fs')
 const path = join(__dirname, '../src/renderer/sigFrameScript.js')
 const rawScript = readFileSync(path, 'utf8')
 
-const script = process.env.NODE_ENV === 'development'
-  ? rawScript
-  : require('terser').minify_sync({ [path]: rawScript }).code
+const script = rawScript
 
 module.exports.sigFrameTemplateParameters = {
   sigFrameSrc: `data:text/html,${encodeURIComponent(`<!doctype html><script>${script}</script>`)}`,

From 5047d8691e90985fc7d8b754c4b4d7ac54002500 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 12 Oct 2025 22:38:21 +0200
Subject: [PATCH 095/105] Switch to sha256

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

diff --git a/_scripts/sigFrameConfig.js b/_scripts/sigFrameConfig.js
index a30b25b0c0661..3b21ef1ce1882 100644
--- a/_scripts/sigFrameConfig.js
+++ b/_scripts/sigFrameConfig.js
@@ -9,5 +9,5 @@ const script = rawScript
 
 module.exports.sigFrameTemplateParameters = {
   sigFrameSrc: `data:text/html,${encodeURIComponent(`<!doctype html><script>${script}</script>`)}`,
-  sigFrameCspHash: `sha512-${hash('sha512', script, 'base64')}`
+  sigFrameCspHash: `sha256-${hash('sha256', script, 'base64')}`
 }

From 02c6049222b1032c39db9ec9403daeb02f9e60d2 Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Tue, 14 Oct 2025 01:44:12 +0200
Subject: [PATCH 096/105] fix script

Co-Authored-By: absidue <48293849+absidue@users.noreply.github.com>
Co-Authored-By: PikachuEXE <1018543+PikachuEXE@users.noreply.github.com>
---
 _scripts/sigFrameConfig.js     | 2 +-
 src/renderer/sigFrameScript.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/_scripts/sigFrameConfig.js b/_scripts/sigFrameConfig.js
index 3b21ef1ce1882..8f69c2e896fe5 100644
--- a/_scripts/sigFrameConfig.js
+++ b/_scripts/sigFrameConfig.js
@@ -5,7 +5,7 @@ const { readFileSync } = require('fs')
 const path = join(__dirname, '../src/renderer/sigFrameScript.js')
 const rawScript = readFileSync(path, 'utf8')
 
-const script = rawScript
+const script = rawScript.split(/\r?\n/).map(line => line.trim()).filter(line => !line.startsWith('//')).join('')
 
 module.exports.sigFrameTemplateParameters = {
   sigFrameSrc: `data:text/html,${encodeURIComponent(`<!doctype html><script>${script}</script>`)}`,
diff --git a/src/renderer/sigFrameScript.js b/src/renderer/sigFrameScript.js
index 3747d45b7c91c..a53e835dcf9a3 100644
--- a/src/renderer/sigFrameScript.js
+++ b/src/renderer/sigFrameScript.js
@@ -1,7 +1,8 @@
 // This is injected into the sigFrame iframe
 // See index.ejs and webpack.renderer.config.js
 window.addEventListener('message', (event) => {
-  const data = JSON.parse(event.data)
+  // eslint-disable-next-line @stylistic/semi
+  const data = JSON.parse(event.data);
 
   window.parent.postMessage(JSON.stringify({
     id: data.id,

From 1d6b26231f5b26682dbf62c523431d2cee4593c2 Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Tue, 14 Oct 2025 01:49:20 +0200
Subject: [PATCH 097/105] revert to sha512

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

diff --git a/_scripts/sigFrameConfig.js b/_scripts/sigFrameConfig.js
index 8f69c2e896fe5..c244fb2a1f9a6 100644
--- a/_scripts/sigFrameConfig.js
+++ b/_scripts/sigFrameConfig.js
@@ -9,5 +9,5 @@ const script = rawScript.split(/\r?\n/).map(line => line.trim()).filter(line =>
 
 module.exports.sigFrameTemplateParameters = {
   sigFrameSrc: `data:text/html,${encodeURIComponent(`<!doctype html><script>${script}</script>`)}`,
-  sigFrameCspHash: `sha256-${hash('sha256', script, 'base64')}`
+  sigFrameCspHash: `sha512-${hash('sha512', script, 'base64')}`
 }

From e3240f465bf806909fe64290c3aafbbc0e8a0155 Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Tue, 14 Oct 2025 07:46:39 +0200
Subject: [PATCH 098/105] Bump package version from 0.23.10 to 0.23.11 (#8126)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 55046b77d45c1..791580bfdecc4 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.23.10",
+  "version": "0.23.11",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From c3f1a0d654a168538eb406232759941051c55ad0 Mon Sep 17 00:00:00 2001
From: PikachuEXE <git@pikachuexe.net>
Date: Thu, 16 Oct 2025 06:01:43 +0800
Subject: [PATCH 099/105] Fix video playback by using video ID bound poToken
 (#8137)

* ! Fix video playback by using video ID bound poToken

* Clean up now unused session PO token code

---------

Co-authored-by: absidue <48293849+absidue@users.noreply.github.com>
---
 src/botGuardScript.js             |  10 +-
 src/constants.js                  |   2 +-
 src/main/index.js                 |   4 +-
 src/main/poTokenGenerator.js      |  14 +-
 src/preload/interface.js          | 301 ++++++++++++++++++++++++++++++
 src/renderer/helpers/api/local.js |  17 +-
 6 files changed, 320 insertions(+), 28 deletions(-)
 create mode 100644 src/preload/interface.js

diff --git a/src/botGuardScript.js b/src/botGuardScript.js
index aac39ec88749d..c648703ac87c6 100644
--- a/src/botGuardScript.js
+++ b/src/botGuardScript.js
@@ -6,10 +6,9 @@ import { BG, buildURL, GOOG_API_KEY } from 'bgutils-js'
 /**
  * Based on: https://github.com/LuanRT/BgUtils/blob/main/examples/node/innertube-challenge-fetcher-example.ts
  * @param {string} videoId
- * @param {string} visitorData
  * @param {import('youtubei.js').Session['context']} context
  */
-export default async function (videoId, visitorData, context) {
+export default async function (videoId, context) {
   const requestKey = 'O43z0dpjhgX20SCx4KAo'
 
   const challengeResponse = await fetch(
@@ -19,7 +18,7 @@ export default async function (videoId, visitorData, context) {
       headers: {
         Accept: '*/*',
         'Content-Type': 'application/json',
-        'X-Goog-Visitor-Id': visitorData,
+        'X-Goog-Visitor-Id': context.client.visitorData,
         'X-Youtube-Client-Version': context.client.clientVersion,
         'X-Youtube-Client-Name': '1'
       },
@@ -83,8 +82,5 @@ export default async function (videoId, visitorData, context) {
 
   const integrityTokenBasedMinter = await BG.WebPoMinter.create({ integrityToken: response[0] }, webPoSignalOutput)
 
-  const contentPoToken = await integrityTokenBasedMinter.mintAsWebsafeString(videoId)
-  const sessionPoToken = await integrityTokenBasedMinter.mintAsWebsafeString(visitorData)
-
-  return { contentPoToken, sessionPoToken }
+  return await integrityTokenBasedMinter.mintAsWebsafeString(videoId)
 }
diff --git a/src/constants.js b/src/constants.js
index 2271764192348..66a2f73751195 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -47,7 +47,7 @@ const IpcChannels = {
 
   SET_INVIDIOUS_AUTHORIZATION: 'set-invidious-authorization',
 
-  GENERATE_PO_TOKENS: 'generate-po-tokens',
+  GENERATE_PO_TOKEN: 'generate-po-token',
 
   WRITE_SCREENSHOT: 'write-screenshot',
 }
diff --git a/src/main/index.js b/src/main/index.js
index c7934becd7b53..04759f6e1f930 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -891,8 +891,8 @@ function runApp() {
     })
   })
 
-  ipcMain.handle(IpcChannels.GENERATE_PO_TOKENS, (_, videoId, visitorData, context) => {
-    return generatePoToken(videoId, visitorData, context, proxyUrl)
+  ipcMain.handle(IpcChannels.GENERATE_PO_TOKEN, (_, videoId, context) => {
+    return generatePoToken(videoId, context, proxyUrl)
   })
 
   ipcMain.on(IpcChannels.ENABLE_PROXY, (_, url) => {
diff --git a/src/main/poTokenGenerator.js b/src/main/poTokenGenerator.js
index 01211766aa27d..5a266b1abf47d 100644
--- a/src/main/poTokenGenerator.js
+++ b/src/main/poTokenGenerator.js
@@ -3,19 +3,18 @@ import { readFile } from 'fs/promises'
 import { join } from 'path'
 
 /**
- * Generates a poToken (proof of origin token) using `bgutils-js`.
+ * Generates a content-bound poToken (proof of origin token) using `bgutils-js`.
  * The script to generate it is `src/botGuardScript.js`
  *
  * This is intentionally split out into it's own thing, with it's own temporary in-memory session,
  * as the BotGuard stuff accesses the global `document` and `window` objects and also requires making some requests.
  * So we definitely don't want it running in the same places as the rest of the FreeTube code with the user data.
  * @param {string} videoId
- * @param {string} visitorData
  * @param {string} context
  * @param {string|undefined} proxyUrl
- * @returns {Promise<{ contentPoToken: string, sessionPoToken: string }>}
+ * @returns {Promise<string>}
  */
-export async function generatePoToken(videoId, visitorData, context, proxyUrl) {
+export async function generatePoToken(videoId, context, proxyUrl) {
   const sessionUuid = crypto.randomUUID()
 
   const theSession = session.fromPartition(`potoken-${sessionUuid}`, { cache: false })
@@ -96,7 +95,7 @@ export async function generatePoToken(videoId, visitorData, context, proxyUrl) {
     }
   })
 
-  const script = await getScript(videoId, visitorData, context)
+  const script = await getScript(videoId, context)
 
   const response = await webContentsView.webContents.executeJavaScript(script)
 
@@ -110,10 +109,9 @@ let cachedScript
 
 /**
  * @param {string} videoId
- * @param {string} visitorData
  * @param {string} context
  */
-async function getScript(videoId, visitorData, context) {
+async function getScript(videoId, context) {
   if (!cachedScript) {
     const pathToScript = process.env.NODE_ENV === 'development'
       ? join(__dirname, '../../dist/botGuardScript.js')
@@ -129,5 +127,5 @@ async function getScript(videoId, visitorData, context) {
     cachedScript = content.replace(match[0], `;${functionName}(FT_PARAMS)`)
   }
 
-  return cachedScript.replace('FT_PARAMS', `"${videoId}","${visitorData}",${context}`)
+  return cachedScript.replace('FT_PARAMS', `"${videoId}",${context}`)
 }
diff --git a/src/preload/interface.js b/src/preload/interface.js
new file mode 100644
index 0000000000000..d9a2b919b88f5
--- /dev/null
+++ b/src/preload/interface.js
@@ -0,0 +1,301 @@
+import { ipcRenderer, webFrame } from 'electron/renderer'
+import { IpcChannels } from '../constants.js'
+
+/**
+ * Linux fix for dynamically updating theme preference, this works on
+ * all systems running the electron app.
+ */
+ipcRenderer.on(IpcChannels.NATIVE_THEME_UPDATE, (_, shouldUseDarkColors) => {
+  webFrame.executeJavaScript(`document.body.dataset.systemTheme = "${shouldUseDarkColors ? 'dark' : 'light'}"`).catch()
+})
+
+let currentUpdateSearchInputTextListener
+
+export default {
+  /**
+   * @returns {Promise<string>}
+   */
+  getSystemLocale: () => {
+    return ipcRenderer.invoke(IpcChannels.GET_SYSTEM_LOCALE)
+  },
+
+  /**
+   * @param {string} path
+   * @param {Record<string, string> | null | undefined} query
+   * @param {string | null | undefined} searchQueryText
+   */
+  openInNewWindow: (path, query, searchQueryText) => {
+    ipcRenderer.send(IpcChannels.CREATE_NEW_WINDOW, path, query, searchQueryText)
+  },
+
+  /**
+   * @param {string} url
+   */
+  enableProxy: (url) => {
+    ipcRenderer.send(IpcChannels.ENABLE_PROXY, url)
+  },
+
+  disableProxy: () => {
+    ipcRenderer.send(IpcChannels.DISABLE_PROXY)
+  },
+
+  /**
+   * @param {string} authorization
+   * @param {string} url
+   */
+  setInvidiousAuthorization: (authorization, url) => {
+    ipcRenderer.send(IpcChannels.SET_INVIDIOUS_AUTHORIZATION, authorization, url)
+  },
+
+  clearInvidiousAuthorization: () => {
+    ipcRenderer.send(IpcChannels.SET_INVIDIOUS_AUTHORIZATION, null)
+  },
+
+  startPowerSaveBlocker: () => {
+    ipcRenderer.send(IpcChannels.START_POWER_SAVE_BLOCKER)
+  },
+
+  stopPowerSaveBlocker: () => {
+    ipcRenderer.send(IpcChannels.STOP_POWER_SAVE_BLOCKER)
+  },
+
+  /**
+   * @returns {Promise<boolean>}
+   */
+  getReplaceHttpCache: () => {
+    return ipcRenderer.invoke(IpcChannels.GET_REPLACE_HTTP_CACHE)
+  },
+
+  toggleReplaceHttpCache: () => {
+    ipcRenderer.send(IpcChannels.TOGGLE_REPLACE_HTTP_CACHE)
+  },
+
+  // Allows programmatic toggling of picture-in-picture mode without accompanying user interaction.
+  // See: https://developer.mozilla.org/en-US/docs/Web/Security/User_activation#transient_activation
+  requestPiP: () => {
+    webFrame.executeJavaScript('document.querySelector("video.player")?.ui.getControls().togglePiP()', true).catch()
+  },
+
+  // Allows programmatic toggling of fullscreen without accompanying user interaction.
+  // See: https://developer.mozilla.org/en-US/docs/Web/Security/User_activation#transient_activation
+  requestFullscreen: () => {
+    webFrame.executeJavaScript('document.querySelector("video.player")?.ui.getControls().toggleFullScreen()', true).catch()
+  },
+
+  /**
+   * @param {string} key
+   * @returns {Promise<ArrayBuffer>}
+   */
+  playerCacheGet: (key) => {
+    return ipcRenderer.invoke(IpcChannels.PLAYER_CACHE_GET, key)
+  },
+
+  /**
+   * @param {string} key
+   * @param {ArrayBuffer} value
+   */
+  playerCacheSet: async (key, value) => {
+    await ipcRenderer.invoke(IpcChannels.PLAYER_CACHE_SET, key, value)
+  },
+
+  /**
+   * @param {string} videoId
+   * @param {string} context
+   * @returns {Promise<string>}
+   */
+  generatePoToken: (videoId, context) => {
+    return ipcRenderer.invoke(IpcChannels.GENERATE_PO_TOKEN, videoId, context)
+  },
+
+  /**
+   * @param {0 | 1} kind
+   */
+  chooseDefaultFolder: (kind) => {
+    ipcRenderer.send(IpcChannels.CHOOSE_DEFAULT_FOLDER, kind)
+  },
+
+  /**
+   * @param {0 | 1} kind
+   * @param {string} filename
+   * @param {ArrayBuffer} contents
+   */
+  writeToDefaultFolder: async (kind, filename, contents) => {
+    await ipcRenderer.invoke(IpcChannels.WRITE_TO_DEFAULT_FOLDER, kind, filename, contents)
+  },
+
+  /**
+   * @returns {Promise<string>}
+   */
+  getScreenshotFallbackFolder: () => {
+    return ipcRenderer.invoke(IpcChannels.GET_SCREENSHOT_FALLBACK_FOLDER)
+  },
+
+  relaunch: () => {
+    ipcRenderer.send(IpcChannels.RELAUNCH_REQUEST)
+  },
+
+  /**
+   * @param {string} executable
+   * @param {string} args
+   */
+  openInExternalPlayer: (executable, args) => {
+    ipcRenderer.send(IpcChannels.OPEN_IN_EXTERNAL_PLAYER, executable, args)
+  },
+
+  /**
+   * @param {number} factor
+   */
+  setZoomFactor: (factor) => {
+    if (typeof factor === 'number' && factor > 0) {
+      webFrame.setZoomFactor(factor)
+    }
+  },
+
+  /**
+   * @returns {Promise<{ label: string, value: number, active: boolean }[]>}
+   */
+  getNavigationHistory: () => {
+    return ipcRenderer.invoke(IpcChannels.GET_NAVIGATION_HISTORY)
+  },
+
+  /**
+   * @param {number} action
+   * @param {any} [data]
+   */
+  dbSettings: (action, data) => {
+    return ipcRenderer.invoke(IpcChannels.DB_SETTINGS, data ? { action, data } : { action })
+  },
+
+  /**
+   * @param {number} action
+   * @param {any} [data]
+   */
+  dbHistory: (action, data) => {
+    return ipcRenderer.invoke(IpcChannels.DB_HISTORY, data ? { action, data } : { action })
+  },
+
+  /**
+   * @param {number} action
+   * @param {any} [data]
+   */
+  dbProfiles: (action, data) => {
+    return ipcRenderer.invoke(IpcChannels.DB_PROFILES, data ? { action, data } : { action })
+  },
+
+  /**
+   * @param {number} action
+   * @param {any} [data]
+   */
+  dbPlaylists: (action, data) => {
+    return ipcRenderer.invoke(IpcChannels.DB_PLAYLISTS, data ? { action, data } : { action })
+  },
+
+  /**
+   * @param {number} action
+   * @param {any} [data]
+   */
+  dbSearchHistory: (action, data) => {
+    return ipcRenderer.invoke(IpcChannels.DB_SEARCH_HISTORY, data ? { action, data } : { action })
+  },
+
+  /**
+   * @param {number} action
+   * @param {any} [data]
+   */
+  dbSubscriptionCache: (action, data) => {
+    return ipcRenderer.invoke(IpcChannels.DB_SUBSCRIPTION_CACHE, data ? { action, data } : { action })
+  },
+
+  /**
+   * @param {(route: string) => void} handler
+   */
+  handleChangeView: (handler) => {
+    ipcRenderer.on(IpcChannels.CHANGE_VIEW, (_, route) => {
+      handler(route)
+    })
+  },
+
+  /**
+   * @param {(url: string) => void} handler
+   */
+  handleOpenUrl: (handler) => {
+    ipcRenderer.on(IpcChannels.OPEN_URL, (_, url) => {
+      handler(url)
+    })
+    ipcRenderer.send(IpcChannels.APP_READY)
+  },
+
+  /**
+   * Pass `null` to clear the handler
+   * @param {(text: string) => void | null} handler
+   */
+  handleUpdateSearchInputText: (handler) => {
+    if (currentUpdateSearchInputTextListener) {
+      ipcRenderer.off(IpcChannels.UPDATE_SEARCH_INPUT_TEXT, currentUpdateSearchInputTextListener)
+      currentUpdateSearchInputTextListener = undefined
+    }
+
+    if (handler) {
+      currentUpdateSearchInputTextListener = (_, text) => {
+        handler(text)
+      }
+
+      ipcRenderer.on(IpcChannels.UPDATE_SEARCH_INPUT_TEXT, currentUpdateSearchInputTextListener)
+      ipcRenderer.send(IpcChannels.SEARCH_INPUT_HANDLING_READY)
+    }
+  },
+
+  /**
+   * @param {(event: number, data: any) => void} handler
+   */
+  handleSyncSettings: (handler) => {
+    ipcRenderer.on(IpcChannels.SYNC_SETTINGS, (_, { event, data }) => {
+      handler(event, data)
+    })
+  },
+
+  /**
+   * @param {(event: number, data: any) => void} handler
+   */
+  handleSyncHistory: (handler) => {
+    ipcRenderer.on(IpcChannels.SYNC_HISTORY, (_, { event, data }) => {
+      handler(event, data)
+    })
+  },
+
+  /**
+   * @param {(event: number, data: any) => void} handler
+   */
+  handleSyncSearchHistory: (handler) => {
+    ipcRenderer.on(IpcChannels.SYNC_SEARCH_HISTORY, (_, { event, data }) => {
+      handler(event, data)
+    })
+  },
+
+  /**
+   * @param {(event: number, data: any) => void} handler
+   */
+  handleSyncProfiles: (handler) => {
+    ipcRenderer.on(IpcChannels.SYNC_PROFILES, (_, { event, data }) => {
+      handler(event, data)
+    })
+  },
+
+  /**
+   * @param {(event: number, data: any) => void} handler
+   */
+  handleSyncPlaylists: (handler) => {
+    ipcRenderer.on(IpcChannels.SYNC_PLAYLISTS, (_, { event, data }) => {
+      handler(event, data)
+    })
+  },
+
+  /**
+   * @param {(event: number, data: any) => void} handler
+   */
+  handleSyncSubscriptionCache: (handler) => {
+    ipcRenderer.on(IpcChannels.SYNC_SUBSCRIPTION_CACHE, (_, { event, data }) => {
+      handler(event, data)
+    })
+  }
+}
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 9eaa67a4a0cad..65f3c453be128 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -285,23 +285,20 @@ export async function getLocalSearchContinuation(continuationData) {
 export async function getLocalVideoInfo(id) {
   const webInnertube = await createInnertube({ withPlayer: true, generateSessionLocally: false })
 
-  // based on the videoId (added to the body of the /player request and to caption URLs)
+  // based on the videoId
   let contentPoToken
-  // based on the visitor data (added to the streaming URLs)
-  let sessionPoToken
 
   if (process.env.IS_ELECTRON) {
     const { ipcRenderer } = require('electron')
 
     try {
-      ({ contentPoToken, sessionPoToken } = await ipcRenderer.invoke(
-        IpcChannels.GENERATE_PO_TOKENS,
+      contentPoToken = await ipcRenderer.invoke(
+        IpcChannels.GENERATE_PO_TOKEN,
         id,
-        webInnertube.session.context.client.visitorData,
         JSON.stringify(webInnertube.session.context)
-      ))
+      )
 
-      webInnertube.session.player.po_token = sessionPoToken
+      webInnertube.session.player.po_token = contentPoToken
     } catch (error) {
       console.error('Local API, poToken generation failed', error)
       throw error
@@ -400,9 +397,9 @@ export async function getLocalVideoInfo(id) {
       let url = info.streaming_data.dash_manifest_url
 
       if (url.includes('?')) {
-        url += `&pot=${encodeURIComponent(sessionPoToken)}&mpd_version=7`
+        url += `&pot=${encodeURIComponent(contentPoToken)}&mpd_version=7`
       } else {
-        url += `${url.endsWith('/') ? '' : '/'}pot/${encodeURIComponent(sessionPoToken)}/mpd_version/7`
+        url += `${url.endsWith('/') ? '' : '/'}pot/${encodeURIComponent(contentPoToken)}/mpd_version/7`
       }
 
       info.streaming_data.dash_manifest_url = url

From 0931180dde05c14ae7ace2dcf5a1433f6588a7a4 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Thu, 16 Oct 2025 00:22:01 +0200
Subject: [PATCH 100/105] Add error handling to the deciphering code (#8139)

---
 src/index.ejs                     |  5 ++---
 src/renderer/helpers/api/local.js | 32 +++++++++++++++++++------------
 src/renderer/sigFrameScript.js    | 17 +++++++++++-----
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/index.ejs b/src/index.ejs
index 7a3aa8aa92971..ecdc7f73fe4b9 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -13,7 +13,7 @@
 
   <body>
     <div id="app"></div>
-    <% if (process.env.SUPPORTS_LOCAL_API) { %>
+    <% if (process.env.IS_ELECTRON) { %>
     <iframe
       id="sigFrame"
       src="<%= sigFrameSrc %>"
@@ -24,8 +24,7 @@
       style="display: none; pointer-events: none"
       tabindex="-1"
     ></iframe>
-    <% } %>
-    <% if (!process.env.IS_ELECTRON) { %>
+    <% } else { %>
     <script>
     // This is the service worker with the Advanced caching
 
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 65f3c453be128..97eb484af83bc 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -22,7 +22,7 @@ const TRACKING_PARAM_NAMES = [
 
 if (process.env.SUPPORTS_LOCAL_API) {
   Platform.shim.eval = (data, env) => {
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
       const properties = []
 
       if (env.n) {
@@ -43,23 +43,31 @@ if (process.env.SUPPORTS_LOCAL_API) {
         ? crypto.randomUUID()
         : `${Date.now()}-${Math.floor(Math.random() * 10000)}`
 
-      const iframe = document.getElementById('sigFrame')
+      if (process.env.IS_ELECTRON) {
+        const iframe = document.getElementById('sigFrame')
 
-      /** @param {MessageEvent} event */
-      const listener = (event) => {
-        if (event.source === iframe.contentWindow && typeof event.data === 'string') {
-          const data = JSON.parse(event.data)
+        /** @param {MessageEvent} event */
+        const listener = (event) => {
+          if (event.source === iframe.contentWindow && typeof event.data === 'string') {
+            const data = JSON.parse(event.data)
 
-          if (data.id === messageId) {
-            window.removeEventListener('message', listener)
+            if (data.id === messageId) {
+              window.removeEventListener('message', listener)
 
-            resolve(data.result)
+              if (data.error) {
+                reject(data.error)
+              } else {
+                resolve(data.result)
+              }
+            }
           }
         }
-      }
 
-      window.addEventListener('message', listener)
-      iframe.contentWindow.postMessage(JSON.stringify({ id: messageId, code }), '*')
+        window.addEventListener('message', listener)
+        iframe.contentWindow.postMessage(JSON.stringify({ id: messageId, code }), '*')
+      } else {
+        reject(new Error('Please setup the eval function for the n/sig deciphering'))
+      }
     })
   }
 }
diff --git a/src/renderer/sigFrameScript.js b/src/renderer/sigFrameScript.js
index a53e835dcf9a3..4d65c4900792f 100644
--- a/src/renderer/sigFrameScript.js
+++ b/src/renderer/sigFrameScript.js
@@ -4,9 +4,16 @@ window.addEventListener('message', (event) => {
   // eslint-disable-next-line @stylistic/semi
   const data = JSON.parse(event.data);
 
-  window.parent.postMessage(JSON.stringify({
-    id: data.id,
-    // eslint-disable-next-line no-new-func
-    result: new Function(data.code)()
-  }), '*')
+  try {
+    window.parent.postMessage(JSON.stringify({
+      id: data.id,
+      // eslint-disable-next-line no-new-func
+      result: new Function(data.code)()
+    }), '*')
+  } catch (error) {
+    window.parent.postMessage(JSON.stringify({
+      id: data.id,
+      error
+    }), '*')
+  }
 })

From f34ae119022c1e76864eeaf36f4b682c561daa00 Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Thu, 16 Oct 2025 00:35:45 +0200
Subject: [PATCH 101/105] Delete interface.js

---
 src/preload/interface.js | 301 ---------------------------------------
 1 file changed, 301 deletions(-)
 delete mode 100644 src/preload/interface.js

diff --git a/src/preload/interface.js b/src/preload/interface.js
deleted file mode 100644
index d9a2b919b88f5..0000000000000
--- a/src/preload/interface.js
+++ /dev/null
@@ -1,301 +0,0 @@
-import { ipcRenderer, webFrame } from 'electron/renderer'
-import { IpcChannels } from '../constants.js'
-
-/**
- * Linux fix for dynamically updating theme preference, this works on
- * all systems running the electron app.
- */
-ipcRenderer.on(IpcChannels.NATIVE_THEME_UPDATE, (_, shouldUseDarkColors) => {
-  webFrame.executeJavaScript(`document.body.dataset.systemTheme = "${shouldUseDarkColors ? 'dark' : 'light'}"`).catch()
-})
-
-let currentUpdateSearchInputTextListener
-
-export default {
-  /**
-   * @returns {Promise<string>}
-   */
-  getSystemLocale: () => {
-    return ipcRenderer.invoke(IpcChannels.GET_SYSTEM_LOCALE)
-  },
-
-  /**
-   * @param {string} path
-   * @param {Record<string, string> | null | undefined} query
-   * @param {string | null | undefined} searchQueryText
-   */
-  openInNewWindow: (path, query, searchQueryText) => {
-    ipcRenderer.send(IpcChannels.CREATE_NEW_WINDOW, path, query, searchQueryText)
-  },
-
-  /**
-   * @param {string} url
-   */
-  enableProxy: (url) => {
-    ipcRenderer.send(IpcChannels.ENABLE_PROXY, url)
-  },
-
-  disableProxy: () => {
-    ipcRenderer.send(IpcChannels.DISABLE_PROXY)
-  },
-
-  /**
-   * @param {string} authorization
-   * @param {string} url
-   */
-  setInvidiousAuthorization: (authorization, url) => {
-    ipcRenderer.send(IpcChannels.SET_INVIDIOUS_AUTHORIZATION, authorization, url)
-  },
-
-  clearInvidiousAuthorization: () => {
-    ipcRenderer.send(IpcChannels.SET_INVIDIOUS_AUTHORIZATION, null)
-  },
-
-  startPowerSaveBlocker: () => {
-    ipcRenderer.send(IpcChannels.START_POWER_SAVE_BLOCKER)
-  },
-
-  stopPowerSaveBlocker: () => {
-    ipcRenderer.send(IpcChannels.STOP_POWER_SAVE_BLOCKER)
-  },
-
-  /**
-   * @returns {Promise<boolean>}
-   */
-  getReplaceHttpCache: () => {
-    return ipcRenderer.invoke(IpcChannels.GET_REPLACE_HTTP_CACHE)
-  },
-
-  toggleReplaceHttpCache: () => {
-    ipcRenderer.send(IpcChannels.TOGGLE_REPLACE_HTTP_CACHE)
-  },
-
-  // Allows programmatic toggling of picture-in-picture mode without accompanying user interaction.
-  // See: https://developer.mozilla.org/en-US/docs/Web/Security/User_activation#transient_activation
-  requestPiP: () => {
-    webFrame.executeJavaScript('document.querySelector("video.player")?.ui.getControls().togglePiP()', true).catch()
-  },
-
-  // Allows programmatic toggling of fullscreen without accompanying user interaction.
-  // See: https://developer.mozilla.org/en-US/docs/Web/Security/User_activation#transient_activation
-  requestFullscreen: () => {
-    webFrame.executeJavaScript('document.querySelector("video.player")?.ui.getControls().toggleFullScreen()', true).catch()
-  },
-
-  /**
-   * @param {string} key
-   * @returns {Promise<ArrayBuffer>}
-   */
-  playerCacheGet: (key) => {
-    return ipcRenderer.invoke(IpcChannels.PLAYER_CACHE_GET, key)
-  },
-
-  /**
-   * @param {string} key
-   * @param {ArrayBuffer} value
-   */
-  playerCacheSet: async (key, value) => {
-    await ipcRenderer.invoke(IpcChannels.PLAYER_CACHE_SET, key, value)
-  },
-
-  /**
-   * @param {string} videoId
-   * @param {string} context
-   * @returns {Promise<string>}
-   */
-  generatePoToken: (videoId, context) => {
-    return ipcRenderer.invoke(IpcChannels.GENERATE_PO_TOKEN, videoId, context)
-  },
-
-  /**
-   * @param {0 | 1} kind
-   */
-  chooseDefaultFolder: (kind) => {
-    ipcRenderer.send(IpcChannels.CHOOSE_DEFAULT_FOLDER, kind)
-  },
-
-  /**
-   * @param {0 | 1} kind
-   * @param {string} filename
-   * @param {ArrayBuffer} contents
-   */
-  writeToDefaultFolder: async (kind, filename, contents) => {
-    await ipcRenderer.invoke(IpcChannels.WRITE_TO_DEFAULT_FOLDER, kind, filename, contents)
-  },
-
-  /**
-   * @returns {Promise<string>}
-   */
-  getScreenshotFallbackFolder: () => {
-    return ipcRenderer.invoke(IpcChannels.GET_SCREENSHOT_FALLBACK_FOLDER)
-  },
-
-  relaunch: () => {
-    ipcRenderer.send(IpcChannels.RELAUNCH_REQUEST)
-  },
-
-  /**
-   * @param {string} executable
-   * @param {string} args
-   */
-  openInExternalPlayer: (executable, args) => {
-    ipcRenderer.send(IpcChannels.OPEN_IN_EXTERNAL_PLAYER, executable, args)
-  },
-
-  /**
-   * @param {number} factor
-   */
-  setZoomFactor: (factor) => {
-    if (typeof factor === 'number' && factor > 0) {
-      webFrame.setZoomFactor(factor)
-    }
-  },
-
-  /**
-   * @returns {Promise<{ label: string, value: number, active: boolean }[]>}
-   */
-  getNavigationHistory: () => {
-    return ipcRenderer.invoke(IpcChannels.GET_NAVIGATION_HISTORY)
-  },
-
-  /**
-   * @param {number} action
-   * @param {any} [data]
-   */
-  dbSettings: (action, data) => {
-    return ipcRenderer.invoke(IpcChannels.DB_SETTINGS, data ? { action, data } : { action })
-  },
-
-  /**
-   * @param {number} action
-   * @param {any} [data]
-   */
-  dbHistory: (action, data) => {
-    return ipcRenderer.invoke(IpcChannels.DB_HISTORY, data ? { action, data } : { action })
-  },
-
-  /**
-   * @param {number} action
-   * @param {any} [data]
-   */
-  dbProfiles: (action, data) => {
-    return ipcRenderer.invoke(IpcChannels.DB_PROFILES, data ? { action, data } : { action })
-  },
-
-  /**
-   * @param {number} action
-   * @param {any} [data]
-   */
-  dbPlaylists: (action, data) => {
-    return ipcRenderer.invoke(IpcChannels.DB_PLAYLISTS, data ? { action, data } : { action })
-  },
-
-  /**
-   * @param {number} action
-   * @param {any} [data]
-   */
-  dbSearchHistory: (action, data) => {
-    return ipcRenderer.invoke(IpcChannels.DB_SEARCH_HISTORY, data ? { action, data } : { action })
-  },
-
-  /**
-   * @param {number} action
-   * @param {any} [data]
-   */
-  dbSubscriptionCache: (action, data) => {
-    return ipcRenderer.invoke(IpcChannels.DB_SUBSCRIPTION_CACHE, data ? { action, data } : { action })
-  },
-
-  /**
-   * @param {(route: string) => void} handler
-   */
-  handleChangeView: (handler) => {
-    ipcRenderer.on(IpcChannels.CHANGE_VIEW, (_, route) => {
-      handler(route)
-    })
-  },
-
-  /**
-   * @param {(url: string) => void} handler
-   */
-  handleOpenUrl: (handler) => {
-    ipcRenderer.on(IpcChannels.OPEN_URL, (_, url) => {
-      handler(url)
-    })
-    ipcRenderer.send(IpcChannels.APP_READY)
-  },
-
-  /**
-   * Pass `null` to clear the handler
-   * @param {(text: string) => void | null} handler
-   */
-  handleUpdateSearchInputText: (handler) => {
-    if (currentUpdateSearchInputTextListener) {
-      ipcRenderer.off(IpcChannels.UPDATE_SEARCH_INPUT_TEXT, currentUpdateSearchInputTextListener)
-      currentUpdateSearchInputTextListener = undefined
-    }
-
-    if (handler) {
-      currentUpdateSearchInputTextListener = (_, text) => {
-        handler(text)
-      }
-
-      ipcRenderer.on(IpcChannels.UPDATE_SEARCH_INPUT_TEXT, currentUpdateSearchInputTextListener)
-      ipcRenderer.send(IpcChannels.SEARCH_INPUT_HANDLING_READY)
-    }
-  },
-
-  /**
-   * @param {(event: number, data: any) => void} handler
-   */
-  handleSyncSettings: (handler) => {
-    ipcRenderer.on(IpcChannels.SYNC_SETTINGS, (_, { event, data }) => {
-      handler(event, data)
-    })
-  },
-
-  /**
-   * @param {(event: number, data: any) => void} handler
-   */
-  handleSyncHistory: (handler) => {
-    ipcRenderer.on(IpcChannels.SYNC_HISTORY, (_, { event, data }) => {
-      handler(event, data)
-    })
-  },
-
-  /**
-   * @param {(event: number, data: any) => void} handler
-   */
-  handleSyncSearchHistory: (handler) => {
-    ipcRenderer.on(IpcChannels.SYNC_SEARCH_HISTORY, (_, { event, data }) => {
-      handler(event, data)
-    })
-  },
-
-  /**
-   * @param {(event: number, data: any) => void} handler
-   */
-  handleSyncProfiles: (handler) => {
-    ipcRenderer.on(IpcChannels.SYNC_PROFILES, (_, { event, data }) => {
-      handler(event, data)
-    })
-  },
-
-  /**
-   * @param {(event: number, data: any) => void} handler
-   */
-  handleSyncPlaylists: (handler) => {
-    ipcRenderer.on(IpcChannels.SYNC_PLAYLISTS, (_, { event, data }) => {
-      handler(event, data)
-    })
-  },
-
-  /**
-   * @param {(event: number, data: any) => void} handler
-   */
-  handleSyncSubscriptionCache: (handler) => {
-    ipcRenderer.on(IpcChannels.SYNC_SUBSCRIPTION_CACHE, (_, { event, data }) => {
-      handler(event, data)
-    })
-  }
-}

From 97f669bf39d306113982e91deb9b015c3cd0b0e2 Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Thu, 16 Oct 2025 00:35:47 +0200
Subject: [PATCH 102/105] Bump package version from 0.23.11 to 0.23.12 (#8138)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 791580bfdecc4..a1ebcd86398ad 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.23.11",
+  "version": "0.23.12",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From 9b003e3977443935dd3fab2dff484cc4d28e8cbf Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sat, 17 Jan 2026 13:18:37 +0100
Subject: [PATCH 103/105] Decipher live DASH manifest URL (#8530)

---
 src/renderer/helpers/api/local.js | 57 ++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 97eb484af83bc..b8a81313a6477 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -402,15 +402,11 @@ export async function getLocalVideoInfo(id) {
     }
 
     if (info.streaming_data.dash_manifest_url) {
-      let url = info.streaming_data.dash_manifest_url
-
-      if (url.includes('?')) {
-        url += `&pot=${encodeURIComponent(contentPoToken)}&mpd_version=7`
-      } else {
-        url += `${url.endsWith('/') ? '' : '/'}pot/${encodeURIComponent(contentPoToken)}/mpd_version/7`
-      }
-
-      info.streaming_data.dash_manifest_url = url
+      info.streaming_data.dash_manifest_url = await decipherDashManifestUrl(
+        info.streaming_data.dash_manifest_url,
+        webInnertube.session.player,
+        contentPoToken
+      )
     }
   }
 
@@ -462,6 +458,49 @@ async function decipherFormats(formats, player) {
   }
 }
 
+/**
+ * @param {string} url
+ * @param {import('youtubei.js').Player} player
+ * @param {string} poToken
+ */
+async function decipherDashManifestUrl(url, player, poToken) {
+  const urlObject = new URL(url)
+
+  if (urlObject.searchParams.size > 0) {
+    urlObject.searchParams.set('pot', poToken)
+    urlObject.searchParams.set('mpd_version', '7')
+
+    return await player.decipher(urlObject.toString())
+  }
+
+  // Convert path params to query params
+  const pathParts = urlObject.pathname
+    .replace('/api/manifest/dash', '')
+    .split('/')
+    .filter(part => part.length > 0)
+
+  urlObject.pathname = '/api/manifest/dash'
+
+  for (let i = 0; i + 1 < pathParts.length; i += 2) {
+    urlObject.searchParams.set(pathParts[i], decodeURIComponent(pathParts[i + 1]))
+  }
+
+  // decipher
+  const deciphered = await player.decipher(urlObject.toString())
+
+  // convert query parameters back to path parameters
+  const decipheredUrlObject = new URL(deciphered)
+
+  for (const [key, value] of decipheredUrlObject.searchParams) {
+    decipheredUrlObject.pathname += `/${key}/${encodeURIComponent(value)}`
+  }
+
+  decipheredUrlObject.search = ''
+  decipheredUrlObject.pathname += `/pot/${encodeURIComponent(poToken)}/mpd_version/7`
+
+  return decipheredUrlObject.toString()
+}
+
 export async function getLocalChannelId(url) {
   try {
     const innertube = await createInnertube()

From 5cd203abab9dd2a073696e5dac9ef948d113b155 Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Sat, 17 Jan 2026 18:47:59 +0100
Subject: [PATCH 104/105] Bump package version from 0.23.12 to 0.23.13 (#8531)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a1ebcd86398ad..5473fc8244332 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.23.12",
+  "version": "0.23.13",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,

From e1bb3d6944ddc864595abaaddc72d0e51c29a97d Mon Sep 17 00:00:00 2001
From: efb4f5ff-1298-471a-8973-3d47447115dc
 <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>
Date: Thu, 5 Mar 2026 14:03:16 +0100
Subject: [PATCH 105/105] force player to use 9f4cc5e4 (#8736)

Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>
---
 src/renderer/helpers/api/local.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index b8a81313a6477..c8ee7721f4607 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -106,6 +106,7 @@ async function createInnertube({ withPlayer = false, location = undefined, safet
     user_agent: navigator.userAgent,
 
     retrieve_player: !!withPlayer,
+    player_id: '9f4cc5e4',
     location: location,
     enable_safety_mode: !!safetyMode,
     client_type: clientType,