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

dfs

Browse source
This commit is contained in:
Aevann1 2022-01-29 15:53:45 +02:00
parent 8674d4f4c7
commit aeadd31521
1 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
files/classes/user.py
View file

@ -548,23 +548,11 @@ class User(Base):
posts = g.db.query(Subscription.submission_id).filter_by(user_id=self.id).all() posts = g.db.query(Subscription.submission_id).filter_by(user_id=self.id).all()
return [x[0] for x in posts] return [x[0] for x in posts]
@property
@lazy
def saved_count(self):
return g.db.query(SaveRelationship.submission_id).filter(SaveRelationship.user_id == self.id, SaveRelationship.submission_id != None).count()
@property
@lazy
def saved_comment_count(self):
return g.db.query(SaveRelationship.comment_id).filter(SaveRelationship.user_id == self.id, SaveRelationship.comment_id != None).count()
@lazy @lazy
def saved_idlist(self, page=1): def saved_idlist(self, page=1):
posts = g.db.query(Submission.id).filter_by(is_banned=False, deleted_utc=0)
saved = [x[0] for x in g.db.query(SaveRelationship.submission_id).filter(SaveRelationship.user_id == self.id).all()] saved = [x[0] for x in g.db.query(SaveRelationship.submission_id).filter(SaveRelationship.user_id == self.id).all()]
posts = posts.filter(Submission.id.in_(saved)) posts = g.db.query(Submission.id).filter(Submission.id.in_(saved), Submission.is_banned == False, Submission.deleted_utc == 0)
if self.admin_level == 0: if self.admin_level == 0:
blocking = [x[0] for x in g.db.query( blocking = [x[0] for x in g.db.query(
@ -579,16 +567,14 @@ class User(Base):
Submission.author_id.notin_(blocked) Submission.author_id.notin_(blocked)
) )
posts = posts.order_by(Submission.created_utc.desc()) return [x[0] for x in posts.order_by(Submission.created_utc.desc()).offset(25 * (page - 1)).all()]
return [x[0] for x in posts.offset(25 * (page - 1)).limit(26).all()]
@lazy @lazy
def saved_comment_idlist(self): def saved_comment_idlist(self):
try: saved = [x[0] for x in g.db.query(SaveRelationship.comment_id).filter(SaveRelationship.user_id == self.id).all()] try: saved = [x[0] for x in g.db.query(SaveRelationship.comment_id).filter(SaveRelationship.user_id == self.id).all()]
except: return [] except: return []
comments = g.db.query(Comment.id).filter(Comment.id.in_(saved)) comments = g.db.query(Comment.id).filter(Comment.id.in_(saved), Comment.is_banned == False, Comment.deleted_utc == 0)
if self.admin_level == 0: if self.admin_level == 0:
blocking = [x[0] for x in g.db.query( blocking = [x[0] for x in g.db.query(
@ -605,6 +591,16 @@ class User(Base):
return [x[0] for x in comments.order_by(Comment.created_utc.desc()).all()] return [x[0] for x in comments.order_by(Comment.created_utc.desc()).all()]
@property
@lazy
def saved_count(self):
return len(self.saved_idlist())
@property
@lazy
def saved_comment_count(self):
return len(self.saved_comment_idlist())
@property @property
@lazy @lazy
def filter_words(self): def filter_words(self):