From 7716d1458b4d7b730b03d5c875e1a8be82605e8e Mon Sep 17 00:00:00 2001
From: Tachibana Shin <tachibshin@duck.com>
Date: Tue, 13 Jun 2023 15:38:40 +0700
Subject: [PATCH] 128 phimseason not show screen error if use cache (#129)

* fix not show screen error if exists cache

* no-spinner avatar

* if error cloudflare -> reload
---
 src/components/errors/cloudflare.vue |  3 ++-
 src/layouts/MainLayout.vue           |  1 +
 src/pages/phim/_season.vue           | 22 ++++++++++++++++------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/components/errors/cloudflare.vue b/src/components/errors/cloudflare.vue
index d10c66ed..efaeac1f 100644
--- a/src/components/errors/cloudflare.vue
+++ b/src/components/errors/cloudflare.vue
@@ -32,7 +32,7 @@
       no-caps
       outline
       rounded
-      @click="retry"
+      @click="reload"
       style="color: #00be06"
       >{{ t("thu-lai") }}</q-btn
     >
@@ -53,6 +53,7 @@ const { t } = useI18n()
 function openAnimeVietsub() {
   window.open(C_URL)
 }
+const reload = () => location.reload()
 </script>
 
 <style></style>
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index a2c9811a..e322b218 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -624,6 +624,7 @@
             <q-img-custom
               v-if="authStore.user_data?.avatar"
               :src="forceHttp2(authStore.user_data.avatar)"
+              no-spinner
               referrerpolicy="no-referrer"
             />
             <Icon
diff --git a/src/pages/phim/_season.vue b/src/pages/phim/_season.vue
index adfcb996..c98a5bd1 100644
--- a/src/pages/phim/_season.vue
+++ b/src/pages/phim/_season.vue
@@ -77,7 +77,7 @@
   </div>
 
   <div
-    v-if="loading && !data"
+    v-if="!error && loading && !data"
     class="absolute w-full h-full overflow-hidden px-4 pt-6 text-[28px] row"
   >
     <div class="col-9 pr-4">
@@ -118,7 +118,7 @@
     </div>
   </div>
 
-  <div v-else-if="data" class="mx-4 row">
+  <div v-else-if="!error && data" class="mx-4 row">
     <div class="col-9 pr-4">
       <div class="flex-1 mt-4">
         <h1
@@ -1223,14 +1223,16 @@ watch(
 
     // eslint-disable-next-line functional/no-let
     let typeCurrentConfig: keyof typeof servers | null = null
+    // eslint-disable-next-line functional/no-let
+    let loadedServerFB = false
     // setup watcher it
     const watcher = watch(
       () => settingsStore.player.server,
       async (server) => {
+        loadedServerFB = false
         try {
           if (server === "DU") {
             if (typeCurrentConfig !== "DU")
-              // eslint-disable-next-line promise/catch-or-return
               PlayerLink(currentMetaChap).then((conf) => {
                 // eslint-disable-next-line promise/always-return
                 if (settingsStore.player.server === "DU") {
@@ -1238,25 +1240,33 @@ watch(
                   typeCurrentConfig = "DU"
                 }
               })
+              .catch(err => {
+                error.value =err
+              })
           }
           if (server === "FB") {
             // PlayerFB は常に PlayerLink よりも遅いため、DU を使用して高速プリロード戦術を使用する必要があります。
             if (typeCurrentConfig !== "DU")
-              // eslint-disable-next-line promise/catch-or-return
               PlayerLink(currentMetaChap).then((conf) => {
                 // eslint-disable-next-line promise/always-return
-                if (settingsStore.player.server === "DU") {
+                if (!loadedServerFB && settingsStore.player.server === "DU") {
                   configPlayer.value = conf
                   typeCurrentConfig = "DU"
                 }
               })
-            // eslint-disable-next-line promise/catch-or-return
+              .catch(err => {
+                error.value =err
+              })
             PlayerFB(currentMetaChap.id).then((conf) => {
               // eslint-disable-next-line promise/always-return
               if (settingsStore.player.server === "FB") {
                 configPlayer.value = conf
                 typeCurrentConfig = "FB"
               }
+              loadedServerFB = true
+            })
+            .catch(err => {
+              error.value =err
             })
           }
         } catch (err) {