From dd7e0abd6aeb995d7a9a763225d063027e48a6eb Mon Sep 17 00:00:00 2001 From: justcool393 Date: Thu, 6 Oct 2022 19:04:27 -0700 Subject: [PATCH] fix some conflicts --- files/classes/comment.py | 4 ++-- files/classes/submission.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/files/classes/comment.py b/files/classes/comment.py index eaf7286d0..a2f6a90a1 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -330,8 +330,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 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']): return "[Removed by admins]"; + 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']): return "[Removed by admins]" body = self.body_html or "" diff --git a/files/classes/submission.py b/files/classes/submission.py index 1e0816c4e..e010c4d98 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -334,7 +334,7 @@ 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 and (v.admin_level >= PERMS['POST_COMMENT_MODERATION']) or v.id == self.author.id): return "[Deleted by user]" + 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']): return "[Removed by admins]" body = self.body_html or ""