From ff6c9452c1a25d30b8e27d89719c066282b22e99 Mon Sep 17 00:00:00 2001
From: David <david.cec@proton.me>
Date: Tue, 7 Jul 2026 14:00:41 +0200
Subject: [PATCH] Fix 'Fetch more results' channel button duplicating results
 when spam clicking

---
 src/renderer/views/Channel/Channel.vue | 47 +++++++++++++++-----------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/renderer/views/Channel/Channel.vue b/src/renderer/views/Channel/Channel.vue
index e6f0c71b9e486..f01a29a05fddb 100644
--- a/src/renderer/views/Channel/Channel.vue
+++ b/src/renderer/views/Channel/Channel.vue
@@ -230,7 +230,7 @@
           </p>
         </FtFlexBox>
         <FtAutoLoadNextPageWrapper
-          v-if="showFetchMoreButton"
+          v-if="showFetchMoreButton && !isFetchMoreLoading"
           @load-next-page="handleFetchMore"
         >
           <div
@@ -338,6 +338,7 @@ let mayContainContentFromOtherChannels = false
 const isLoading = ref(true)
 const isElementListLoading = ref(false)
 const isSearchTabLoading = ref(false)
+const isFetchMoreLoading = ref(false)
 const currentTab = ref('videos')
 
 const isCurrentTabLoading = computed(() => {
@@ -2225,74 +2226,80 @@ const showFetchMoreButton = computed(() => {
   }
 })
 
-function handleFetchMore() {
+async function handleFetchMore() {
+  if (isFetchMoreLoading.value) return
+
+  isFetchMoreLoading.value = true
+
   switch (currentTab.value) {
     case 'videos':
       if (process.env.SUPPORTS_LOCAL_API && apiUsed === 'local') {
-        getChannelVideosLocalMore()
+        await getChannelVideosLocalMore()
       } else {
-        channelInvidiousVideos()
+        await channelInvidiousVideos()
       }
       break
     case 'shorts':
       if (process.env.SUPPORTS_LOCAL_API && apiUsed === 'local') {
-        getChannelShortsLocalMore()
+        await getChannelShortsLocalMore()
       } else {
-        channelInvidiousShorts()
+        await channelInvidiousShorts()
       }
       break
     case 'live':
       if (process.env.SUPPORTS_LOCAL_API && apiUsed === 'local') {
-        getChannelLiveLocalMore()
+        await getChannelLiveLocalMore()
       } else {
-        channelInvidiousLive()
+        await channelInvidiousLive()
       }
       break
     case 'releases':
       if (process.env.SUPPORTS_LOCAL_API && apiUsed === 'local') {
-        getChannelReleasesLocalMore()
+        await getChannelReleasesLocalMore()
       } else {
-        channelInvidiousReleasesMore()
+        await channelInvidiousReleasesMore()
       }
       break
     case 'podcasts':
       if (process.env.SUPPORTS_LOCAL_API && apiUsed === 'local') {
-        getChannelPodcastsLocalMore()
+        await getChannelPodcastsLocalMore()
       } else {
-        channelInvidiousPodcastsMore()
+        await channelInvidiousPodcastsMore()
       }
       break
     case 'courses':
       if (process.env.SUPPORTS_LOCAL_API && apiUsed === 'local') {
-        getChannelCoursesLocalMore()
+        await getChannelCoursesLocalMore()
       } else {
-        channelInvidiousCoursesMore()
+        await channelInvidiousCoursesMore()
       }
       break
     case 'playlists':
       if (process.env.SUPPORTS_LOCAL_API && apiUsed === 'local') {
-        getChannelPlaylistsLocalMore()
+        await getChannelPlaylistsLocalMore()
       } else {
-        getPlaylistsInvidiousMore()
+        await getPlaylistsInvidiousMore()
       }
       break
     case 'search':
       if (process.env.SUPPORTS_LOCAL_API && apiUsed === 'local') {
-        searchChannelLocal()
+        await searchChannelLocal()
       } else {
-        searchChannelInvidious()
+        await searchChannelInvidious()
       }
       break
     case 'community':
       if (process.env.SUPPORTS_LOCAL_API && apiUsed === 'local') {
-        getCommunityPostsLocalMore()
+        await getCommunityPostsLocalMore()
       } else {
-        getCommunityPostsInvidious()
+        await getCommunityPostsInvidious()
       }
       break
     default:
       console.error(currentTab.value)
   }
+
+  isFetchMoreLoading.value = false
 }
 
 function changeTab(tab) {