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

fdfd

Browse source
This commit is contained in:
Aevann1 2021-09-17 14:04:36 +02:00
parent ab9eaec610
commit 3737c41a08
6 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

20
files/classes/user.py
View file

@ -353,8 +353,8 @@ class User(Base, Stndrd, Age_times):
awards = {}
posts_idlist = g.db.query(Submission.id).options(lazyload('*')).filter_by(author_id=self.id).subquery()
comments_idlist = g.db.query(Comment.id).options(lazyload('*')).filter_by(author_id=self.id).subquery()
posts_idlist = g.db.query(Submission.id).options(lazyload('*')).filter_by(author_id=self.id).all()
comments_idlist = g.db.query(Comment.id).options(lazyload('*')).filter_by(author_id=self.id).all()
post_awards = g.db.query(AwardRelationship).options(lazyload('*')).filter(AwardRelationship.submission_id.in_(posts_idlist)).all()
comment_awards = g.db.query(AwardRelationship).options(lazyload('*')).filter(AwardRelationship.comment_id.in_(comments_idlist)).all()
@ -393,7 +393,7 @@ class User(Base, Stndrd, Age_times):
Alt.user1 == self.id,
Alt.user2 == self.id
)
).subquery()
).all()
data = g.db.query(
User,
@ -424,7 +424,7 @@ class User(Base, Stndrd, Age_times):
Alt.user1 == self.id,
Alt.user2 == self.id
)
).subquery()
).all()
data = db.query(
User,
@ -563,16 +563,16 @@ class User(Base, Stndrd, Age_times):
deleted_utc=0
)
saved = g.db.query(SaveRelationship.submission_id).options(lazyload('*')).filter(SaveRelationship.user_id == self.id).subquery()
saved = g.db.query(SaveRelationship.submission_id).options(lazyload('*')).filter(SaveRelationship.user_id == self.id).all()
posts = posts.filter(Submission.id.in_(saved))
if self.admin_level == 0:
blocking = g.db.query(
UserBlock.target_id).filter_by(
user_id=self.id).subquery()
user_id=self.id).all()
blocked = g.db.query(
UserBlock.user_id).filter_by(
target_id=self.id).subquery()
target_id=self.id).all()
posts = posts.filter(
Submission.author_id.notin_(blocking),
@ -587,16 +587,16 @@ class User(Base, Stndrd, Age_times):
comments = g.db.query(Comment.id).options(lazyload('*')).options(lazyload('*')).filter_by(is_banned=False, deleted_utc=0)
saved = g.db.query(SaveRelationship.submission_id).options(lazyload('*')).filter(SaveRelationship.user_id == self.id).subquery()
saved = g.db.query(SaveRelationship.submission_id).options(lazyload('*')).filter(SaveRelationship.user_id == self.id).all()
comments = comments.filter(Comment.id.in_(saved))
if self.admin_level == 0:
blocking = g.db.query(
UserBlock.target_id).filter_by(
user_id=self.id).subquery()
user_id=self.id).all()
blocked = g.db.query(
UserBlock.user_id).filter_by(
target_id=self.id).subquery()
target_id=self.id).all()
comments = comments.filter(
Comment.author_id.notin_(blocking),