diff --git a/files/classes/user.py b/files/classes/user.py index 6537b7e9b..4cfccc605 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -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).all() - comments_idlist = g.db.query(Comment.id).options(lazyload('*')).filter_by(author_id=self.id).all() + posts_idlist = [x[0] for x in g.db.query(Submission.id).options(lazyload('*')).filter_by(author_id=self.id).all()] + comments_idlist = [x[0] for x in 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() @@ -563,7 +563,7 @@ 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 = [x[0] for x in 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: @@ -587,7 +587,7 @@ 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 = [x[0] for x in 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: diff --git a/files/helpers/filters.py b/files/helpers/filters.py index d6f5658ef..fb607255e 100644 --- a/files/helpers/filters.py +++ b/files/helpers/filters.py @@ -30,8 +30,7 @@ def filter_comment_html(html_text): domain_list.add(new_domain) # search db for domain rules that prohibit commenting - bans = [ - x for x in g.db.query(BannedDomain).options(lazyload('*')).filter(BannedDomain.domain.in_(list(domain_list))).all()] + bans = [x for x in g.db.query(BannedDomain).options(lazyload('*')).filter(BannedDomain.domain.in_(list(domain_list))).all()] if bans: return bans