From 3b670635a193d2b052af587f5dfdd579ad070870 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Mon, 1 Jul 2024 02:23:24 +0800
Subject: [PATCH] fix: resolve always loading issue

---
 src/contentScripts/views/Favorites/Favorites.vue         | 9 +++++++--
 src/contentScripts/views/History/History.vue             | 2 +-
 src/contentScripts/views/Home/components/Following.vue   | 2 +-
 .../views/Home/components/SubscribedSeries.vue           | 2 +-
 src/contentScripts/views/Home/components/Trending.vue    | 2 +-
 src/contentScripts/views/WatchLater/WatchLater.vue       | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/contentScripts/views/Favorites/Favorites.vue b/src/contentScripts/views/Favorites/Favorites.vue
index fa36cbae..efe39d42 100644
--- a/src/contentScripts/views/Favorites/Favorites.vue
+++ b/src/contentScripts/views/Favorites/Favorites.vue
@@ -31,7 +31,7 @@ const shouldMoveCtrlBarUp = ref<boolean>(false)
 const currentPageNum = ref<number>(1)
 const keyword = ref<string>('')
 const { handlePageRefresh, handleReachBottom, haveScrollbar } = useBewlyApp()
-const isLoading = ref<boolean>(true)
+const isLoading = ref<boolean>(false)
 const isFullPageLoading = ref<boolean>(false)
 const noMoreContent = ref<boolean>()
 
@@ -112,6 +112,8 @@ async function getFavoriteResources(
   pn: number,
   keyword = '' as string,
 ) {
+  // if (pn === 1)
+  //   isFullPageLoading.value = true
   isLoading.value = true
   try {
     const res: FavoritesResult = await api.favorite.getFavoriteResources({
@@ -129,16 +131,19 @@ async function getFavoriteResources(
       if (!res.data.medias)
         noMoreContent.value = true
 
-      if (!haveScrollbar())
+      if (!haveScrollbar() && !noMoreContent.value)
         await getFavoriteResources(selectedCategory.value!.id, ++currentPageNum.value, keyword)
     }
   }
   finally {
     isLoading.value = false
+    // isFullPageLoading.value = false
   }
 }
 
 async function changeCategory(categoryItem: FavoriteCategory) {
+  if (isLoading.value)
+    return
   currentPageNum.value = 1
   selectedCategory.value = categoryItem
   favoriteResources.length = 0
diff --git a/src/contentScripts/views/History/History.vue b/src/contentScripts/views/History/History.vue
index bd78a7e0..7ad8981e 100644
--- a/src/contentScripts/views/History/History.vue
+++ b/src/contentScripts/views/History/History.vue
@@ -80,7 +80,7 @@ function getHistoryList() {
 
         noMoreContent.value = false
 
-        if (!haveScrollbar()) {
+        if (!haveScrollbar() && !noMoreContent.value) {
           getHistoryList()
         }
       }
diff --git a/src/contentScripts/views/Home/components/Following.vue b/src/contentScripts/views/Home/components/Following.vue
index 88c1a709..9c7e1bb3 100644
--- a/src/contentScripts/views/Home/components/Following.vue
+++ b/src/contentScripts/views/Home/components/Following.vue
@@ -145,7 +145,7 @@ async function getFollowedUsersVideos() {
         })
       }
 
-      if (!haveScrollbar()) {
+      if (!haveScrollbar() && !noMoreContent.value) {
         getFollowedUsersVideos()
       }
     }
diff --git a/src/contentScripts/views/Home/components/SubscribedSeries.vue b/src/contentScripts/views/Home/components/SubscribedSeries.vue
index fa2e0948..a985dc2a 100644
--- a/src/contentScripts/views/Home/components/SubscribedSeries.vue
+++ b/src/contentScripts/views/Home/components/SubscribedSeries.vue
@@ -149,7 +149,7 @@ async function getFollowedUsersVideos() {
         })
       }
 
-      if (!haveScrollbar()) {
+      if (!haveScrollbar() && !noMoreContent.value) {
         getFollowedUsersVideos()
       }
     }
diff --git a/src/contentScripts/views/Home/components/Trending.vue b/src/contentScripts/views/Home/components/Trending.vue
index 71a87689..c8cc7bb4 100644
--- a/src/contentScripts/views/Home/components/Trending.vue
+++ b/src/contentScripts/views/Home/components/Trending.vue
@@ -116,7 +116,7 @@ async function getTrendingVideos() {
         })
       }
 
-      if (!haveScrollbar()) {
+      if (!haveScrollbar() && !noMoreContent.value) {
         getTrendingVideos()
       }
     }
diff --git a/src/contentScripts/views/WatchLater/WatchLater.vue b/src/contentScripts/views/WatchLater/WatchLater.vue
index 7b236a5d..f6b06f6f 100644
--- a/src/contentScripts/views/WatchLater/WatchLater.vue
+++ b/src/contentScripts/views/WatchLater/WatchLater.vue
@@ -82,7 +82,7 @@ function getCurrentWatchLaterList() {
   pageNum.value++
   currentWatchLaterList.value.push(...currentList)
 
-  if (!haveScrollbar()) {
+  if (!haveScrollbar() && !noMoreContent.value) {
     getCurrentWatchLaterList()
   }
 }