From c12f5ae43a01e670f0ad760282f51d10b6cb7491 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Fri, 14 Oct 2022 03:15:06 -0700 Subject: [PATCH] use showToast in most places that we can --- files/assets/js/ban_modal.js | 11 ++----- files/assets/js/comments_admin.js | 11 ++----- files/assets/js/comments_v.js | 45 +++++++--------------------- files/assets/js/delete_post_modal.js | 5 +--- files/assets/js/report_post_modal.js | 11 ++----- files/assets/js/userpage_v.js | 8 +---- 6 files changed, 18 insertions(+), 73 deletions(-) diff --git a/files/assets/js/ban_modal.js b/files/assets/js/ban_modal.js index fbc49a1e5..53c30cc71 100644 --- a/files/assets/js/ban_modal.js +++ b/files/assets/js/ban_modal.js @@ -15,15 +15,8 @@ function banModal(link, id, name) { let data try {data = JSON.parse(xhr.response)} catch(e) {console.log(e)} - if (xhr.status >= 200 && xhr.status < 300 && data && data['message']) { - document.getElementById('toast-post-success-text').innerText = data["message"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show(); - } else { - document.getElementById('toast-post-error-text').innerText = "Error, please try again later." - if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; - if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); - } + success = xhr.status >= 200 && xhr.status < 300; + showToast(success, getMessageFromJsonData(success, data)); }; xhr.send(form); diff --git a/files/assets/js/comments_admin.js b/files/assets/js/comments_admin.js index 230463842..ca889388a 100644 --- a/files/assets/js/comments_admin.js +++ b/files/assets/js/comments_admin.js @@ -85,15 +85,8 @@ function adminMuteUser(userId, muteStatus, buttonId) { let data try {data = JSON.parse(xhr.response)} catch(e) {console.log(e)} - if (xhr.status >= 200 && xhr.status < 300 && data && data['message']) { - document.getElementById('toast-post-success-text').innerText = data["message"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show(); - } else { - document.getElementById('toast-post-error-text').innerText = "Error, please try again later." - if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; - if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); - } + success = xhr.status >= 200 && xhr.status < 300; + showToast(success, getMessageFromJsonData(success, data)); }; xhr.send(form); diff --git a/files/assets/js/comments_v.js b/files/assets/js/comments_v.js index d0b2ebeb7..28c89c8b4 100644 --- a/files/assets/js/comments_v.js +++ b/files/assets/js/comments_v.js @@ -40,15 +40,8 @@ function report_commentModal(id, author) { let data try {data = JSON.parse(xhr.response)} catch(e) {console.log(e)} - if (xhr.status >= 200 && xhr.status < 300 && data && data['message']) { - document.getElementById('toast-post-success-text').innerText = data["message"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show(); - } else { - document.getElementById('toast-post-error-text').innerText = "Error, please try again later." - if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; - if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); - } + success = xhr.status >= 200 && xhr.status < 300; + showToast(success, getMessageFromJsonData(success, data)); }; xhr.onerror=function(){alert(errortext)}; @@ -117,13 +110,9 @@ function delete_commentModal(id) { document.getElementById(`undelete-${id}`).classList.remove('d-none'); document.getElementById(`delete2-${id}`).classList.add('d-none'); document.getElementById(`undelete2-${id}`).classList.remove('d-none'); - document.getElementById('toast-post-success-text').innerText = data["message"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show(); + showToast(true, getMessageFromJsonData(true, data)); } else { - document.getElementById('toast-post-error-text').innerText = "Error, please try again later." - if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; - if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); + showToast(false, getMessageFromJsonData(false, data)); } }; xhr.send(form); @@ -167,12 +156,8 @@ function post_reply(id){ document.getElementById('reply-form-body-'+id).value = '' document.getElementById('message-reply-'+id).innerHTML = '' ToggleReplyBox('reply-message-'+id) - } - else { - if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; - else document.getElementById('toast-post-error-text').innerText = "Error, please try again later." - if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); + } else { + showToast(false, getMessageFromJsonData(false, data)); } setTimeout(() => { btn.disabled = false; @@ -213,10 +198,7 @@ function comment_edit(id){ document.getElementById('filename-edit-reply-' + id).innerHTML = ''; } else { - if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; - else document.getElementById('toast-post-error-text').innerText = "Error, please try again later." - if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); + showToast(false, getMessageFromJsonData(false, data)); } setTimeout(() => { btn.disabled = false; @@ -273,10 +255,7 @@ function post_comment(fullname, hide){ document.getElementById('filename-show-reply-' + fullname).innerHTML = ''; } else { - if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; - else document.getElementById('toast-post-error-text').innerText = "Error, please try again later." - if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); + showToast(false, getMessageFromJsonData(false, data)); setTimeout(() => { btn.disabled = false; btn.classList.remove('disabled'); @@ -361,12 +340,8 @@ function handle_action(type, cid, thing) { if (data && data["response"]) { const element = document.getElementById(`${type}-${cid}`); element.innerHTML = data["response"] - } - else { - if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; - else document.getElementById('toast-post-error-text').innerText = "Error, please try again later." - if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); + } else { + showToast(false, getMessageFromJsonData(false, data)); } setTimeout(() => { for (const btn of btns) diff --git a/files/assets/js/delete_post_modal.js b/files/assets/js/delete_post_modal.js index 5b7b9c006..542e098b3 100644 --- a/files/assets/js/delete_post_modal.js +++ b/files/assets/js/delete_post_modal.js @@ -18,10 +18,7 @@ function delete_postModal(id) { document.getElementById('toast-post-success-text').innerText = data["message"]; bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show(); } else { - document.getElementById('toast-post-error-text').innerText = "Error, please try again later." - if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; - if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); + showToast(false, getMessageFromJsonData(false, data)); } }; xhr.send(form); diff --git a/files/assets/js/report_post_modal.js b/files/assets/js/report_post_modal.js index 18958f1d4..ebb51bff3 100644 --- a/files/assets/js/report_post_modal.js +++ b/files/assets/js/report_post_modal.js @@ -39,15 +39,8 @@ function report_postModal(id) { let data try {data = JSON.parse(xhr.response)} catch(e) {console.log(e)} - if (xhr.status >= 200 && xhr.status < 300 && data && data['message']) { - document.getElementById('toast-post-success-text').innerText = data["message"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show(); - } else { - document.getElementById('toast-post-error-text').innerText = "Error, please try again later." - if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; - if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"]; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); - } + success = xhr.status >= 200 && xhr.status < 300; + showToast(success, getMessageFromJsonData(success, data)); }; xhr.onerror=function(){alert(errortext)}; diff --git a/files/assets/js/userpage_v.js b/files/assets/js/userpage_v.js index 02aa3bf99..7d8c9808c 100644 --- a/files/assets/js/userpage_v.js +++ b/files/assets/js/userpage_v.js @@ -105,13 +105,7 @@ function submitFormAjax(e) { xhr.onload = function() { if (xhr.status >= 200 && xhr.status < 300) { let data = JSON.parse(xhr.response); - try { - document.getElementById('toast-post-success-text').innerText = data["message"]; - } catch(e) { - document.getElementById('toast-post-success-text').innerText = "Action successful!"; - } - var myToast = bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')); - myToast.show(); + showToast(true, getMessageFromJsonData(true, data)); return true } else { document.getElementById('toast-post-error-text').innerText = "Error, please try again later."