From bdb26bcbc105143178e17143a424bd8f850a5c3c Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 31 Jul 2021 15:52:11 +0200 Subject: [PATCH] fdfdf --- drama/classes/submission.py | 9 ++------- drama/routes/posts.py | 4 ---- drama/templates/submission.html | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/drama/classes/submission.py b/drama/classes/submission.py index de618c4bf..9c906f638 100644 --- a/drama/classes/submission.py +++ b/drama/classes/submission.py @@ -56,7 +56,7 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing): backref="submissions") domain_ref = Column(Integer, ForeignKey("domains.id")) domain_obj = relationship("Domain") - flags = relationship("Flag", lazy="dynamic") + flags = relationship("Flag", lazy="dynamic").order_by(Flag.created_utc).all() is_approved = Column(Integer, ForeignKey("users.id"), default=0) over_18 = Column(Boolean, default=False) author = relationship( @@ -415,16 +415,11 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing): def is_image(self): if self.url: return self.url.lower().endswith('.jpg') or self.url.lower().endswith('.png') or self.url.lower().endswith('.gif') or self.url.lower().endswith('.jpeg') or self.url.lower().endswith('?maxwidth=9999') or self.url.lower().endswith('?maxwidth=8888') else: return False - - @property - @lazy - def ordered_flags(self): - return self.flags.order_by(Flag.created_utc).all() @property @lazy def active_flags(self): - return self.flags.count() + return len(self.flags) class SaveRelationship(Base, Stndrd): diff --git a/drama/routes/posts.py b/drama/routes/posts.py index e736b5017..82b29ed0a 100644 --- a/drama/routes/posts.py +++ b/drama/routes/posts.py @@ -73,10 +73,6 @@ def post_id(pid, anything=None, v=None): post = get_post(pid, v=v) - print(post.flags) - print("sex") - print(post.flags.order_by(Flag.created_utc).all()) - if v: votes = g.db.query(CommentVote).filter_by(user_id=v.id).subquery() diff --git a/drama/templates/submission.html b/drama/templates/submission.html index 5127d1a0d..44fcc0e7e 100644 --- a/drama/templates/submission.html +++ b/drama/templates/submission.html @@ -489,7 +489,7 @@ Reported by: