skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'frost' into enhancement-refactor-comments-html

Browse source
This commit is contained in:
justcool393 2023-03-14 10:54:01 -07:00 • committed by GitHub
commit e58e3f7719
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
files/classes/comment.py
View file

@ -9,6 +9,7 @@ from sqlalchemy.orm import relationship
from files.__main__ import Base, app
from files.classes.votes import CommentVote
from files.helpers.const import *
from files.helpers.content import moderated_body
from files.helpers.lazy import lazy
from .flags import CommentFlag
from random import randint
@ -357,6 +358,8 @@ class Comment(Base):
return data
def realbody(self, v):
moderated:Optional[str] = moderated_body(self, v)
if moderated: return moderated
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])): return f"<p>{CC} ONLY</p>"
body = self.body_html or ""
@ -397,6 +400,8 @@ class Comment(Base):
return body
def plainbody(self, v):
moderated:Optional[str] = moderated_body(self, v)
if moderated: return moderated
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])): return f"<p>{CC} ONLY</p>"
body = self.body
if not body: return ""