Merge branch 'master' into mistletoe

This commit is contained in:
kek7198 2021-12-12 13:43:24 -06:00
commit a0ce359bcc
84 changed files with 21 additions and 25 deletions

View file

@ -481,7 +481,7 @@ class User(Base):
def json(self):
data = self.json_core
data["badges"] = [x.json_core for x in self.badges]
data["badges"] = [x.json for x in self.badges]
data['coins'] = self.coins
data['post_count'] = self.post_count
data['comment_count'] = self.comment_count