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

gfMerge branch 'frost' of https://github.com/Aevann1/Drama into frost

remotes/1693045480750635534/spooky-22
Aevann1 2022-03-04 21:26:45 +00:00
parent 59071d3cb3 e0d602bd1b
commit 45157a0f54
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/classes/comment.py
View File

@ -86,12 +86,16 @@ class Comment(Base):
@property
@lazy
def options(self):
return [x for x in self.child_comments if x.author_id == AUTOPOLLER_ID]
li = [x for x in self.child_comments if x.author_id == AUTOPOLLER_ID]
return sorted(li, key=lambda x: x.id)
@property
@lazy
def choices(self):
return [x for x in self.child_comments if x.author_id == AUTOCHOICE_ID]
li = [x for x in self.child_comments if x.author_id == AUTOCHOICE_ID]
return sorted(li, key=lambda x: x.id)
def total_poll_voted(self, v):
if v:

6
files/classes/submission.py
View File

@ -88,12 +88,14 @@ class Submission(Base):
@property
@lazy
def options(self):
return g.db.query(Comment).filter_by(parent_submission = self.id, author_id = AUTOPOLLER_ID, level=1)
return g.db.query(Comment).filter_by(parent_submission = self.id, author_id = AUTOPOLLER_ID, level=1).order_by(Comment.id)
@property
@lazy
def choices(self):
return g.db.query(Comment).filter_by(parent_submission = self.id, author_id = AUTOCHOICE_ID, level=1)
return g.db.query(Comment).filter_by(parent_submission = self.id, author_id = AUTOCHOICE_ID, level=1).order_by(Comment.id)
@property
@lazy