diff --git a/files/routes/reporting.py b/files/routes/reporting.py index 4e408e59df..a34ac54b27 100644 --- a/files/routes/reporting.py +++ b/files/routes/reporting.py @@ -188,6 +188,15 @@ def move_post(post, v, reason): post.hole = hole_to post.hole_pinned = None + + if hole_to == 'chudrama': + post.bannedfor = None + post.chuddedfor = None + for c in post.comments: + c.bannedfor = None + c.chuddedfor = None + g.db.add(c) + g.db.add(post) if v.id != post.author_id: diff --git a/files/templates/comments.html b/files/templates/comments.html index 5e547b629e..f0f1cf7b86 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -129,11 +129,11 @@ {% endif %} {% endif %} - {% if c.bannedfor and not (c.parent_post and c.post.hole == 'chudrama') %} + {% if c.bannedfor %} {% endif %} - {% if c.chuddedfor and not (c.parent_post and c.post.hole == 'chudrama') %} + {% if c.chuddedfor %} {% endif %} diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html index f80da8e6b9..2817870468 100644 --- a/files/templates/util/macros.html +++ b/files/templates/util/macros.html @@ -21,11 +21,11 @@ {% endif %} - {% if p.bannedfor and p.hole != 'chudrama' %} + {% if p.bannedfor %} {% endif %} - {% if p.chuddedfor and p.hole != 'chudrama' %} + {% if p.chuddedfor %} {% endif %}