From d1c79b2305e5a90fabc7b13d4efe1c3858c4460a Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 28 Jan 2022 00:43:59 +0200 Subject: [PATCH] v --- files/assets/js/comments.js | 1 + files/assets/js/comments_v.js | 6 +++--- files/assets/js/report_post_modal.js | 1 + files/routes/comments.py | 26 +++++++++++++++++--------- files/templates/comments.html | 4 ++-- files/templates/report_post_modal.html | 2 +- files/templates/submission.html | 2 +- 7 files changed, 26 insertions(+), 16 deletions(-) diff --git a/files/assets/js/comments.js b/files/assets/js/comments.js index 77f1961ed..e31a8f69f 100644 --- a/files/assets/js/comments.js +++ b/files/assets/js/comments.js @@ -33,6 +33,7 @@ function morecomments(cid) { }); popovertrigger() } + btn.disabled = false; } xhr.send(form) } diff --git a/files/assets/js/comments_v.js b/files/assets/js/comments_v.js index 53c768bf8..d6dee736f 100644 --- a/files/assets/js/comments_v.js +++ b/files/assets/js/comments_v.js @@ -140,8 +140,8 @@ function post_reply(id){ } catch(e) {console.log(e)} new bootstrap.Toast(document.getElementById('toast-post-error')).show(); - btn.classList.remove('disabled'); } + btn.classList.remove('disabled'); } xhr.send(form) } @@ -173,8 +173,8 @@ function comment_edit(id){ } catch(e) {console.log(e)} new bootstrap.Toast(document.getElementById('toast-post-error')).show(); - btn.classList.remove('disabled'); } + btn.classList.remove('disabled'); } xhr.send(form) } @@ -207,8 +207,8 @@ function post_comment(fullname){ } catch(e) {console.log(e)} new bootstrap.Toast(document.getElementById('toast-post-error')).show(); - btn.classList.remove('disabled'); } + btn.classList.remove('disabled'); } xhr.send(form) } diff --git a/files/assets/js/report_post_modal.js b/files/assets/js/report_post_modal.js index c9dc32203..e345c7dfe 100644 --- a/files/assets/js/report_post_modal.js +++ b/files/assets/js/report_post_modal.js @@ -17,6 +17,7 @@ function report_postModal(id) { xhr.onload=function() { document.getElementById("reportPostFormBefore").classList.add('d-none'); document.getElementById("reportPostFormAfter").classList.remove('d-none'); + this.disabled = false; }; xhr.onerror=function(){alert(errortext)}; diff --git a/files/routes/comments.py b/files/routes/comments.py index 4cc502251..93b477094 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -317,7 +317,8 @@ def api_comment(v): is_bot=is_bot, app_id=v.client.application.id if v.client else None, body_html=body_html, - body=body[:10000] + body=body[:10000], + ghost=parent_post.ghost ) c.upvotes = 1 @@ -340,7 +341,7 @@ def api_comment(v): if request.host == 'pcmemes.net' and c.body.lower().startswith("based"): pill = re.match("based and (.{1,20}?)(-| )pilled", body, re.IGNORECASE) - if level == 1: basedguy = get_account(c.post.author_id) + if level == 1: basedguy = get_account(parent_post.author_id) else: basedguy = get_account(c.parent_comment.author_id) basedguy.basedcount += 1 if pill: @@ -360,7 +361,8 @@ def api_comment(v): level=level+1, is_bot=True, body_html=body_based_html, - top_comment_id=c.top_comment_id + top_comment_id=c.top_comment_id, + ghost=parent_post.ghost ) g.db.add(c_based) @@ -390,7 +392,8 @@ def api_comment(v): level=level+1, is_bot=True, body_html=body_jannied_html, - top_comment_id=c.top_comment_id + top_comment_id=c.top_comment_id, + ghost=parent_post.ghost ) g.db.add(c_jannied) @@ -411,7 +414,8 @@ def api_comment(v): level=level+1, is_bot=True, body_html=body_html2, - top_comment_id=c.top_comment_id + top_comment_id=c.top_comment_id, + ghost=parent_post.ghost ) g.db.add(c2) @@ -446,7 +450,8 @@ def api_comment(v): level=level+1, is_bot=True, body_html=body_html2, - top_comment_id=c.top_comment_id + top_comment_id=c.top_comment_id, + ghost=parent_post.ghost ) g.db.add(c2) @@ -469,7 +474,8 @@ def api_comment(v): level=level+2, is_bot=True, body_html=body_html2, - top_comment_id=c.top_comment_id + top_comment_id=c.top_comment_id, + ghost=parent_post.ghost ) g.db.add(c3) @@ -485,7 +491,8 @@ def api_comment(v): level=level+3, is_bot=True, body_html=body_html2, - top_comment_id=c.top_comment_id + top_comment_id=c.top_comment_id, + ghost=parent_post.ghost ) g.db.add(c4) @@ -732,7 +739,8 @@ def edit_comment(cid, v): level=c.level+1, is_bot=True, body_html=body_jannied_html, - top_comment_id=c.top_comment_id + top_comment_id=c.top_comment_id, + ghost=c.ghost ) g.db.add(c_jannied) diff --git a/files/templates/comments.html b/files/templates/comments.html index 2f00204ef..8edc98f2c 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -864,7 +864,7 @@ {% if v %} - + {% endif %} @@ -876,7 +876,7 @@ {% include "expanded_image_modal.html" %} - + \ No newline at end of file + \ No newline at end of file diff --git a/files/templates/submission.html b/files/templates/submission.html index 6075f87d4..276ecad1d 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -863,7 +863,7 @@ {% if offset %} - + {% endif %} {% elif not p.replies and p.deleted_utc == 0 %}