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

fix api comments (fixes #512)

Browse source
This commit is contained in:
justcool393 2023-02-16 19:35:31 -06:00 • committed by Ben Rog-Wilhelm
parent 50b6e06f62
commit a8013f1089
1 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

29
files/classes/comment.py
View file

@ -302,7 +302,7 @@ class Comment(Base):
@lazy @lazy
def json_core(self): def json_core(self):
if self.is_banned: if self.is_banned:
data= {'is_banned': True, data = {'is_banned': True,
'ban_reason': self.ban_reason, 'ban_reason': self.ban_reason,
'id': self.id, 'id': self.id,
'post': self.post.id if self.post else 0, 'post': self.post.id if self.post else 0,
@ -310,38 +310,27 @@ class Comment(Base):
'parent': self.parent_fullname 'parent': self.parent_fullname
} }
elif self.deleted_utc: elif self.deleted_utc:
data= {'deleted_utc': self.deleted_utc, data = {'deleted_utc': self.deleted_utc,
'id': self.id, 'id': self.id,
'post': self.post.id if self.post else 0, 'post': self.post.id if self.post else 0,
'level': self.level, 'level': self.level,
'parent': self.parent_fullname 'parent': self.parent_fullname
} }
else: else:
data = self.json_raw
if self.level >= 2: data['parent_comment_id']= self.parent_comment_id
data=self.json_raw data['replies'] = [x.json_core for x in self.replies(None)]
if self.level>=2: data['parent_comment_id']= self.parent_comment_id
data['replies']=[x.json_core for x in self.replies(None)]
return data return data
@property @property
@lazy @lazy
def json(self): def json(self):
data = self.json_core
data=self.json_core if self.deleted_utc or self.is_banned: return data
data["author"] = '👻' if self.ghost else self.author.json_core
if self.deleted_utc or self.is_banned: data["post"] = self.post.json_core if self.post else ''
return data
data["author"]='👻' if self.ghost else self.author.json_core
data["post"]=self.post.json_core if self.post else ''
if self.level >= 2:
data["parent"]=self.parent.json_core
return data return data
def realbody(self, v): def realbody(self, v):