From 50f3820a6d7d7ba4bf35f06aa7b162baca036edb Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Sun, 4 Sep 2022 12:53:49 +0200
Subject: [PATCH] downgrade severity of some transient errors

---
 copyparty/web/browser.js | 16 ++++++++--------
 copyparty/web/up2k.js    |  4 ++--
 copyparty/web/util.js    |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js
index 685b5b18..6c9e6b58 100644
--- a/copyparty/web/browser.js
+++ b/copyparty/web/browser.js
@@ -312,11 +312,11 @@ var Ls = {
 		"u_hashing": 'hash',
 		"u_upping": 'uploading',
 		"u_cuerr": "failed to upload chunk {0} of {1};\nprobably harmless, continuing\n\nfile: {2}",
-		"u_cuerr2": "server rejected upload (chunk {0} of {1});\n\nfile: {2}\n\nerror ",
+		"u_cuerr2": "server rejected upload (chunk {0} of {1});\nwill retry later\n\nfile: {2}\n\nerror ",
 		"u_ehstmp": "will retry; see bottom-right",
-		"u_ehsfin": "server rejected the request to finalize upload",
-		"u_ehssrch": "server rejected the request to perform search",
-		"u_ehsinit": "server rejected the request to initiate upload",
+		"u_ehsfin": "server rejected the request to finalize upload; retrying...",
+		"u_ehssrch": "server rejected the request to perform search; retrying...",
+		"u_ehsinit": "server rejected the request to initiate upload; retrying...",
 		"u_ehsdf": "server ran out of disk space!\n\nwill keep retrying, in case someone\nfrees up enough space to continue",
 		"u_emtleak1": "it looks like your webbrowser may have a memory leak;\nplease",
 		"u_emtleak2": ' <a href="{0}">switch to https (recommended)</a> or ',
@@ -654,11 +654,11 @@ var Ls = {
 		"u_hashing": 'les',
 		"u_upping": 'sender',
 		"u_cuerr": "kunne ikke laste opp del {0} av {1};\nsikkert harmløst, fortsetter\n\nfil: {2}",
-		"u_cuerr2": "server nektet opplastningen (del {0} av {1});\n\nfile: {2}\n\nerror ",
+		"u_cuerr2": "server nektet opplastningen (del {0} av {1});\nprøver igjen senere\n\nfile: {2}\n\nerror ",
 		"u_ehstmp": "prøver igjen; se mld nederst",
-		"u_ehsfin": "server nektet forespørselen om å ferdigstille filen",
-		"u_ehssrch": "server nektet forespørselen om å utføre søk",
-		"u_ehsinit": "server nektet forespørselen om å begynne en ny opplastning",
+		"u_ehsfin": "server nektet forespørselen om å ferdigstille filen; prøver igjen...",
+		"u_ehssrch": "server nektet forespørselen om å utføre søk; prøver igjen...",
+		"u_ehsinit": "server nektet forespørselen om å begynne en ny opplastning; prøver igjen...",
 		"u_ehsdf": "serveren er full!\n\nprøver igjen regelmessig,\ni tilfelle noen rydder litt...",
 		"u_emtleak1": "uff, det er mulig at nettleseren din har en minnelekkasje...\nForeslår",
 		"u_emtleak2": ' helst at du <a href="{0}">bytter til https</a>, eller ',
diff --git a/copyparty/web/up2k.js b/copyparty/web/up2k.js
index 80495266..a9b619af 100644
--- a/copyparty/web/up2k.js
+++ b/copyparty/web/up2k.js
@@ -2171,7 +2171,7 @@ function up2k_init(subtle) {
                     return;
                 }
                 err = t.t_uploading ? L.u_ehsfin : t.srch ? L.u_ehssrch : L.u_ehsinit;
-                xhrchk(xhr, err + ";\n\nfile: " + t.name + "\n\nerror ", "404, target folder not found");
+                xhrchk(xhr, err + "\n\nfile: " + t.name + "\n\nerror ", "404, target folder not found", "warn");
             }
         }
         xhr.onload = function (e) {
@@ -2245,7 +2245,7 @@ function up2k_init(subtle) {
                 console.log("ignoring dupe-segment error", t);
             }
             else {
-                xhrchk(xhr, L.u_cuerr2.format(npart, Math.ceil(t.size / chunksize), t.name), "404, target folder not found (???)");
+                xhrchk(xhr, L.u_cuerr2.format(npart, Math.ceil(t.size / chunksize), t.name), "404, target folder not found (???)", "warn");
 
                 chill(t);
             }
diff --git a/copyparty/web/util.js b/copyparty/web/util.js
index c8044385..32242446 100644
--- a/copyparty/web/util.js
+++ b/copyparty/web/util.js
@@ -1545,7 +1545,7 @@ var favico = (function () {
 
 
 var cf_cha_t = 0;
-function xhrchk(xhr, prefix, e404) {
+function xhrchk(xhr, prefix, e404, lvl) {
     if (xhr.status < 400 && xhr.status >= 200)
         return true;
 
@@ -1556,7 +1556,7 @@ function xhrchk(xhr, prefix, e404) {
         return toast.err(0, prefix + e404);
 
     var errtxt = (xhr.response && xhr.response.err) || xhr.responseText,
-        fun = toast.err;
+        fun = toast[lvl || 'err'];
 
     if (xhr.status == 503 && /[Cc]loud[f]lare|>Just a mo[m]ent|#cf-b[u]bbles|Chec[k]ing your br[o]wser/.test(errtxt)) {
         var now = Date.now(), td = now - cf_cha_t;