Merge remote-tracking branch 'upstream/master' into release

Author: MarmadileManteater

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,
@@ -70,14 +70,14 @@
     "core-js": "^3.41.0",
     "portal-vue": "^2.1.7",
     "process": "^0.11.10",
-    "shaka-player": "^4.14.25",
-    "swiper": "^11.2.10",
+    "shaka-player": "^4.13.4",
+    "swiper": "^11.2.1",
     "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": "^15.0.1"
+    "youtubei.js": "^15.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.28.0",
@@ -88,14 +88,14 @@
     "babel-loader": "^10.0.0",
     "copy-webpack-plugin": "^13.0.0",
     "css-loader": "^7.1.2",
-    "css-minimizer-webpack-plugin": "^7.0.2",
-    "electron": "^37.2.5",
-    "electron-builder": "^26.0.19",
-    "eslint": "^9.32.0",
-    "eslint-plugin-jsdoc": "^52.0.2",
-    "eslint-plugin-jsonc": "^2.20.1",
-    "eslint-plugin-unicorn": "^60.0.0",
-    "eslint-plugin-vue": "^10.4.0",
+    "css-minimizer-webpack-plugin": "^7.0.0",
+    "electron": "^34.0.1",
+    "electron-builder": "^26.0.13",
+    "eslint": "^9.19.0",
+    "eslint-plugin-jsdoc": "^50.6.3",
+    "eslint-plugin-jsonc": "^2.19.1",
+    "eslint-plugin-unicorn": "^56.0.1",
+    "eslint-plugin-vue": "^9.32.0",
     "eslint-plugin-vuejs-accessibility": "^2.4.1",
     "eslint-plugin-yml": "^1.18.0",
     "globals": "^16.3.0",

src/renderer/helpers/api/local.js

@@ -239,7 +239,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) {
@@ -249,6 +260,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
 
@@ -353,6 +366,22 @@ 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)
+
+      // 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()
+    }
+  }
+
   return info
 }
 

src/renderer/views/Playlist/Playlist.vue

@@ -32,6 +32,7 @@
         :info-source="infoSource"
         :more-video-data-available="moreVideoDataAvailable"
         :search-video-mode-allowed="isUserPlaylistRequested && shownVideoCount > 1"
+        :search-video-mode-enabled="playlistInVideoSearchMode"
         :search-query-text="searchQueryTextRequested"
         :theme="listType === 'list' ? 'base' : 'top-bar'"
         class="playlistInfo"