From 9e252f724cfe175929483a43611858e941258b98 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Sat, 19 Nov 2022 05:32:46 -0600 Subject: [PATCH] make realbody logic look nicer (we really should dedupe this someday) --- files/classes/comment.py | 23 ++++++++++------------- files/classes/submission.py | 16 ++++++++++------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/files/classes/comment.py b/files/classes/comment.py index 950479acd..57da59570 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -241,11 +241,11 @@ class Comment(Base): @lazy 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'] and (v and v.id != self.author.id): return "[Deleted by user]" - if self.author.shadowbanned and not v.can_see_shadowbanned and not (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 not v or v.id != self.author_id: + if self.deleted_utc != 0 and not v.admin_level >= PERMS['POST_COMMENT_MODERATION']: return "[Deleted by user]" + if self.author.shadowbanned and not v.admin_level >= PERMS['USER_SHADOWBAN']: return "[Deleted by user]" + if self.is_banned and not v.admin_level >= PERMS['POST_COMMENT_MODERATION']: return "[Removed by admins]" + if self.post.club and not v.paid_dues: return f"{CC} ONLY" body = self.body_html or "" @@ -297,18 +297,15 @@ class Comment(Base): @lazy 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'] and (v and v.id != self.author.id): return "[Deleted by user]" - if self.author.shadowbanned and not v.can_see_shadowbanned and not (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 not v or v.id != self.author_id: + if self.deleted_utc != 0 and not v.admin_level >= PERMS['POST_COMMENT_MODERATION']: return "[Deleted by user]" + if self.author.shadowbanned and not v.admin_level >= PERMS['USER_SHADOWBAN']: return "[Deleted by user]" + if self.is_banned and not v.admin_level >= PERMS['POST_COMMENT_MODERATION']: return "[Removed by admins]" + if self.post and self.post.club and not v.id == self.post.author_id and not v.paid_dues: return f"{CC} ONLY" body = self.body - if not body: return "" - body = censor_slurs(body, v).replace(':marseytrain:', ':marseytrain:') - return body @lazy diff --git a/files/classes/submission.py b/files/classes/submission.py index 03e92df02..883c68c92 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -270,9 +270,11 @@ 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'] 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 not v or v.id != self.author_id: + if self.deleted_utc != 0 and not v.admin_level >= PERMS['POST_COMMENT_MODERATION']: return "[Deleted by user]" + if self.author.shadowbanned and not v.admin_level >= PERMS['USER_SHADOWBAN']: return "[Deleted by user]" + if self.is_banned and not v.admin_level >= PERMS['POST_COMMENT_MODERATION']: return "[Removed by admins]" + if self.club and not v.paid_dues: return f"{CC} ONLY" body = self.body_html or "" @@ -328,9 +330,11 @@ class Submission(Base): @lazy def plainbody(self, v): - 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

" + if not v or v.id != self.author_id: + if self.deleted_utc != 0 and not v.admin_level >= PERMS['POST_COMMENT_MODERATION']: return "[Deleted by user]" + if self.author.shadowbanned and not v.admin_level >= PERMS['USER_SHADOWBAN']: return "[Deleted by user]" + if self.is_banned and not v.admin_level >= PERMS['POST_COMMENT_MODERATION']: return "[Removed by admins]" + if self.club and not v.paid_dues: return f"{CC} ONLY" body = self.body if not body: return ""