From 0a31dad196e8719eb44354e1f7f6a6f711d85517 Mon Sep 17 00:00:00 2001
From: Ethan Dalool <git@voussoir.net>
Date: Fri, 6 Nov 2020 22:34:01 -0800
Subject: [PATCH] Rewrite these default callbacks as alertresponse.

---
 frontends/etiquette_flask/static/js/api.js | 42 +++++++++-------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/frontends/etiquette_flask/static/js/api.js b/frontends/etiquette_flask/static/js/api.js
index ca77ebc..65c6c38 100644
--- a/frontends/etiquette_flask/static/js/api.js
+++ b/frontends/etiquette_flask/static/js/api.js
@@ -103,27 +103,23 @@ function remove_photos(album_id, photo_ids, callback)
 api.albums.callback_follow =
 function callback_follow(response)
 {
-    if (response["meta"]["status"] == 200 && response["data"]["id"])
+    if ((response.meta.status !== 200) || (! response.json_ok) || (! response.data.id))
     {
-        window.location.href = "/album/" + response["data"]["id"];
-    }
-    else
-    {
-        console.log(response);
+        alert(JSON.stringify(response));
+        return;
     }
+    window.location.href = "/album/" + response.data.id;
 }
 
 api.albums.callback_go_to_albums =
 function callback_go_to_albums(response)
 {
-    if (response["meta"]["status"] == 200)
+    if (response.meta.status !== 200)
     {
-        window.location.href = "/albums";
-    }
-    else
-    {
-        console.log(response);
+        alert(JSON.stringify(response));
+        return;
     }
+    window.location.href = "/albums";
 }
 
 /**************************************************************************************************/
@@ -294,16 +290,14 @@ function unset_searchhidden(photo_id, callback)
 }
 
 api.photos.callback_go_to_search =
-function callback_go_to_albums(response)
+function callback_go_to_search(response)
 {
-    if (response["meta"]["status"] == 200)
+    if (response.meta.status !== 200)
     {
-        window.location.href = "/search";
-    }
-    else
-    {
-        console.log(response);
+        alert(JSON.stringify(response));
+        return;
     }
+    window.location.href = "/search";
 }
 
 /**************************************************************************************************/
@@ -382,14 +376,12 @@ function remove_synonym(tag_name, syn_name, callback)
 api.tags.callback_go_to_tags =
 function callback_go_to_tags(response)
 {
-    if (response["meta"]["status"] == 200)
+    if (response.meta.status !== 200)
     {
-        window.location.href = "/tags";
-    }
-    else
-    {
-        console.log(response);
+        alert(JSON.stringify(response));
+        return;
     }
+    window.location.href = "/tags";
 }
 
 /**************************************************************************************************/