From 56506b1c7a53ec865b0a0187416eb7a2d3b82886 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Sat, 19 Nov 2022 04:49:48 -0600 Subject: [PATCH] fix syntax error --- files/classes/comment.py | 2 ++ files/templates/submission.html | 10 +++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/files/classes/comment.py b/files/classes/comment.py index 76fde1a90..950479acd 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -244,6 +244,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.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 "" body = self.body_html or "" @@ -299,6 +300,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.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 "" body = self.body diff --git a/files/templates/submission.html b/files/templates/submission.html index b5aaa8cae..684e6956a 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -3,14 +3,10 @@ {% set downs=p.downvotes %} {% set score=ups-downs %} -{% if v %} - {% set voted=p.voted if p.voted else 0 %} -{% else %} - {% set voted=-2 %} -{% endif %} +{% set voted = p.voted if v else -2 %} {% set v_forbid_deleted = (not v and v.id == p.author_id) and - ((p.deleted_utc != 0 and not v.admin_level >= PERMS['POST_COMMENT_MODERATION']) or - (p.author.shadowbanned) and not v.admin_level >= PERMS['USER_SHADOWBAN'])) %} + ((p.deleted_utc != 0 or p.is_banned) and not v.admin_level >= PERMS['POST_COMMENT_MODERATION']) or + (p.author.shadowbanned) and not v.admin_level >= PERMS['USER_SHADOWBAN']) %} {% block title %}