Merge branch 'FreeTubeApp:development' into playbackrate

Author: caetano-dev

package.json

@@ -86,7 +86,7 @@
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.2",
     "electron": "^37.2.3",
-    "electron-builder": "^26.0.18",
+    "electron-builder": "^26.0.19",
     "eslint": "^9.31.0",
     "eslint-plugin-jsdoc": "^51.4.1",
     "eslint-plugin-jsonc": "^2.20.1",

src/renderer/components/SubscriptionSettings/SubscriptionSettings.vue

@@ -26,12 +26,6 @@
         />
       </div>
       <div class="switchColumn">
-        <FtToggleSwitch
-          :label="$t('Settings.Subscription Settings.Hide Videos on Watch')"
-          :default-value="hideWatchedSubs"
-          compact
-          @change="updateHideWatchedSubs"
-        />
         <FtToggleSwitch
           :label="$t('Settings.Subscription Settings.Limit the number of videos displayed for each channel')"
           :default-value="onlyShowLatestFromChannel"
@@ -93,16 +87,6 @@ function updateUnsubscriptionPopupStatus(value) {
   store.dispatch('updateUnsubscriptionPopupStatus', value)
 }
 
-/** @type {import('vue').ComputedRef<boolean>} */
-const hideWatchedSubs = computed(() => store.getters.getHideWatchedSubs)
-
-/**
- * @param {boolean} value
- */
-function updateHideWatchedSubs(value) {
-  store.dispatch('updateHideWatchedSubs', value)
-}
-
 /** @type {import('vue').ComputedRef<boolean>} */
 const onlyShowLatestFromChannel = computed(() => store.getters.getOnlyShowLatestFromChannel)
 

src/renderer/components/distraction-settings/distraction-settings.js

@@ -142,6 +142,9 @@ export default defineComponent({
         settingsSection: this.$t('Settings.Distraction Free Settings.Distraction Free Settings')
       })
     },
+    hideWatchedSubs: function () {
+      return this.$store.getters.getHideWatchedSubs
+    },
   },
   mounted: function () {
     this.verifyChannelsHidden()
@@ -245,6 +248,7 @@ export default defineComponent({
       'updateHideSubscriptionsCommunity',
       'updateShowAddedChannelsHidden',
       'updateShowAddedForbiddenTitles',
-    ])
-  }
+      'updateHideWatchedSubs',
+    ]),
+  },
 })

src/renderer/components/distraction-settings/distraction-settings.vue

@@ -217,6 +217,13 @@
           :default-value="hideSharingActions"
           @change="updateHideSharingActions"
         />
+        <ft-toggle-switch
+          :label="$t('Settings.Distraction Free Settings.Hide Videos on Watch')"
+          :default-value="hideWatchedSubs"
+          :compact="true"
+          :tooltip="$t('Tooltips.Distraction Free Settings.Hide Videos on Watch')"
+          @change="updateHideWatchedSubs"
+        />
       </div>
       <div class="switchColumn">
         <ft-toggle-switch

src/renderer/helpers/api/local.js

@@ -1649,6 +1649,8 @@ export function parseLocalComment(comment, commentThread = undefined) {
     hasReplyToken = true
   }
 
+  const commentTextRuns = comment.voice_reply_container?.transcript_text ? comment.voice_reply_container.transcript_text.runs : comment.content.runs
+
   return {
     id: comment.comment_id,
     dataType: 'local',
@@ -1659,7 +1661,7 @@ export function parseLocalComment(comment, commentThread = undefined) {
     isPinned: comment.is_pinned,
     isOwner: !!comment.author_is_channel_owner,
     isMember: !!comment.is_member,
-    text: Autolinker.link(parseLocalTextRuns(comment.content.runs, 16, { looseChannelNameDetection: true })),
+    text: Autolinker.link(parseLocalTextRuns(commentTextRuns, 16, { looseChannelNameDetection: true })),
     isHearted: !!comment.is_hearted,
     hasOwnerReplied,
     hasReplyToken,

src/renderer/views/Channel/Channel.vue

@@ -41,7 +41,7 @@
       <div class="select-container">
         <FtSelect
           v-if="showVideoSortBy"
-          v-show="currentTab === 'videos' && latestVideos.length > 0"
+          v-show="currentTab === 'videos' && (showFetchMoreButton || filteredVideos.length > 1)"
           :value="videoSortBy"
           :select-names="videoLiveShortSelectNames"
           :select-values="videoLiveShortSelectValues"
@@ -51,7 +51,7 @@
         />
         <FtSelect
           v-if="!hideChannelShorts && showShortSortBy"
-          v-show="currentTab === 'shorts' && latestShorts.length > 0"
+          v-show="currentTab === 'shorts' && (showFetchMoreButton || filteredShorts.length > 1)"
           :value="shortSortBy"
           :select-names="videoLiveShortSelectNames"
           :select-values="videoLiveShortSelectValues"
@@ -61,7 +61,7 @@
         />
         <FtSelect
           v-if="!hideLiveStreams && showLiveSortBy"
-          v-show="currentTab === 'live' && latestLive.length > 0"
+          v-show="currentTab === 'live' && (showFetchMoreButton || filteredLive.length > 1)"
           :value="liveSortBy"
           :select-names="videoLiveShortSelectNames"
           :select-values="videoLiveShortSelectValues"
@@ -97,7 +97,7 @@
         <FtElementList
           v-show="currentTab === 'videos'"
           id="videoPanel"
-          :data="latestVideos"
+          :data="filteredVideos"
           :use-channels-hidden-preference="false"
           role="tabpanel"
           aria-labelledby="videosTab"
@@ -112,7 +112,7 @@
         <FtElementList
           v-if="!hideChannelShorts && currentTab === 'shorts'"
           id="shortPanel"
-          :data="latestShorts"
+          :data="filteredShorts"
           :use-channels-hidden-preference="false"
           role="tabpanel"
           aria-labelledby="shortsTab"
@@ -128,7 +128,7 @@
           v-if="!hideLiveStreams"
           v-show="currentTab === 'live'"
           id="livePanel"
-          :data="latestLive"
+          :data="filteredLive"
           :use-channels-hidden-preference="false"
           role="tabpanel"
           aria-labelledby="liveTab"
@@ -469,6 +469,9 @@ const hideChannelPlaylists = computed(() => store.getters.getHideChannelPlaylist
 /** @type {import('vue').ComputedRef<boolean>} */
 const hideChannelCommunity = computed(() => store.getters.getHideChannelCommunity)
 
+/** @type {import('vue').ComputedRef<boolean>} */
+const hideWatchedSubs = computed(() => store.getters.getHideWatchedSubs)
+
 /**
  * @template T
  * @param {T[]} array
@@ -1048,6 +1051,30 @@ const videoContinuationData = shallowRef(null)
 const showVideoSortBy = ref(true)
 const videoSortBy = ref('newest')
 
+const filteredVideos = computed(() => {
+  if (hideWatchedSubs.value) {
+    return filterWatchedArray(latestVideos.value)
+  } else {
+    return latestVideos.value
+  }
+})
+
+const filteredShorts = computed(() => {
+  if (hideWatchedSubs.value) {
+    return filterWatchedArray(latestShorts.value)
+  } else {
+    return latestShorts.value
+  }
+})
+
+const filteredLive = computed(() => {
+  if (hideWatchedSubs.value) {
+    return filterWatchedArray(latestLive.value)
+  } else {
+    return latestLive.value
+  }
+})
+
 watch(videoSortBy, () => {
   if (!autoRefreshOnSortByChangeEnabled) { return }
 
@@ -2315,6 +2342,11 @@ function handleSubscription() {
     posts: latestCommunityPosts.value
   })
 }
+
+function filterWatchedArray(videos) {
+  const historyCache = store.getters.getHistoryCacheById
+  return videos.filter(video => !Object.hasOwn(historyCache, video.videoId))
+}
 </script>
 
 <style scoped src="./Channel.css" />

static/locales/af.yaml

@@ -521,7 +521,6 @@ Settings:
     Clear Search History and Cache: Wis soekgeskiedenis en kasgeheue
   Subscription Settings:
     Subscription Settings: 'Intekening'
-    Hide Videos on Watch: 'Versteek alle gekykte video’s'
     Fetch Feeds from RSS: 'Haal voer vanaf RSS op'
     Fetch Automatically: 'Haal voer outomaties op'
     Confirm Before Unsubscribing: 'Bevestig voor uittekening'
@@ -554,6 +553,7 @@ Settings:
     Hide Live Streams: 'Versteek direkte strome'
     Hide Upcoming Premieres: 'Versteek komende premières'
     Hide Sharing Actions: 'Versteek deel-aksies'
+    Hide Videos on Watch: 'Versteek alle gekykte video’s'
     Hide Chapters: 'Versteek hoofstukke'
     Hide Channels: 'Versteek video’s van kanale'
     Hide Channels Disabled Message: 'Sommige kanale is met ID versper en is nie verwerk

static/locales/ar.yaml

@@ -453,7 +453,6 @@ Settings:
       Tooltip: 'تلقائي = حفظ عند كل خروج من صفحة الفيديو، عند انتهاء الفيديو وظهور خطأ (مثلاً: معدل محدود أو انتهاء جلسة المشاهدة). شبه تلقائي = يُشبه الوضع التلقائي إلا عند الخروج من صفحة الفيديو، ويمكن حفظ التقدم يدويًا عبر زر "حفظ تقدم المشاهدة" الموجود أسفل مشغل الفيديو.'
   Subscription Settings:
     Subscription Settings: 'الاشتراك'
-    Hide Videos on Watch: 'أخفِ الفيديوهات عند مشاهدتها'
     Fetch Feeds from RSS: 'جلب المحتوى عن طريق RSS'
     Fetch Automatically: جلب الخلاصة تلقائيا
     Confirm Before Unsubscribing: تجنب إلغاء الاشتراك عن طريق الخطأ
@@ -511,6 +510,7 @@ Settings:
     Hide Video Description: إخفاء وصف الفيديو
     Hide Comments: إخفاء التعليقات
     Hide Sharing Actions: إخفاء إجراءات المشاركة
+    Hide Videos on Watch: 'أخفِ الفيديوهات عند مشاهدتها'
     Hide Live Streams: إخفاء البث المباشر
     Hide Chapters: إخفاء الفصول
     Hide Upcoming Premieres: إخفاء العروض الأولى القادمة

static/locales/awa.yaml

@@ -497,7 +497,6 @@ Settings:
     Are you sure you want to remove all your playlists?: ''
   Subscription Settings:
     Subscription Settings: ''
-    Hide Videos on Watch: ''
     Fetch Feeds from RSS: ''
     Fetch Automatically: ''
     'Limit the number of videos displayed for each channel': ''

static/locales/be.yaml

@@ -482,7 +482,6 @@ Settings:
       Tooltip: Аўта = Захоўваць пры кожным выхадзе са старонкі відэа, калі відэа скончылася і ўзнікла памылка (напрыклад, хуткасць абмежавана і сеанс прагляду скончыўся). Паўаўтаматычны = як і аўтаматычны, за выключэннем выхаду з відэастаронкі і захавання прагрэсу ўручную з дапамогай кнопкі пад назвай "Захаваць прагледжаны прагрэс", размешчанай пад відэаплэерам.
   Subscription Settings:
     Subscription Settings: 'Падпіскі'
-    Hide Videos on Watch: 'Хаваць відэа пасля прагляду'
     Fetch Feeds from RSS: 'Атрымліваць стужкі з RSS'
     Fetch Automatically: 'Атрымліваць стужку аўтаматычна'
     Confirm Before Unsubscribing: Пацвярджаць адпісванне
@@ -513,6 +512,7 @@ Settings:
     Hide Live Streams: 'Хаваць жывыя эфіры'
     Hide Upcoming Premieres: 'Хаваць будучыя прэм''еры'
     Hide Sharing Actions: 'Хаваць дзеянні абагульвання'
+    Hide Videos on Watch: 'Хаваць відэа пасля прагляду'
     Hide Chapters: 'Хаваць раздзелы'
     Hide Channels: 'Хаваць відэа з каналаў'
     Hide Channels Placeholder: 'Ідэнтыфікатар канала'