From 91d5ea6d7a7e41adc28c193d257accef6d8cda6d Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Sun, 31 Mar 2024 23:32:22 +0200
Subject: [PATCH] Add support for sorting the shorts tab by oldest on the local
 API

---
 src/renderer/views/Channel/Channel.js  | 21 +++++----------------
 src/renderer/views/Channel/Channel.vue | 18 +++++++++---------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index 7ea6c27e5061c..b41e43fb6d16a 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -105,15 +105,11 @@ export default defineComponent({
       errorMessage: '',
       showSearchBar: true,
       showShareMenu: true,
-      videoLiveSelectValues: [
+      videoLiveShortSelectValues: [
         'newest',
         'popular',
         'oldest'
       ],
-      shortSelectValues: [
-        'newest',
-        'popular'
-      ],
       playlistSelectValues: [
         'newest',
         'last'
@@ -184,7 +180,7 @@ export default defineComponent({
       return profileList[0].subscriptions.some((channel) => channel.id === this.id)
     },
 
-    videoLiveSelectNames: function () {
+    videoLiveShortSelectNames: function () {
       return [
         this.$t('Channel.Videos.Sort Types.Newest'),
         this.$t('Channel.Videos.Sort Types.Most Popular'),
@@ -192,13 +188,6 @@ export default defineComponent({
       ]
     },
 
-    shortSelectNames: function () {
-      return [
-        this.$t('Channel.Videos.Sort Types.Newest'),
-        this.$t('Channel.Videos.Sort Types.Most Popular')
-      ]
-    },
-
     playlistSelectNames: function () {
       return [
         this.$t('Channel.Playlists.Sort Types.Newest'),
@@ -769,7 +758,7 @@ export default defineComponent({
         this.showVideoSortBy = videosTab.filters.length > 1
 
         if (this.showVideoSortBy && this.videoSortBy !== 'newest') {
-          const index = this.videoLiveSelectValues.indexOf(this.videoSortBy)
+          const index = this.videoLiveShortSelectValues.indexOf(this.videoSortBy)
           videosTab = await videosTab.applyFilter(videosTab.filters[index])
         }
 
@@ -837,7 +826,7 @@ export default defineComponent({
         this.showShortSortBy = shortsTab.filters.length > 1
 
         if (this.showShortSortBy && this.shortSortBy !== 'newest') {
-          const index = this.shortSelectValues.indexOf(this.shortSortBy)
+          const index = this.videoLiveShortSelectValues.indexOf(this.shortSortBy)
           shortsTab = await shortsTab.applyFilter(shortsTab.filters[index])
         }
 
@@ -905,7 +894,7 @@ export default defineComponent({
         this.showLiveSortBy = liveTab.filters.length > 1
 
         if (this.showLiveSortBy && this.liveSortBy !== 'newest') {
-          const index = this.videoLiveSelectValues.indexOf(this.liveSortBy)
+          const index = this.videoLiveShortSelectValues.indexOf(this.liveSortBy)
           liveTab = await liveTab.applyFilter(liveTab.filters[index])
         }
 
diff --git a/src/renderer/views/Channel/Channel.vue b/src/renderer/views/Channel/Channel.vue
index 687ab94a4e76c..73b20664dc367 100644
--- a/src/renderer/views/Channel/Channel.vue
+++ b/src/renderer/views/Channel/Channel.vue
@@ -233,27 +233,27 @@
         <ft-select
           v-if="showVideoSortBy"
           v-show="currentTab === 'videos' && latestVideos.length > 0"
-          :value="videoLiveSelectValues[0]"
-          :select-names="videoLiveSelectNames"
-          :select-values="videoLiveSelectValues"
+          :value="videoLiveShortSelectValues[0]"
+          :select-names="videoLiveShortSelectNames"
+          :select-values="videoLiveShortSelectValues"
           :placeholder="$t('Search Filters.Sort By.Sort By')"
           @change="videoSortBy = $event"
         />
         <ft-select
           v-if="!hideChannelShorts && showShortSortBy"
           v-show="currentTab === 'shorts' && latestShorts.length > 0"
-          :value="shortSelectValues[0]"
-          :select-names="shortSelectNames"
-          :select-values="shortSelectValues"
+          :value="videoLiveShortSelectValues[0]"
+          :select-names="videoLiveShortSelectNames"
+          :select-values="videoLiveShortSelectValues"
           :placeholder="$t('Search Filters.Sort By.Sort By')"
           @change="shortSortBy = $event"
         />
         <ft-select
           v-if="!hideLiveStreams && showLiveSortBy"
           v-show="currentTab === 'live' && latestLive.length > 0"
-          :value="videoLiveSelectValues[0]"
-          :select-names="videoLiveSelectNames"
-          :select-values="videoLiveSelectValues"
+          :value="videoLiveShortSelectValues[0]"
+          :select-names="videoLiveShortSelectNames"
+          :select-values="videoLiveShortSelectValues"
           :placeholder="$t('Search Filters.Sort By.Sort By')"
           @change="liveSortBy = $event"
         />