From 5f7d550a5aacd283623a311548dc16ddbea6d6ec Mon Sep 17 00:00:00 2001
From: Jai A <jaiagr+gpg@pm.me>
Date: Sat, 14 Dec 2024 22:16:15 -0700
Subject: [PATCH] fix failed fetches caching in app state

---
 apps/app-frontend/src/pages/instance/Mods.vue |  2 +-
 packages/app-lib/src/util/fetch.rs            | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/apps/app-frontend/src/pages/instance/Mods.vue b/apps/app-frontend/src/pages/instance/Mods.vue
index fb526596..323397c7 100644
--- a/apps/app-frontend/src/pages/instance/Mods.vue
+++ b/apps/app-frontend/src/pages/instance/Mods.vue
@@ -6,7 +6,7 @@
         <input
           v-model="searchFilter"
           type="text"
-          :placeholder="`Search content...`"
+          :placeholder="`Search ${filteredProjects.length} project${filteredProjects.length === 1 ? '' : 's'}...`"
           class="text-input search-input"
           autocomplete="off"
         />
diff --git a/packages/app-lib/src/util/fetch.rs b/packages/app-lib/src/util/fetch.rs
index e305583c..b82b2cc8 100644
--- a/packages/app-lib/src/util/fetch.rs
+++ b/packages/app-lib/src/util/fetch.rs
@@ -112,6 +112,19 @@ pub async fn fetch_advanced(
         let result = req.send().await;
         match result {
             Ok(x) => {
+                if x.status().is_server_error() {
+                    if attempt <= FETCH_ATTEMPTS {
+                        continue;
+                    } else {
+                        return Err(crate::Error::from(
+                            crate::ErrorKind::OtherError(
+                                "Server error when fetching content"
+                                    .to_string(),
+                            ),
+                        ));
+                    }
+                }
+
                 let bytes = if let Some((bar, total)) = &loading_bar {
                     let length = x.content_length();
                     if let Some(total_size) = length {
@@ -145,7 +158,7 @@ pub async fn fetch_advanced(
                     if let Some(sha1) = sha1 {
                         let hash = sha1_async(bytes.clone()).await?;
                         if &*hash != sha1 {
-                            if attempt <= 3 {
+                            if attempt <= FETCH_ATTEMPTS {
                                 continue;
                             } else {
                                 return Err(crate::ErrorKind::HashError(
@@ -159,13 +172,13 @@ pub async fn fetch_advanced(
 
                     tracing::trace!("Done downloading URL {url}");
                     return Ok(bytes);
-                } else if attempt <= 3 {
+                } else if attempt <= FETCH_ATTEMPTS {
                     continue;
                 } else if let Err(err) = bytes {
                     return Err(err.into());
                 }
             }
-            Err(_) if attempt <= 3 => continue,
+            Err(_) if attempt <= FETCH_ATTEMPTS => continue,
             Err(err) => {
                 return Err(err.into());
             }