Merge branch 'development' into custom-builds/tmp

* development: (29 commits)
  Translated using Weblate (Chinese (Traditional))
  Fix URL copied via right click menu (FreeTubeApp#4690)
  Translated using Weblate (Croatian)
  Wrap ft-icon buttons below before they go fully vertical (FreeTubeApp#4735)
  * Make activating a chapter selector makes window scroll to top like clicking on timestamp links (FreeTubeApp#4722)
  Translated using Weblate (Portuguese (Brazil))
  Translated using Weblate (Portuguese (Brazil))
  Make video thumbnails have certain height before image loading starts to avoid layout shifts (FreeTubeApp#4723)
  Update subscription cache when visiting a channel (FreeTubeApp#4667)
  Fix fallback to Invidious for the podcasts channel tab (FreeTubeApp#4731)
  Translated using Weblate (Portuguese (Brazil))
  Translated using Weblate (Arabic)
  Translated using Weblate (Polish)
  Translated using Weblate (Dutch)
  Translated using Weblate (Icelandic)
  Translated using Weblate (Spanish)
  Translated using Weblate (Arabic)
  Translated using Weblate (Icelandic)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Simplified))
  ...

Author: PikachuEXE

src/renderer/components/watch-video-chapters/watch-video-chapters.js

@@ -69,6 +69,7 @@ export default defineComponent({
     changeChapter: function(index) {
       this.currentIndex = index
       this.$emit('timestamp-event', this.chapters[index].startSeconds)
+      window.scrollTo(0, 0)
     },
 
     navigateChapters(direction) {

src/renderer/components/watch-video-info/watch-video-info.scss

@@ -64,6 +64,19 @@
         inset-inline-end: calc(50% - 20px);
       }
     }
+
+    @media screen and (max-width: 460px) {
+      flex-wrap: nowrap;
+      :deep(.iconDropdown) {
+        inset-inline-start: auto;
+        inset-inline-end: auto;
+      }
+    }
+  }
+  @media screen and (max-width: 460px) {
+    flex-direction: column;
+    align-items: flex-start;
+    margin-block-start: 10px;
   }
 }
 

src/renderer/store/modules/subscriptions.js

@@ -54,6 +54,10 @@ const actions = {
     commit('updateShortsCacheByChannel', payload)
   },
 
+  updateSubscriptionShortsCacheWithChannelPageShorts: ({ commit }, payload) => {
+    commit('updateShortsCacheWithChannelPageShorts', payload)
+  },
+
   updateSubscriptionLiveCacheByChannel: ({ commit }, payload) => {
     commit('updateLiveCacheByChannel', payload)
   },
@@ -86,6 +90,31 @@ const mutations = {
     if (videos != null) { newObject.videos = videos }
     state.shortsCache[channelId] = newObject
   },
+  updateShortsCacheWithChannelPageShorts(state, { channelId, videos }) {
+    const cachedObject = state.shortsCache[channelId]
+
+    if (cachedObject && cachedObject.videos.length > 0) {
+      cachedObject.videos.forEach(cachedVideo => {
+        const channelVideo = videos.find(short => cachedVideo.videoId === short.videoId)
+
+        if (channelVideo) {
+          // authorId probably never changes, so we don't need to update that
+
+          cachedVideo.title = channelVideo.title
+          cachedVideo.author = channelVideo.author
+
+          // as the channel shorts page only has compact view counts for numbers above 1000 e.g. 12k
+          // and the RSS feeds include an exact value, we only want to overwrite it when the number is larger than the cached value
+          // 12345 vs 12000 => 12345
+          // 12345 vs 15000 => 15000
+
+          if (channelVideo.viewCount > cachedVideo.viewCount) {
+            cachedVideo.viewCount = channelVideo.viewCount
+          }
+        }
+      })
+    }
+  },
   clearShortsCache(state) {
     state.shortsCache = {}
   },

src/renderer/views/Channel/Channel.js

@@ -33,6 +33,10 @@ import {
   parseLocalListVideo,
   parseLocalSubscriberCount
 } from '../../helpers/api/local'
+import {
+  addPublishedDatesInvidious,
+  addPublishedDatesLocal
+} from '../../helpers/subscriptions'
 
 export default defineComponent({
   name: 'Channel',
@@ -171,6 +175,13 @@ export default defineComponent({
       return this.subscriptionInfo !== null
     },
 
+    isSubscribedInAnyProfile: function () {
+      const profileList = this.$store.getters.getProfileList
+
+      // check the all channels profile
+      return profileList[0].subscriptions.some((channel) => channel.id === this.id)
+    },
+
     videoLiveSelectNames: function () {
       return [
         this.$t('Channel.Videos.Sort Types.Newest'),
@@ -767,6 +778,17 @@ export default defineComponent({
         this.latestVideos = parseLocalChannelVideos(videosTab.videos, this.id, this.channelName)
         this.videoContinuationData = videosTab.has_continuation ? videosTab : null
         this.isElementListLoading = false
+
+        if (this.isSubscribedInAnyProfile && this.latestVideos.length > 0 && this.videoSortBy === 'newest') {
+          addPublishedDatesLocal(this.latestVideos)
+          this.updateSubscriptionVideosCacheByChannel({
+            channelId: this.id,
+            // create a copy so that we only cache the first page
+            // if we use the same array, the store will get angry at us for modifying it outside of the store,
+            // when the user clicks load more
+            videos: [...this.latestVideos]
+          })
+        }
       } catch (err) {
         console.error(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
@@ -825,6 +847,16 @@ export default defineComponent({
         this.latestShorts = parseLocalChannelShorts(shortsTab.videos, this.id, this.channelName)
         this.shortContinuationData = shortsTab.has_continuation ? shortsTab : null
         this.isElementListLoading = false
+
+        if (this.isSubscribedInAnyProfile && this.latestShorts.length > 0 && this.shortSortBy === 'newest') {
+          // As the shorts tab API response doesn't include the published dates,
+          // we can't just write the results to the subscriptions cache like we do with videos and live (can't sort chronologically without the date).
+          // However we can still update the metadata in the cache such as the view count and title that might have changed since it was cached
+          this.updateSubscriptionShortsCacheWithChannelPageShorts({
+            channelId: this.id,
+            videos: this.latestShorts
+          })
+        }
       } catch (err) {
         console.error(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
@@ -883,6 +915,17 @@ export default defineComponent({
         this.latestLive = parseLocalChannelVideos(liveTab.videos, this.id, this.channelName)
         this.liveContinuationData = liveTab.has_continuation ? liveTab : null
         this.isElementListLoading = false
+
+        if (this.isSubscribedInAnyProfile && this.latestLive.length > 0 && this.liveSortBy === 'newest') {
+          addPublishedDatesLocal(this.latestLive)
+          this.updateSubscriptionLiveCacheByChannel({
+            channelId: this.id,
+            // create a copy so that we only cache the first page
+            // if we use the same array, the store will get angry at us for modifying it outside of the store,
+            // when the user clicks load more
+            videos: [...this.latestLive]
+          })
+        }
       } catch (err) {
         console.error(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
@@ -1052,6 +1095,16 @@ export default defineComponent({
         }
         this.videoContinuationData = response.continuation || null
         this.isElementListLoading = false
+
+        if (this.isSubscribedInAnyProfile && !more && this.latestVideos.length > 0 && this.videoSortBy === 'newest') {
+          addPublishedDatesInvidious(this.latestVideos)
+          this.updateSubscriptionVideosCacheByChannel({
+            channelId: this.id,
+            // create a copy so that we only cache the first page
+            // if we use the same array, it will also contain all the next pages
+            videos: [...this.latestVideos]
+          })
+        }
       }).catch((err) => {
         console.error(err)
         const errorMessage = this.$t('Invidious API Error (Click to copy)')
@@ -1101,6 +1154,17 @@ export default defineComponent({
         }
         this.shortContinuationData = response.continuation || null
         this.isElementListLoading = false
+
+        if (this.isSubscribedInAnyProfile && !more && this.latestShorts.length > 0 && this.shortSortBy === 'newest') {
+          // As the shorts tab API response doesn't include the published dates,
+          // we can't just write the results to the subscriptions cache like we do with videos and live (can't sort chronologically without the date).
+          // However we can still update the metadata in the cache e.g. adding the duration, as that isn't included in the RSS feeds
+          // and updating the view count and title that might have changed since it was cached
+          this.updateSubscriptionShortsCacheWithChannelPageShorts({
+            channelId: this.id,
+            videos: this.latestShorts
+          })
+        }
       }).catch((err) => {
         console.error(err)
         const errorMessage = this.$t('Invidious API Error (Click to copy)')
@@ -1142,6 +1206,17 @@ export default defineComponent({
         }
         this.liveContinuationData = response.continuation || null
         this.isElementListLoading = false
+
+        if (this.isSubscribedInAnyProfile && !more && this.latestLive.length > 0 && this.liveSortBy === 'newest') {
+          addPublishedDatesInvidious(this.latestLive)
+          this.updateSubscriptionLiveCacheByChannel({
+            channelId: this.id,
+            // create a copy so that we only cache the first page
+            // if we use the same array, the store will get angry at us for modifying it outside of the store,
+            // when the user clicks load more
+            videos: [...this.latestLive]
+          })
+        }
       }).catch((err) => {
         console.error(err)
         const errorMessage = this.$t('Invidious API Error (Click to copy)')
@@ -1444,7 +1519,7 @@ export default defineComponent({
         })
         if (this.backendPreference === 'local' && this.backendFallback) {
           showToast(this.$t('Falling back to Invidious API'))
-          this.getChannelPodcastsInvidious()
+          this.channelInvidiousPodcasts()
         } else {
           this.isLoading = false
         }
@@ -1559,6 +1634,19 @@ export default defineComponent({
 
         this.latestCommunityPosts = parseLocalCommunityPosts(posts)
         this.communityContinuationData = communityTab.has_continuation ? communityTab : null
+
+        if (this.latestCommunityPosts.length > 0) {
+          this.latestCommunityPosts.forEach(post => {
+            post.authorId = this.id
+          })
+          this.updateSubscriptionPostsCacheByChannel({
+            channelId: this.id,
+            // create a copy so that we only cache the first page
+            // if we use the same array, the store will get angry at us for modifying it outside of the store,
+            // when the user clicks load more
+            posts: [...this.latestCommunityPosts]
+          })
+        }
       } catch (err) {
         console.error(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
@@ -1610,6 +1698,19 @@ export default defineComponent({
           this.latestCommunityPosts = posts
         }
         this.communityContinuationData = continuation
+
+        if (this.isSubscribedInAnyProfile && !more && this.latestCommunityPosts.length > 0) {
+          this.latestCommunityPosts.forEach(post => {
+            post.authorId = this.id
+          })
+          this.updateSubscriptionPostsCacheByChannel({
+            channelId: this.id,
+            // create a copy so that we only cache the first page
+            // if we use the same array, the store will get angry at us for modifying it outside of the store,
+            // when the user clicks load more
+            posts: [...this.latestCommunityPosts]
+          })
+        }
       }).catch(async (err) => {
         console.error(err)
         const errorMessage = this.$t('Invidious API Error (Click to copy)')
@@ -1849,7 +1950,11 @@ export default defineComponent({
 
     ...mapActions([
       'showOutlines',
-      'updateSubscriptionDetails'
+      'updateSubscriptionDetails',
+      'updateSubscriptionVideosCacheByChannel',
+      'updateSubscriptionLiveCacheByChannel',
+      'updateSubscriptionShortsCacheWithChannelPageShorts',
+      'updateSubscriptionPostsCacheByChannel'
     ])
   }
 })

static/locales/ar.yaml

@@ -1,5 +1,5 @@
 # Put the name of your locale in the same language
-Locale Name: 'الإنجليزية (الولايات المتحدة)'
+Locale Name: 'العربية'
 FreeTube: 'فري تيوب'
 # Currently on Subscriptions, Playlists, and History
 'This part of the app is not ready yet. Come back later when progress has been made.': >-
@@ -186,6 +186,7 @@ User Playlists:
     Save: حفظ
     Search in Playlists: البحث في قوائم التشغيل
     N playlists selected: تم تحديد {playlistCount}
+    Added {count} Times: تمت إضافة {count} الوقت | تمت إضافة {count} مرة
   CreatePlaylistPrompt:
     Toast:
       There is already a playlist with this name. Please pick a different name.: توجد

static/locales/cs.yaml

@@ -146,6 +146,7 @@ User Playlists:
     Select a playlist to add your N videos to: Vyberte playlist, do kterého přidat
       vaše video | Vyberte playlist, do kterého přidat vašich {videoCount} videí
     N playlists selected: Vybráno {playlistCount}
+    Added {count} Times: Přidáno {count}krát | Přidáno {count}krát
   SinglePlaylistView:
     Toast:
       There were no videos to remove.: Nejsou zde žádná videa k odstranění.

static/locales/en_GB.yaml

@@ -121,14 +121,14 @@ Playlists: 'Playlists'
 User Playlists:
   Your Playlists: 'Your playlists'
   Playlist Message: This page is not reflective of fully working playlists. It only
-    lists videos that you have saved or favourited. When the work has finished, all
-    videos currently here will be migrated to a ‘Favourites’ playlist.
+    lists videos that you have saved or made a Favourite. When the work has finished,
+    all videos currently here will be migrated to a ‘Favourites’ playlist.
   Your saved videos are empty. Click on the save button on the corner of a video to have it listed here: Your
     saved videos are empty. Click on the save button on the corner of a video to have
     it listed here
   Search bar placeholder: Search in playlist
   Empty Search Message: There are no videos in this playlist that match your search
-  Create New Playlist: Create new playlist
+  Create New Playlist: Create new Playlist
   Add to Playlist: Add to playlist
   This playlist currently has no videos.: This playlist currently has no videos.
   Move Video Down: Move video down
@@ -185,11 +185,21 @@ User Playlists:
       "{videoCount} video(s) added to 1 playlist": 1 video added to 1 playlist | {videoCount}
         videos added to 1 playlist
       You haven't selected any playlist yet.: You haven't selected any playlist yet.
+      "{videoCount} video(s) added to {playlistCount} playlists": 1 video added to
+        {playlistCount} playlists | {videoCount} videos added to  {playlistCount}
+        playlists
     Select a playlist to add your N videos to: Select a playlist to add your video
       to | Select a playlist to add your {videoCount} videos to
   CreatePlaylistPrompt:
-    New Playlist Name: New playlist name
+    New Playlist Name: New Playlist name
     Create: Create
+    Toast:
+      Playlist {playlistName} has been successfully created.: Playlist {playlistName}
+        has been successfully created.
+      There was an issue with creating the playlist.: There was an problem when creating
+        the playlist.
+      There is already a playlist with this name. Please pick a different name.: There
+        is already a Playlist with this name. Please pick a different name.
   You have no playlists. Click on the create new playlist button to create a new one.: You
     have no playlists. Click on the create new playlist button to create a new one.
   Move Video Up: Move video up
@@ -252,7 +262,7 @@ Settings:
     Clear Default Instance: Clear default instance
     Set Current Instance as Default: Set current instance as default
     Current instance will be randomized on startup: Current instance will be randomised
-      on startup
+      on Startup
     No default instance has been set: No default instance has been set
     The currently set default instance is {instance}: The currently set default instance
       is {instance}
@@ -1082,8 +1092,8 @@ New Window: New window
 Channels:
   Empty: Your channel list is currently empty.
   Unsubscribe: Unsubscribe
-  Unsubscribed: '{channelName} has been removed from your subscriptions'
-  Unsubscribe Prompt: Are you sure you want to unsubscribe from ‘{channelName}’?
+  Unsubscribed: '{channelName} has been removed from your Subscriptions'
+  Unsubscribe Prompt: Are you sure you want to Unsubscribe from ‘{channelName}’?
   Title: Channel list
   Search bar placeholder: Search channels
   Channels: Channels
@@ -1113,3 +1123,4 @@ Playlist will not pause when current video is finished: Playlist will not pause
   current video is finished
 Go to page: Go to {page}
 Tag already exists: ‘{tagName}’ tag already exists
+Close Banner: Close Banner

static/locales/es.yaml

@@ -142,6 +142,7 @@ User Playlists:
       a la que añadir su vídeo | Seleccione una lista de reproducción a la que añadir
       sus {videoCount} vídeos
     N playlists selected: '{playlistCount} seleccionada'
+    Added {count} Times: Añadido {count} vez | Añadido {count} veces
   SinglePlaylistView:
     Toast:
       There were no videos to remove.: No había vídeos que eliminar.