diff --git a/files/assets/images/Drama/sidebar/239.webp b/files/assets/images/Drama/sidebar/239.webp index e657842e4..d3246bd30 100644 Binary files a/files/assets/images/Drama/sidebar/239.webp and b/files/assets/images/Drama/sidebar/239.webp differ diff --git a/files/assets/images/Drama/sidebar/243.webp b/files/assets/images/Drama/sidebar/243.webp deleted file mode 100644 index d3246bd30..000000000 Binary files a/files/assets/images/Drama/sidebar/243.webp and /dev/null differ diff --git a/files/assets/js/comments_v.js b/files/assets/js/comments_v.js index 69b15fb99..5e8d09010 100644 --- a/files/assets/js/comments_v.js +++ b/files/assets/js/comments_v.js @@ -113,24 +113,34 @@ function toggleEdit(id){ function delete_commentModal(id) { - - document.getElementById("deleteCommentButton").onclick = function() { - - this.innerHTML='Deleting comment'; - this.disabled = true; - - var url = '/delete/comment/' + id - const xhr = new XMLHttpRequest(); - xhr.open("POST", url); - xhr.setRequestHeader('xhr', 'xhr'); - var form = new FormData() - form.append("formkey", formkey()); - xhr.onload = function() {location.reload(true);}; - xhr.send(form); + document.getElementById("deleteCommentButton").onclick = function() { + const xhr = new XMLHttpRequest(); + xhr.open("POST", `/delete_comment/${id}`); + xhr.setRequestHeader('xhr', 'xhr'); + var form = new FormData() + form.append("formkey", formkey()); + xhr.onload = function() { + 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(`comment-${id}`).classList.add('deleted'); + document.getElementById(`delete-${id}`).classList.add('d-none'); + 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-comment-success-text').innerText = data["message"]; + bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-comment-success')).show(); + } else { + document.getElementById('toast-comment-error-text').innerText = "Error, please try again later." + if (data && data["error"]) document.getElementById('toast-comment-error-text').innerText = data["error"]; + bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-comment-error')).show(); + } + }; + xhr.send(form); + }; } -}; - function post_reply(id){ const btn = document.getElementById(`save-reply-to-${id}`) btn.disabled = true; diff --git a/files/routes/static.py b/files/routes/static.py index b1b74da53..f1982cf33 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -81,13 +81,13 @@ def stats(): "total posts": g.db.query(Submission.id).count(), "posting users": g.db.query(Submission.author_id).distinct().count(), "listed posts": g.db.query(Submission.id).filter_by(is_banned=False).filter(Submission.deleted_utc == 0).count(), - "removed posts": g.db.query(Submission.id).filter_by(is_banned=True).count(), - "deleted posts": g.db.query(Submission.id).filter(Submission.deleted_utc > 0).count(), + "removed posts (by admins)": g.db.query(Submission.id).filter_by(is_banned=True).count(), + "deleted posts (by author)": g.db.query(Submission.id).filter(Submission.deleted_utc > 0).count(), "posts last 24h": g.db.query(Submission.id).filter(Submission.created_utc > day).count(), "total comments": g.db.query(Comment.id).filter(Comment.author_id.notin_((AUTOJANNY_ID,NOTIFICATIONS_ID))).count(), "commenting users": g.db.query(Comment.author_id).distinct().count(), - "removed comments": g.db.query(Comment.id).filter_by(is_banned=True).count(), - "deleted comments": g.db.query(Comment.id).filter(Comment.deleted_utc > 0).count(), + "removed comments (by admins)": g.db.query(Comment.id).filter_by(is_banned=True).count(), + "deleted comments (by author)": g.db.query(Comment.id).filter(Comment.deleted_utc > 0).count(), "comments last_24h": g.db.query(Comment.id).filter(Comment.created_utc > day, Comment.author_id.notin_((AUTOJANNY_ID,NOTIFICATIONS_ID))).count(), "post votes": g.db.query(Vote.id).count(), "post voting users": g.db.query(Vote.user_id).distinct().count(), diff --git a/files/templates/comments.html b/files/templates/comments.html index 70118a60d..37e1886e0 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -693,11 +693,9 @@ Undistinguish {% endif %} - {% if c.deleted_utc %} - Undelete - {% else %} - Delete - {% endif %} + + + Mark +18 Unmark +18 @@ -812,30 +810,34 @@ {% include "ban_modal.html" %} {% endif %} -