rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

fix for [Deleted by user]

pull/20/head
justcool393 2022-11-19 04:09:57 -06:00
parent fa62487587
commit 7b1cdc8b7f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/classes/comment.py
View File

@ -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"<p>{CC} ONLY</p>"
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

8
files/classes/submission.py
View File

@ -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"<p>{CC} ONLY</p>"
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"<p>{CC} ONLY</p>"
body = self.body