Merge branch 'development' into custom-builds/dragdrop

* development: (21 commits)
  Bump webpack-cli from 6.0.1 to 7.0.1 in the webpack group (FreeTubeApp#8816)
  Bump @double-great/stylelint-a11y in the stylelint group (FreeTubeApp#8815)
  Bump youtubei.js from 16.0.1 to 17.0.1 (FreeTubeApp#8818)
  Translated using Weblate (Portuguese)
  Bump electron from 40.8.0 to 41.0.2 (FreeTubeApp#8801)
  Translated using Weblate (German)
  Translated using Weblate (Lithuanian)
  Bump lefthook from 2.1.3 to 2.1.4 (FreeTubeApp#8799)
  Bump babel-loader from 10.1.0 to 10.1.1 in the babel group (FreeTubeApp#8794)
  Bump the webpack group with 2 updates (FreeTubeApp#8797)
  Bump the fortawesome group with 5 updates (FreeTubeApp#8796)
  Bump the eslint group with 3 updates (FreeTubeApp#8795)
  Bump vue from 3.5.29 to 3.5.30 (FreeTubeApp#8800)
  Translated using Weblate (Japanese)
  Serialize the error as a string to pass it back to the main view (FreeTubeApp#8789)
  Bump tar from 7.5.10 to 7.5.11 (FreeTubeApp#8788)
  Workaround for electron/electron#49253 (FreeTubeApp#8714)
  Translated using Weblate (Icelandic)
  Translated using Weblate (Japanese)
  Trim video titles with the local API to avoid breaking the databases (FreeTubeApp#8354)
  ...

Author: PikachuEXE

package.json

@@ -41,20 +41,20 @@
     "lint-style-fix": "stylelint --fix \"src/**/*.{css,scss}\"",
     "lint-yml": "eslint --config eslint.config.mjs \"**/*.yml\" \"**/*.yaml\"",
     "pack": "run-p pack:main pack:renderer pack:preload pack:botGuardScript && node _scripts/injectAllowedPaths.mjs",
-    "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:preload": "webpack --mode=production --node-env=production --config _scripts/webpack.preload.config.js",
-    "pack:web": "webpack --mode=production --node-env=production --config _scripts/webpack.web.config.js",
+    "pack:main": "webpack --mode=production --config-node-env=production --config _scripts/webpack.main.config.js",
+    "pack:renderer": "webpack --mode=production --config-node-env=production --config _scripts/webpack.renderer.config.js",
+    "pack:preload": "webpack --mode=production --config-node-env=production --config _scripts/webpack.preload.config.js",
+    "pack:web": "webpack --mode=production --config-node-env=production --config _scripts/webpack.web.config.js",
     "pack:botGuardScript": "webpack --config _scripts/webpack.botGuardScript.config.js",
     "checkforbadtemplates": "node _scripts/findMissingTemplates.mjs",
     "ci": "yarn install --silent --frozen-lockfile --network-concurrency 1"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^7.1.0",
-    "@fortawesome/free-brands-svg-icons": "^7.1.0",
-    "@fortawesome/free-regular-svg-icons": "^7.1.0",
-    "@fortawesome/free-solid-svg-icons": "^7.1.0",
-    "@fortawesome/vue-fontawesome": "^3.1.2",
+    "@fortawesome/fontawesome-svg-core": "^7.2.0",
+    "@fortawesome/free-brands-svg-icons": "^7.2.0",
+    "@fortawesome/free-regular-svg-icons": "^7.2.0",
+    "@fortawesome/free-solid-svg-icons": "^7.2.0",
+    "@fortawesome/vue-fontawesome": "^3.1.3",
     "@seald-io/nedb": "^4.1.2",
     "autolinker": "^4.1.5",
     "bgutils-js": "^3.2.0",
@@ -64,30 +64,30 @@
     "process": "^0.11.10",
     "shaka-player": "^5.0.4",
     "swiper": "^12.1.2",
-    "vue": "^3.5.29",
+    "vue": "^3.5.30",
     "vue-i18n": "^11.3.0",
     "vue-observe-visibility": "^2.0.0-alpha.1",
     "vue-router": "^5.0.3",
     "vuex": "^4.1.0",
-    "youtubei.js": "^16.0.1"
+    "youtubei.js": "^17.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.29.0",
     "@babel/preset-env": "^7.29.0",
-    "@double-great/stylelint-a11y": "^3.4.5",
+    "@double-great/stylelint-a11y": "^3.4.6",
     "@eslint/js": "^10.0.1",
     "@intlify/eslint-plugin-vue-i18n": "^4.3.0",
     "@stylistic/eslint-plugin": "^5.10.0",
-    "babel-loader": "^10.1.0",
+    "babel-loader": "^10.1.1",
     "copy-webpack-plugin": "^14.0.0",
     "css-loader": "^7.1.4",
     "css-minimizer-webpack-plugin": "^8.0.0",
-    "electron": "^40.8.0",
+    "electron": "^41.0.2",
     "electron-builder": "^26.8.1",
     "eslint": "^10.0.3",
-    "eslint-plugin-import-x": "^4.16.1",
-    "eslint-plugin-jsdoc": "^62.7.1",
-    "eslint-plugin-jsonc": "^3.1.1",
+    "eslint-plugin-import-x": "^4.16.2",
+    "eslint-plugin-jsdoc": "^62.8.0",
+    "eslint-plugin-jsonc": "^3.1.2",
     "eslint-plugin-n": "^17.24.0",
     "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-unicorn": "^63.0.0",
@@ -98,12 +98,12 @@
     "html-webpack-plugin": "^5.6.6",
     "js-yaml": "^4.1.1",
     "json-minimizer-webpack-plugin": "^5.0.1",
-    "lefthook": "^2.1.3",
-    "mini-css-extract-plugin": "^2.10.0",
+    "lefthook": "^2.1.4",
+    "mini-css-extract-plugin": "^2.10.1",
     "npm-run-all2": "^8.0.4",
     "postcss": "^8.5.8",
     "postcss-scss": "^4.0.9",
-    "sass": "^1.97.3",
+    "sass": "^1.98.0",
     "sass-loader": "^16.0.7",
     "stylelint": "^17.4.0",
     "stylelint-config-sass-guidelines": "^13.0.0",
@@ -114,7 +114,7 @@
     "vue-eslint-parser": "^10.2.0",
     "vue-loader": "^17.4.2",
     "webpack": "^5.105.4",
-    "webpack-cli": "^6.0.1",
+    "webpack-cli": "^7.0.1",
     "webpack-dev-server": "^5.2.3"
   }
 }

src/main/index.js

@@ -1055,7 +1055,16 @@ function runApp() {
 
       newWindow.on('minimize', () => {
         if (trayOnMinimize) {
-          newWindow.hide()
+          // Workaround for https://github.com/electron/electron/issues/49253
+          if (process.platform === 'linux') {
+            setTimeout(() => {
+              newWindow.restore()
+              newWindow.hide()
+            }, 100)
+          } else {
+            newWindow.hide()
+          }
+
           manageTray(newWindow)
 
           if (newWindow === mainWindow) {

src/renderer/helpers/api/local.js

@@ -22,22 +22,9 @@ const TRACKING_PARAM_NAMES = [
 ]
 
 if (process.env.SUPPORTS_LOCAL_API) {
-  Platform.shim.eval = (data, env) => {
+  Platform.shim.eval = (data) => {
     return new Promise((resolve, reject) => {
-      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(', ')}}`
+      const code = data.output
 
       // 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
@@ -108,7 +95,6 @@ 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,
@@ -1110,7 +1096,7 @@ export function parseShort(short, channelId, channelName) {
     return {
       type: 'video',
       videoId: reelItem.id,
-      title: reelItem.title.text,
+      title: reelItem.title.text?.trim(),
       author: channelName,
       authorId: channelId,
       viewCount: reelItem.views.isEmpty() ? null : parseLocalSubscriberCount(reelItem.views.text),
@@ -1123,7 +1109,7 @@ export function parseShort(short, channelId, channelName) {
     return {
       type: 'video',
       videoId: shortsLockupView.on_tap_endpoint.payload.videoId,
-      title: shortsLockupView.overlay_metadata.primary_text.text,
+      title: shortsLockupView.overlay_metadata.primary_text.text?.trim(),
       author: channelName,
       authorId: channelId,
       viewCount: shortsLockupView.overlay_metadata.secondary_text ? parseLocalSubscriberCount(shortsLockupView.overlay_metadata.secondary_text.text) : null,
@@ -1318,7 +1304,7 @@ export function parseLocalPlaylistVideo(video) {
     return {
       type: 'video',
       videoId: short.id,
-      title: short.title.text,
+      title: short.title.text?.trim(),
       viewCount: parseLocalSubscriberCount(short.views.text),
       lengthSeconds: ''
     }
@@ -1354,7 +1340,7 @@ export function parseLocalPlaylistVideo(video) {
     return {
       type: 'video',
       videoId: shortsLockupView.on_tap_endpoint.payload.videoId,
-      title: shortsLockupView.overlay_metadata.primary_text.text,
+      title: shortsLockupView.overlay_metadata.primary_text.text?.trim(),
       viewCount,
       lengthSeconds: ''
     }
@@ -1400,7 +1386,7 @@ export function parseLocalPlaylistVideo(video) {
     return {
       type: 'video',
       videoId: video_.id,
-      title: video_.title.text,
+      title: video_.title.text?.trim(),
       author: video_.author.name,
       authorId: (video_.author?.id != null && video_.author.id !== 'N/A') ? video_.author.id : null,
       viewCount,
@@ -1426,7 +1412,7 @@ export function parseLocalListVideo(item, channelId, channelName) {
     return {
       type: 'video',
       videoId: movie.id,
-      title: movie.title.text,
+      title: movie.title.text?.trim(),
       author: movie.author.name !== 'N/A' ? movie.author.name : channelName,
       authorId: movie.author.id !== 'N/A' ? movie.author.id : channelId,
       description: movie.description_snippet?.text,
@@ -1456,7 +1442,7 @@ export function parseLocalListVideo(item, channelId, channelName) {
     return {
       type: 'video',
       videoId: video.video_id,
-      title: video.title.text,
+      title: video.title.text?.trim(),
       author: video.author?.name ?? channelName,
       authorId: (video.author?.id != null && video.author.id !== 'N/A') ? video.author.id : channelId,
       viewCount: video.views.text == null ? null : extractNumberFromString(video.views.text),
@@ -1507,7 +1493,7 @@ export function parseLocalListVideo(item, channelId, channelName) {
     return {
       type: 'video',
       videoId: video.video_id,
-      title: video.title.text,
+      title: video.title.text?.trim(),
       author: video.author.name !== 'N/A' ? video.author.name : channelName,
       authorId: video.author.id !== 'N/A' ? video.author.id : channelId,
       description: video.description,
@@ -1616,7 +1602,7 @@ function parseLockupView(lockupView, channelId = undefined, channelName = undefi
       return {
         type: 'video',
         videoId: lockupView.content_id,
-        title: lockupView.metadata.title.text,
+        title: lockupView.metadata.title.text?.trim(),
         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,
@@ -1756,7 +1742,7 @@ export function parseLocalWatchNextVideo(video) {
     return {
       type: 'video',
       videoId: video.id,
-      title: video.title.text,
+      title: video.title.text?.trim(),
       author: video.author.name,
       authorId: video.author.id,
       lengthSeconds: video.duration.seconds
@@ -1775,7 +1761,7 @@ export function parseLocalWatchNextVideo(video) {
     return {
       type: 'video',
       videoId: video.video_id,
-      title: video.title.text,
+      title: video.title.text?.trim(),
       author: video.author.name,
       authorId: video.author.id,
       viewCount: video.view_count == null ? null : extractNumberFromString(video.view_count.text),

src/renderer/sigFrameScript.js

@@ -12,7 +12,7 @@ window.addEventListener('message', (event) => {
   } catch (error) {
     window.parent.postMessage(JSON.stringify({
       id: data.id,
-      error
+      error: error.toString()
     }), '*')
   }
 })

src/renderer/views/Watch/Watch.js

@@ -457,7 +457,7 @@ export default defineComponent({
         }
 
         // extract localised title first and fall back to the not localised one
-        this.videoTitle = result.primary_info?.title.text ?? result.basic_info.title
+        this.videoTitle = result.primary_info?.title.text?.trim() ?? result.basic_info.title?.trim()
         this.videoViewCount = result.basic_info.view_count ?? (result.primary_info.view_count ? extractNumberFromString(result.primary_info.view_count.text) : null)
         this.license = result.secondary_info.metadata.rows.find(element => element.title?.text === 'License')?.contents[0]?.text
 

static/locales/de-DE.yaml

@@ -986,7 +986,7 @@ Tooltips:
     UseDeArrowThumbnails: Video-Miniaturansichten durch Miniaturansichten von DeArrow ersetzen.
 Playing Next Video Interval: Nächstes Video wird sofort abgespielt. Zum Abbrechen klicken. | Nächstes Video wird in {nextVideoInterval} Sekunden abgespielt. Zum Abbrechen klicken. | Nächstes Video wird in {nextVideoInterval} Sekunden abgespielt. Zum Abbrechen klicken.
 More: Mehr
-Unknown YouTube url type, cannot be opened in app: Unbekannter YouTube-URL-Typ. Kann in der App nicht geöffnet werden
+Unknown YouTube url type, cannot be opened in app: Unbekannter YouTube-URL-Typ, kann in der App nicht geöffnet werden
 Open New Window: Neues Fenster öffnen
 Default Invidious instance has been cleared: Standardmäßige Invidious-Instanz wurde gelöscht
 Default Invidious instance has been set to {instance}: Standardmäßige Invidious-Instanz wurde auf {instance} festgelegt

static/locales/is.yaml

@@ -186,7 +186,7 @@ User Playlists:
   Delete Playlist: Eyða spilunarlista
   Are you sure you want to delete this playlist? This cannot be undone: Ertu viss um að þú viljir eyða þessum spilunarlista? Aðgerðin er ekki afturkallanleg.
   Add to Favorites: Bæta í {playlistName}
-  Remove from Favorites: Fjarlægja af {playlistName}
+  Remove from Favorites: Fjarlægja úr {playlistName}
   Enable Quick Bookmark With This Playlist: Virkja flýtibókamerki með þessum spilunarlista
   Playlists with Matching Videos: Spilunarlistar með samsvarandi myndskeiðum
   Quick Bookmark Enabled: Flýtibókamerki virkjuð

static/locales/ja.yaml

@@ -518,32 +518,32 @@ Settings:
     Hide Channels: チャンネルから動画を非表示にする
     Hide Channels Placeholder: チャンネル ID
     Display Titles Without Excessive Capitalisation: 過剰な大文字や句読点のないタイトルの表示
-    Hide Channel Playlists: チャンネルの「再生リスト」タブを隠す
+    Hide Channel Playlists: チャンネルの「再生リスト」タブを非表示
     Sections:
       Side Bar: サイドバー
       Channel Page: チャンネル ページ
       Watch Page: 視聴ページ
       General: 一般
       Subscriptions Page: 登録チャンネル ページ
     Hide Featured Channels: おすすめチャンネルの非表示
-    Hide Channel Shorts: チャンネルの「ショート動画」タブを隠す
-    Hide Channel Podcasts: チャンネルの「ポッドキャスト」タブを隠す
+    Hide Channel Shorts: チャンネルの「ショート動画」タブを非表示
+    Hide Channel Podcasts: チャンネルの「ポッドキャスト」タブを非表示
     Hide Subscriptions Shorts: 登録チャンネルのショート動画の非表示
     Hide Subscriptions Live: 登録チャンネルのライブ配信の非表示
     Hide Subscriptions Videos: 登録チャンネルの動画の非表示
-    Hide Channel Releases: チャンネルの「新着情報」タブを隠す
-    Hide Profile Pictures in Comments: コメント欄のプロフィール写真を隠す
+    Hide Channel Releases: チャンネルの「新着情報」タブを非表示
+    Hide Profile Pictures in Comments: コメント欄のプロフィール写真を非表示
     Hide Channels Invalid: 提供されたチャンネル ID が無効です
     Hide Channels Disabled Message: 一部のチャンネルが ID を使用してブロックされ、処理されませんでした。これらの ID が更新されている間、機能はブロックされます
     Hide Channels Already Exists: チャンネル ID は既に存在します
     Hide Channels API Error: 指定されたIDのユーザーを検索する際にエラーが発生しました。IDが正しいかもう一度確認してください。
     Hide Videos, Playlists and Channels Containing Text Placeholder: 単語、単語の一部、またはフレーズ
     Hide Videos, Playlists and Channels Containing Text: 特定のテキストを含む動画と再生リストを非表示にする
-    Hide Channel Home: チャンネルの「ホーム」タブを隠す
+    Hide Channel Home: チャンネルの「ホーム」タブを非表示
     Show Added Items: 追加された項目を表示
-    Hide Channel Courses: チャンネルの「コース」タブを隠す
-    Hide Channel Posts: チャンネルの「投稿」タブを隠す
-    Hide Subscriptions Posts: 登録チャンネルの投稿を隠す
+    Hide Channel Courses: チャンネルの「コース」タブを非表示
+    Hide Channel Posts: チャンネルの「投稿」タブを非表示
+    Hide Subscriptions Posts: 登録チャンネルの投稿を非表示
   The app needs to restart for changes to take effect. Restart and apply change?: 変更の反映には、アプリの再起動が必要です。再起動して変更を適用しますか？
   Proxy Settings:
     Error getting network information. Is your proxy configured properly?: ネットワーク情報の取得中にエラーが発生しました。プロキシーを正しく設定してますか?
@@ -600,8 +600,8 @@ Settings:
   Password Settings:
     Password Settings: パスワード
     Set Password To Prevent Access: 設定にアクセスするためのパスワードの設定
-    Set Password: パスワードの設定
-    Remove Password: パスワードの削除
+    Set Password: パスワードを設定
+    Remove Password: パスワードを削除
   Password Dialog:
     Enter Password To Unlock: パスワードを入力して設定を解除
     Password: パスワード
@@ -613,15 +613,15 @@ About:
   #& About
 #On Channel Page
   Donate: 寄付
-  these people and projects: これらの人々とプロジェクトのおかげです
+  these people and projects: これらの人々とプロジェクト
   Credits: クレジット
   Translate: 翻訳
   room rules: ルームの規則
   Chat on Matrix: Matrix でチャット
   Mastodon: マストドン
   Email: メールアドレス
   Blog: ブログ
-  Website: WEB サイト
+  Website: ウェブサイト
   Please check for duplicates before posting: 投稿する前に重複を確認してください
   GitHub issues: GitHub の課題
   Report a problem: 問題の報告
@@ -634,6 +634,9 @@ About:
   Beta: ベータ
   Discussions: 議論
   AGPLv3: AGPLv3
+  Licensed under the {licenseLink}: '{licenseLink} に基づいてライセンス供与されています'
+  Please read the {roomRulesLink}: '{roomRulesLink} をお読みください'
+  FreeTube is made possible by {creditsPageLink}: FreeTube は {creditsPageLink} によって支えられています
 Channel:
   Subscribe: 'チャンネル登録'
   Unsubscribe: '登録解除'
@@ -791,7 +794,7 @@ Video:
     Exit Theatre Mode: シアターモードを終了
     Exit Full Window: フルウィンドウを終了
     Full Window: フルウィンドウ
-    Hide Stats: 統計を隠す
+    Hide Stats: 統計を非表示
     Take Screenshot: スクリーンショットを撮る
     Show Stats: 統計を表示
     Autoplay is off: 自動再生 オフ