Merge branch 'development' into fix/auto-trailing-slash-removal

* development:
  Fix: Hide 'Minimize to system tray' setting on Wayland (FreeTubeApp#9208)
  Translated using Weblate (Hungarian)
  Fix: import history from youtube adding trailing space to title (FreeTubeApp#9204)
  Fix keyboard shortcuts arent't working during "SABR backoff" (FreeTubeApp#9315)
  Fix incomplete watch progresss bar if video length has milliseconds (FreeTubeApp#9267)
  Translated using Weblate (Hungarian)
  Fix default quality not working when video aspect ratio is not 16/9 or 9/16 (FreeTubeApp#9312)
  Remove error when 'publishedText' is missing as it is a valid state (FreeTubeApp#9321)
  Fix LibRedirect download link in README (FreeTubeApp#9323)
  Bump actions/cache/restore from 5.0.5 to 6.0.0 (FreeTubeApp#9329)
  Bump actions/cache/save from 5.0.5 to 6.0.0 (FreeTubeApp#9330)
  Translated using Weblate (French)
  Fix premierDate parsing in subscription (FreeTubeApp#9309)

# Conflicts:
#	src/renderer/components/GeneralSettings/GeneralSettings.vue

Author: PikachuEXE

.github/workflows/build.yml

@@ -103,7 +103,7 @@ jobs:
 
     - name: Restore pnpm cache
       id: restore_cache
-      uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae #v5.0.5
+      uses: actions/cache/restore@2c8a9bd7457de244a408f35966fab2fb45fda9c8 #v6.0.0
       with:
         key: ${{ format('node-cache-{0}-{1}-pnpm-{2}', runner.os, runner.arch, hashFiles('pnpm-lock.yaml')) }}
         path: ${{ steps.cache_dir.outputs.cache_dir }}
@@ -376,7 +376,7 @@ jobs:
         path: build/freetube-${{ steps.versionNumber.outputs.version }}-arm64-mac.7z
 
     - name: Save pnpm cache
-      uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae #v5.0.5
+      uses: actions/cache/save@2c8a9bd7457de244a408f35966fab2fb45fda9c8 #v6.0.0
       # Only save the cache if we weren't able to restore an existing one above
       if: steps.restore_cache.outputs.cache-primary-key != steps.restore_cache.outputs.cache-matched-key
       with:

.github/workflows/linter.yml

@@ -46,7 +46,7 @@ jobs:
 
     - name: Restore pnpm cache
       id: restore_cache
-      uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae #v5.0.5
+      uses: actions/cache/restore@2c8a9bd7457de244a408f35966fab2fb45fda9c8 #v6.0.0
       with:
         key: ${{ format('node-cache-{0}-{1}-pnpm-{2}', runner.os, runner.arch, hashFiles('pnpm-lock.yaml')) }}
         path: ${{ steps.cache_dir.outputs.cache_dir }}

README.md

@@ -74,7 +74,7 @@ longer track you using cookies or JavaScript. Your subscriptions, playlists and
 ### Browser Extensions
 The following extensions open YouTube links directly in FreeTube:
 
-- [LibRedirect](https://libredirect.github.io/)
+- [LibRedirect](https://libredirect.manerakai.com/)
 - [RedirectTube](https://github.com/MStankiewiczOfficial/RedirectTube)
 
 LibRedirect automatically redirect YouTube links to FreeTube.
@@ -83,7 +83,7 @@ LibRedirect automatically redirect YouTube links to FreeTube.
 
 RedirectTube, doesn’t automatically open YouTube links in FreeTube (although this feature can be enabled in the settings). Instead, it adds buttons to the toolbar and context menu, which you can click to open videos in FreeTube manually.
 
-- Download LibRedirect from [Mozilla Add-ons](https://addons.mozilla.org/firefox/addon/libredirect/) (for Firefox based-browsers) or [developer's website](https://libredirect.github.io/download_chromium.html) (for Chrome and Chromium-based browsers).
+- Download LibRedirect from [Mozilla Add-ons](https://addons.mozilla.org/firefox/addon/libredirect/) (for Firefox based-browsers) or [developer's website](https://libredirect.manerakai.com/download_chromium.html) (for Chrome and Chromium-based browsers).
 
 - Download RedirectTube from [Mozilla Add-ons](https://addons.mozilla.org/firefox/addon/redirecttube/) (for Firefox based-browsers) or [Chrome Web Store](https://chromewebstore.google.com/detail/redirecttube/jpbaggklodpddjcadlebabhiopjkjfjh) (for Chrome and Chromium-based browsers).
 

src/constants.js

@@ -4,6 +4,7 @@ const IpcChannels = {
   DISABLE_PROXY: 'disable-proxy',
   GET_SYSTEM_LOCALE: 'get-system-locale',
   GET_NAVIGATION_HISTORY: 'get-navigation-history',
+  IS_WAYLAND_PLATFORM: 'is-wayland-platform',
   STOP_POWER_SAVE_BLOCKER: 'stop-power-save-blocker',
   START_POWER_SAVE_BLOCKER: 'start-power-save-blocker',
   CREATE_NEW_WINDOW: 'create-new-window',

src/main/index.js

@@ -290,6 +290,7 @@ function runApp() {
   let trayOnMinimize = false
   let trayWindows = []
   const trayMaximizedWindows = {}
+  const isTrayOnMinimizeSupported = process.platform !== 'darwin' && (process.platform !== 'linux' || app.commandLine.getSwitchValue('ozone-platform') !== 'wayland')
 
   const userDataPath = app.getPath('userData')
 
@@ -346,7 +347,7 @@ function runApp() {
         if (!openDeepLinksInNewWindow) {
           // Just focus the main window (instead of starting a new instance)
           if (mainWindow.isMinimized()) {
-            if (process.platform !== 'darwin' && trayOnMinimize) {
+            if (isTrayOnMinimizeSupported && trayOnMinimize) {
               trayClick(mainWindow)
             } else {
               mainWindow.restore()
@@ -524,7 +525,7 @@ function runApp() {
             backendPreference = doc.value
             break
           case 'hideToTrayOnMinimize':
-            if (process.platform !== 'darwin') {
+            if (isTrayOnMinimizeSupported) {
               trayOnMinimize = doc.value
             }
             break
@@ -1032,7 +1033,7 @@ function runApp() {
 
     // endregion Ensure child windows use same options since electron 14
 
-    if (process.platform !== 'darwin') {
+    if (isTrayOnMinimizeSupported) {
       function manageTray(window, removeWindow = false) {
         if (tray) {
           if (!removeWindow) {
@@ -1144,7 +1145,7 @@ function runApp() {
         return
       }
 
-      if (process.platform !== 'darwin' && trayOnMinimize && trayWindows.length > 0) {
+      if (isTrayOnMinimizeSupported && trayOnMinimize && trayWindows.length > 0) {
         trayClick(newWindow)
       } else {
         newWindow.show()
@@ -1346,6 +1347,12 @@ function runApp() {
     }
   })
 
+  ipcMain.handle(IpcChannels.IS_WAYLAND_PLATFORM, (event) => {
+    if (isFreeTubeUrl(event.senderFrame.url)) {
+      return app.commandLine.getSwitchValue('ozone-platform') === 'wayland'
+    }
+  })
+
   /**
    * @param {import('electron').WebContents} webContents
    * @param {string | undefined} [currentPath]
@@ -1656,7 +1663,7 @@ function runApp() {
               await setMenu()
               break
             case 'hideToTrayOnMinimize':
-              if (process.platform !== 'darwin') {
+              if (isTrayOnMinimizeSupported) {
                 trayOnMinimize = data.value
                 if (!trayOnMinimize) { showHiddenWindows() }
               }
@@ -2114,7 +2121,7 @@ function runApp() {
     })
   }
 
-  if (process.platform !== 'darwin') {
+  if (isTrayOnMinimizeSupported) {
     app.on('before-quit', () => {
       if (tray) { tray.destroy() }
     })

src/preload/interface.js

@@ -30,6 +30,13 @@ export default {
     return ipcRenderer.invoke(IpcChannels.GET_SYSTEM_LOCALE)
   },
 
+  /**
+   * @returns {Promise<boolean>}
+   */
+  isWaylandPlatform: () => {
+    return ipcRenderer.invoke(IpcChannels.IS_WAYLAND_PLATFORM)
+  },
+
   /**
    * @param {string} path
    * @param {Record<string, string> | null | undefined} query

src/renderer/components/DataSettings/DataSettings.vue

@@ -895,17 +895,21 @@ async function importYouTubeWatchHistory(historyData) {
   // remove 'Watched' and translated variants from start of title
   // so we get the common string prefix for all the titles
   const getCommonStart = (allTitles) => {
-    const watchedTitle = allTitles[0].split(' ')
-    allTitles.forEach((title) => {
-      const splitTitle = title.split(' ')
-      for (let wtIndex = 0; wtIndex <= watchedTitle.length; wtIndex++) {
-        if (!splitTitle.includes(watchedTitle[wtIndex])) {
-          watchedTitle.splice(wtIndex, watchedTitle.length - wtIndex)
+    if (allTitles.length < 2) {
+      return ''
+    }
+
+    let commonStart = allTitles[0]
+    for (let i = 1; i < allTitles.length; i++) {
+      while (!allTitles[i].startsWith(commonStart)) {
+        commonStart = commonStart.slice(0, -1)
+        if (commonStart === '') {
+          return ''
         }
       }
-    })
+    }
 
-    return watchedTitle.join(' ')
+    return commonStart
   }
 
   const commonStart = getCommonStart(filteredHistoryData.map(e => e.title))

src/renderer/components/GeneralSettings/GeneralSettings.vue

@@ -42,7 +42,7 @@
           @change="updateOpenDeepLinksInNewWindow"
         />
         <FtToggleSwitch
-          v-if="!IS_MAC && USING_ELECTRON"
+          v-if="!IS_MAC && !isLinuxWayland && USING_ELECTRON"
           :label="t('Settings.General Settings.Minimize to system tray')"
           :default-value="hideToTrayOnMinimize"
           :compact="true"
@@ -167,7 +167,7 @@
 </template>
 
 <script setup>
-import { computed, onBeforeUnmount, useTemplateRef } from 'vue'
+import { computed, onMounted, onBeforeUnmount, ref, useTemplateRef } from 'vue'
 import { useI18n } from '../../composables/use-i18n-polyfill'
 import { useRouter } from 'vue-router'
 
@@ -193,6 +193,15 @@ const IS_MAC = process.platform === 'darwin'
 const { t } = useI18n()
 const router = useRouter()
 
+// The 'minimize' event doesn't fire on wayland
+// https://github.com/electron/electron/issues/51766
+const isLinuxWayland = ref(false)
+if (process.env.IS_ELECTRON && process.platform === 'linux') {
+  onMounted(async () => {
+    isLinuxWayland.value = await window.ftElectron.isWaylandPlatform()
+  })
+}
+
 /** @type {import('vue').ComputedRef<boolean>} */
 const checkForUpdates = computed(() => store.getters.getCheckForUpdates)
 

src/renderer/components/ft-list-video/ft-list-video.js

@@ -252,7 +252,7 @@ export default defineComponent({
       if (typeof this.lengthSeconds !== 'number' || this.lengthSeconds === 0) {
         return 0
       }
-      const percentage = (this.watchProgress / this.lengthSeconds) * 100
+      const percentage = (Math.ceil(this.watchProgress) / this.lengthSeconds) * 100
       return Math.min(percentage, 100)
     },
 

src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js

@@ -1472,7 +1472,11 @@ export default defineComponent({
       const isPortrait = variants[0].height > variants[0].width
 
       let matches = variants.filter(variant => {
-        return quality === (isPortrait ? variant.width : variant.height)
+        const { width, height } = variant
+        const [primary, secondary] = isPortrait ? [width, height] : [height, width]
+        const aspectRatio = secondary / primary
+        const resolution = aspectRatio > 16 / 9 ? Math.round(secondary * 9 / 16) : primary
+        return quality === resolution
       })
 
       if (matches.length === 0) {
@@ -2280,7 +2284,7 @@ export default defineComponent({
      * @param {KeyboardEvent} event
      */
     function keyboardShortcutHandler(event) {
-      if (!player || !hasLoaded.value) {
+      if (!player) {
         return
       }
 
@@ -2334,6 +2338,61 @@ export default defineComponent({
         return
       }
 
+      switch (event.key.toLowerCase()) {
+        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.FULLSCREEN:
+          // Toggle full screen
+          event.preventDefault()
+          ui.getControls().toggleFullScreen()
+          blurTooltipButtons()
+          break
+        case 'escape':
+          // Exit full window
+          if (fullWindowEnabled.value) {
+            event.preventDefault()
+
+            events.dispatchEvent(new CustomEvent('setFullWindow', {
+              detail: false
+            }))
+          }
+          break
+        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.FULLWINDOW:
+          // Toggle full window mode
+          event.preventDefault()
+          events.dispatchEvent(new CustomEvent('setFullWindow', {
+            detail: !fullWindowEnabled.value
+          }))
+          blurTooltipButtons()
+          break
+        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.THEATRE_MODE:
+          // Toggle theatre mode
+          if (props.theatrePossible) {
+            event.preventDefault()
+
+            events.dispatchEvent(new CustomEvent('toggleTheatreMode', {
+              detail: !props.useTheatreMode
+            }))
+          }
+          blurTooltipButtons()
+          break
+        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.MUTE:
+          // Toggle mute only if metakey is not pressed
+          if (!event.metaKey) {
+            event.preventDefault()
+            const isMuted = !video_.muted
+            video_.muted = isMuted
+
+            const messageIcon = isMuted ? 'volume-mute' : 'volume-high'
+            const message = isMuted ? '0%' : `${Math.round(video_.volume * 100)}%`
+            showValueChange(message, messageIcon)
+          }
+          blurTooltipButtons()
+          break
+      }
+
+      if (!hasLoaded.value) {
+        return
+      }
+
       switch (event.key.toLowerCase()) {
         case ' ':
         case 'spacebar': // older browsers might return spacebar instead of a space character
@@ -2365,25 +2424,6 @@ export default defineComponent({
           event.preventDefault()
           changePlayBackRate(videoPlaybackRateInterval.value)
           break
-        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.FULLSCREEN:
-          // Toggle full screen
-          event.preventDefault()
-          ui.getControls().toggleFullScreen()
-          blurTooltipButtons()
-          break
-        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.MUTE:
-          // Toggle mute only if metakey is not pressed
-          if (!event.metaKey) {
-            event.preventDefault()
-            const isMuted = !video_.muted
-            video_.muted = isMuted
-
-            const messageIcon = isMuted ? 'volume-mute' : 'volume-high'
-            const message = isMuted ? '0%' : `${Math.round(video_.volume * 100)}%`
-            showValueChange(message, messageIcon)
-          }
-          blurTooltipButtons()
-          break
         case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.CAPTIONS: {
           // Toggle caption/subtitles
 
@@ -2517,35 +2557,6 @@ export default defineComponent({
             showOverlayControls()
           }
           break
-        case 'escape':
-          // Exit full window
-          if (fullWindowEnabled.value) {
-            event.preventDefault()
-
-            events.dispatchEvent(new CustomEvent('setFullWindow', {
-              detail: false
-            }))
-          }
-          break
-        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.FULLWINDOW:
-          // Toggle full window mode
-          event.preventDefault()
-          events.dispatchEvent(new CustomEvent('setFullWindow', {
-            detail: !fullWindowEnabled.value
-          }))
-          blurTooltipButtons()
-          break
-        case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.THEATRE_MODE:
-          // Toggle theatre mode
-          if (props.theatrePossible) {
-            event.preventDefault()
-
-            events.dispatchEvent(new CustomEvent('toggleTheatreMode', {
-              detail: !props.useTheatreMode
-            }))
-          }
-          blurTooltipButtons()
-          break
         case KeyboardShortcuts.VIDEO_PLAYER.GENERAL.TAKE_SCREENSHOT:
           if (enableScreenshot.value && props.format !== 'audio') {
             event.preventDefault()