about summary refs log tree commit diff
path: root/app/javascript/mastodon/actions/alerts.js
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-03-28 17:59:45 +0100
committerGitHub <noreply@github.com>2020-03-28 17:59:45 +0100
commit0d117c106aa72f78dd5cdd371849dd8ce3120198 (patch)
tree756c9a48d18fde716a6f57553a32d5f6e548d2b6 /app/javascript/mastodon/actions/alerts.js
parent7ddbbdea6d4591e6cfe032a0dd212703776e5bb4 (diff)
Fix 404 and 410 API errors being silently discarded in WebUI (#13279)
* Fix 404 and 410 API errors being silently discarded in WebUI

Fixes #13278

* Return more appropriate error when user replies to a deleted toot

* Please CodeClimate

* Fix 404/410 errors on fetching account timelines & identity proofs

* Refactor error handling

* Move error message string to statuses.errors
Diffstat (limited to 'app/javascript/mastodon/actions/alerts.js')
-rw-r--r--app/javascript/mastodon/actions/alerts.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/actions/alerts.js b/app/javascript/mastodon/actions/alerts.js
index cd36d8007..1670f9c10 100644
--- a/app/javascript/mastodon/actions/alerts.js
+++ b/app/javascript/mastodon/actions/alerts.js
@@ -34,11 +34,11 @@ export function showAlert(title = messages.unexpectedTitle, message = messages.u
   };
 };
 
-export function showAlertForError(error) {
+export function showAlertForError(error, skipNotFound = false) {
   if (error.response) {
     const { data, status, statusText, headers } = error.response;
 
-    if (status === 404 || status === 410) {
+    if (skipNotFound && (status === 404 || status === 410)) {
       // Skip these errors as they are reflected in the UI
       return { type: ALERT_NOOP };
     }