diff --git a/files/classes/comment.py b/files/classes/comment.py index b3d24a1a5..76fde1a90 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -243,8 +243,8 @@ class Comment(Base): def realbody(self, v): 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.admin_level >= PERMS['POST_COMMENT_MODERATION'] or (v and v.id == self.author.id): return "[Deleted by user]" - if self.is_banned and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and not (v and v.id == self.author.id): return "" + if self.deleted_utc != 0 and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and (v and v.id != self.author.id): return "[Deleted by user]" + if self.is_banned and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and (v and v.id != self.author.id): return "" body = self.body_html or "" @@ -298,8 +298,8 @@ class Comment(Base): def plainbody(self, v): 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.admin_level >= PERMS['POST_COMMENT_MODERATION'] or (v and v.id == self.author.id): return "[Deleted by user]" - if self.is_banned and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and not (v and v.id == self.author.id): return "" + if self.deleted_utc != 0 and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and (v and v.id != self.author.id): return "[Deleted by user]" + if self.is_banned and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and (v and v.id != self.author.id): return "" body = self.body diff --git a/files/classes/submission.py b/files/classes/submission.py index aff38482e..03e92df02 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -271,8 +271,8 @@ class Submission(Base): @lazy 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.admin_level >= PERMS['POST_COMMENT_MODERATION'] or (v and v.id == self.author.id): return "[Deleted by user]" - if self.is_banned and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and not (v and v.id == self.author.id): return "" + if self.deleted_utc != 0 and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and (v and v.id != self.author.id): return "[Deleted by user]" + if self.is_banned and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and (v and v.id != self.author.id): return "" body = self.body_html or "" @@ -328,8 +328,8 @@ class Submission(Base): @lazy def plainbody(self, v): - if self.deleted_utc != 0 and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or (v and v.id == self.author.id): return "[Deleted by user]" - if self.is_banned and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and not (v and v.id == self.author.id): return "" + if self.deleted_utc != 0 and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and (v and v.id != self.author.id): return "[Deleted by user]" + if self.is_banned and not v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and (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