diff --git a/files/classes/comment.py b/files/classes/comment.py index b9c26a7f1..85e2ad3a6 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -312,7 +312,7 @@ class Comment(Base): if self.post and self.post.club and not (v and (v.paid_dues or v.id in [self.author_id, self.post.author_id] or (self.parent_comment and v.id == self.parent_comment.author_id))): return f"

{CC} ONLY

" if self.deleted_utc != 0 and not (v and (v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or v.id == self.author.id)): return "[Deleted by user]" - if self.is_banned and not (v and v.admin_level >= PERMS['POST_COMMENT_MODERATION']) and v.id != self.author.id: return "" + if self.is_banned and not (v and v.admin_level >= PERMS['POST_COMMENT_MODERATION']) and not (v and v.id == self.author.id): return "" body = self.body_html or "" @@ -379,7 +379,7 @@ class Comment(Base): if self.post and self.post.club and not (v and (v.paid_dues or v.id in [self.author_id, self.post.author_id] or (self.parent_comment and v.id == self.parent_comment.author_id))): return f"{CC} ONLY" if self.deleted_utc != 0 and not (v and (v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or v.id == self.author.id)): return "[Deleted by user]" - if self.is_banned and not (v and v.admin_level >= PERMS['POST_COMMENT_MODERATION']) and v.id != self.author.id: return "" + if self.is_banned and not (v and v.admin_level >= PERMS['POST_COMMENT_MODERATION']) and not (v and v.id == self.author.id): return "" body = self.body diff --git a/files/classes/submission.py b/files/classes/submission.py index f3ec770eb..4b09fd004 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -331,7 +331,7 @@ class Submission(Base): def realbody(self, v, listing=False): if self.club and not (v and (v.paid_dues or v.id == self.author_id)): return f"

{CC} ONLY

" if self.deleted_utc != 0 and not (v and (v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or v.id == self.author.id)): return "[Deleted by user]" - if self.is_banned and not (v and v.admin_level >= PERMS['POST_COMMENT_MODERATION']) and v.id != self.author.id: return "" + if self.is_banned and not (v and v.admin_level >= PERMS['POST_COMMENT_MODERATION']) and not (v and v.id == self.author.id): return "" body = self.body_html or "" @@ -400,7 +400,7 @@ class Submission(Base): @lazy def plainbody(self, v): if self.deleted_utc != 0 and not (v and (v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or v.id == self.author.id)): return "[Deleted by user]" - if self.is_banned and not (v and v.admin_level >= PERMS['POST_COMMENT_MODERATION']) and v.id != self.author.id: return "" + if self.is_banned and not (v and v.admin_level >= PERMS['POST_COMMENT_MODERATION']) and not (v and v.id == self.author.id): return "" if self.club and not (v and (v.paid_dues or v.id == self.author_id)): return f"

{CC} ONLY

" body = self.body