From 3b8188fd675490f2aef60697c79274d699993094 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 26 Jun 2022 03:22:05 +0200 Subject: [PATCH] fixed version of d83d47e280586ed3a8d49bc122ab009753895569 --- docker-compose.yml | 2 +- files/classes/comment.py | 6 +++--- files/classes/submission.py | 3 +-- files/classes/user.py | 8 ++++++++ files/helpers/get.py | 12 ++++-------- files/routes/comments.py | 6 +++--- files/routes/posts.py | 14 +++++++------- files/templates/comments.html | 8 +++----- files/templates/submission.html | 6 +----- files/templates/submission_banned.html | 2 +- files/templates/submission_listing.html | 4 ---- 11 files changed, 32 insertions(+), 39 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ac99b2d20..b53fb74b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: postgres: image: postgres:12.3 - # command: ["postgres", "-c", "log_statement=all"] + command: ["postgres", "-c", "log_statement=all"] # uncomment this if u wanna output all SQL queries to the console volumes: - "./schema.sql:/docker-entrypoint-initdb.d/00-schema.sql" diff --git a/files/classes/comment.py b/files/classes/comment.py index 32e9e3ef0..7cb0d6137 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -134,7 +134,7 @@ class Comment(Base): @lazy def total_choice_voted(self, v): if v: - return g.db.query(CommentVote).filter(CommentVote.user_id == v.id, CommentVote.comment_id.in_([x.id for x in self.choices])).all() + return g.db.query(CommentVote).filter(CommentVote.user_id == v.id, CommentVote.comment_id.in_([x.id for x in self.choices])).count() return False @property @@ -247,7 +247,7 @@ class Comment(Base): if not self.parent_submission: return [x for x in self.child_comments.order_by(Comment.id) if not x.author.shadowbanned] - comments = self.child_comments.filter(Comment.author_id.notin_((AUTOPOLLER_ID, AUTOBETTER_ID, AUTOCHOICE_ID))) + comments = self.child_comments.filter(Comment.author_id.notin_(poll_bots)) comments = sort_comments(sort, comments) return [x for x in comments if not x.author.shadowbanned] @@ -258,7 +258,7 @@ class Comment(Base): if not self.parent_submission: return self.child_comments.order_by(Comment.id).all() - comments = self.child_comments.filter(Comment.author_id.notin_((AUTOPOLLER_ID, AUTOBETTER_ID, AUTOCHOICE_ID))) + comments = self.child_comments.filter(Comment.author_id.notin_(poll_bots)) return sort_comments(sort, comments).all() diff --git a/files/classes/submission.py b/files/classes/submission.py index 11fc38571..a9a7abe22 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -74,7 +74,6 @@ class Submission(Base): approved_by = relationship("User", uselist=False, primaryjoin="Submission.is_approved==User.id", viewonly=True) awards = relationship("AwardRelationship", order_by="AwardRelationship.awarded_utc.desc()", viewonly=True) reports = relationship("Flag", viewonly=True) - comments = relationship("Comment", primaryjoin="Comment.parent_submission==Submission.id") subr = relationship("Sub", primaryjoin="foreign(Submission.sub)==remote(Sub.name)", viewonly=True) bump_utc = deferred(Column(Integer, server_default=FetchedValue())) @@ -128,7 +127,7 @@ class Submission(Base): @lazy def total_choice_voted(self, v): if v and self.choices: - return g.db.query(CommentVote).filter(CommentVote.user_id == v.id, CommentVote.comment_id.in_([x.id for x in self.choices])).all() + return g.db.query(CommentVote).filter(CommentVote.user_id == v.id, CommentVote.comment_id.in_([x.id for x in self.choices])).count() return False @lazy diff --git a/files/classes/user.py b/files/classes/user.py index 682a8092f..5f8cc96df 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -480,6 +480,7 @@ class User(Base): @property @lazy def modaction_notifications_count(self): + if not self.admin_level: return 0 return g.db.query(Notification).join(Comment).filter( Notification.user_id == self.id, Notification.read == False, Comment.is_banned == False, Comment.deleted_utc == 0, @@ -489,6 +490,7 @@ class User(Base): @property @lazy def reddit_notifications_count(self): + if not self.can_view_offsitementions: return 0 return g.db.query(Notification).join(Comment).filter( Notification.user_id == self.id, Notification.read == False, Comment.is_banned == False, Comment.deleted_utc == 0, @@ -703,6 +705,9 @@ class User(Base): def saved_idlist(self, page=1): saved = [x[0] for x in g.db.query(SaveRelationship.submission_id).filter_by(user_id=self.id).all()] + + if not saved: return [] + posts = g.db.query(Submission.id).filter(Submission.id.in_(saved), Submission.is_banned == False, Submission.deleted_utc == 0) if self.admin_level < 2: @@ -714,6 +719,9 @@ class User(Base): def saved_comment_idlist(self, page=1): saved = [x[0] for x in g.db.query(CommentSaveRelationship.comment_id).filter_by(user_id=self.id).all()] + + if not saved: return [] + comments = g.db.query(Comment.id).filter(Comment.id.in_(saved), Comment.is_banned == False, Comment.deleted_utc == 0) if self.admin_level < 2: diff --git a/files/helpers/get.py b/files/helpers/get.py index f3504f8bf..919a37484 100644 --- a/files/helpers/get.py +++ b/files/helpers/get.py @@ -120,8 +120,7 @@ def get_post(i, v=None, graceful=False): else: abort(404) if v: - vt = g.db.query(Vote).filter_by( - user_id=v.id, submission_id=i).subquery() + vt = g.db.query(Vote).filter_by(user_id=v.id, submission_id=i).subquery() blocking = v.blocking.subquery() post = g.db.query( @@ -166,7 +165,7 @@ def get_posts(pids, v=None): return [] if v: - vt = g.db.query(Vote).filter( + vt = g.db.query(Vote.vote_type, Vote.submission_id).filter( Vote.submission_id.in_(pids), Vote.user_id==v.id ).subquery() @@ -228,8 +227,7 @@ def get_comment(i, v=None, graceful=False): ) ).first() - vts = g.db.query(CommentVote).filter_by(user_id=v.id, comment_id=comment.id) - vt = g.db.query(CommentVote).filter_by(user_id=v.id, comment_id=comment.id).one_or_none() + vt = g.db.query(CommentVote.vote_type).filter_by(user_id=v.id, comment_id=comment.id).one_or_none() comment.is_blocking = block and block.user_id == v.id comment.is_blocked = block and block.target_id == v.id comment.voted = vt.vote_type if vt else 0 @@ -242,7 +240,7 @@ def get_comments(cids, v=None, load_parent=False): if not cids: return [] if v: - votes = g.db.query(CommentVote).filter_by(user_id=v.id).subquery() + votes = g.db.query(CommentVote.vote_type, CommentVote.comment_id).filter_by(user_id=v.id).subquery() blocking = v.blocking.subquery() @@ -286,8 +284,6 @@ def get_comments(cids, v=None, load_parent=False): if load_parent: parents = [x.parent_comment_id for x in output if x.parent_comment_id] parents = get_comments(parents, v=v) - parents = {x.id: x for x in parents} - for c in output: c.sex = parents.get(c.parent_comment_id) return sorted(output, key=lambda x: cids.index(x.id)) diff --git a/files/routes/comments.py b/files/routes/comments.py index 8ba3d8985..12c09ba13 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -117,7 +117,7 @@ def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None): sort=request.values.get("sort", defaultsortingcomments) if v: - votes = g.db.query(CommentVote).filter_by(user_id=v.id).subquery() + votes = g.db.query(CommentVote.vote_type, CommentVote.comment_id).filter_by(user_id=v.id).subquery() blocking = v.blocking.subquery() @@ -134,8 +134,8 @@ def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None): comments = comments.join(User, User.id == Comment.author_id).filter(User.shadowbanned == None) comments=comments.filter( - Comment.parent_submission == post.id, - Comment.author_id.notin_((AUTOPOLLER_ID, AUTOBETTER_ID, AUTOCHOICE_ID)) + Comment.top_comment_id == c.top_comment_id, + Comment.author_id.notin_(poll_bots) ).join( votes, votes.c.comment_id == Comment.id, diff --git a/files/routes/posts.py b/files/routes/posts.py index c84d6865d..0daf8c01f 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -147,7 +147,7 @@ def post_id(pid, anything=None, v=None, sub=None): if post.club and not (v and (v.paid_dues or v.id == post.author_id)): abort(403) if v: - votes = g.db.query(CommentVote).filter_by(user_id=v.id).subquery() + votes = g.db.query(CommentVote.vote_type, CommentVote.comment_id).filter_by(user_id=v.id).subquery() blocking = v.blocking.subquery() @@ -163,7 +163,7 @@ def post_id(pid, anything=None, v=None, sub=None): if not (v and v.shadowbanned) and not (v and v.admin_level >= 2): comments = comments.join(User, User.id == Comment.author_id).filter(User.shadowbanned == None) - comments=comments.filter(Comment.parent_submission == post.id, Comment.author_id.notin_((AUTOPOLLER_ID, AUTOBETTER_ID, AUTOCHOICE_ID))).join( + comments=comments.filter(Comment.parent_submission == post.id, Comment.author_id.notin_(poll_bots)).join( votes, votes.c.comment_id == Comment.id, isouter=True @@ -197,7 +197,7 @@ def post_id(pid, anything=None, v=None, sub=None): else: pinned = g.db.query(Comment).filter(Comment.parent_submission == post.id, Comment.stickied != None).all() - comments = g.db.query(Comment).join(User, User.id == Comment.author_id).filter(User.shadowbanned == None, Comment.parent_submission == post.id, Comment.author_id.notin_((AUTOPOLLER_ID, AUTOBETTER_ID, AUTOCHOICE_ID)), Comment.level == 1, Comment.stickied == None) + comments = g.db.query(Comment).join(User, User.id == Comment.author_id).filter(User.shadowbanned == None, Comment.parent_submission == post.id, Comment.author_id.notin_(poll_bots), Comment.level == 1, Comment.stickied == None) comments = sort_comments(sort, comments) @@ -259,7 +259,7 @@ def viewmore(v, pid, sort, offset): except: abort(400) if v: - votes = g.db.query(CommentVote).filter_by(user_id=v.id).subquery() + votes = g.db.query(CommentVote.vote_type, CommentVote.comment_id).filter_by(user_id=v.id).subquery() blocking = v.blocking.subquery() @@ -270,7 +270,7 @@ def viewmore(v, pid, sort, offset): votes.c.vote_type, blocking.c.target_id, blocked.c.target_id, - ).filter(Comment.parent_submission == pid, Comment.author_id.notin_((AUTOPOLLER_ID, AUTOBETTER_ID, AUTOCHOICE_ID)), Comment.stickied == None, Comment.id.notin_(ids)) + ).filter(Comment.parent_submission == pid, Comment.author_id.notin_(poll_bots), Comment.stickied == None, Comment.id.notin_(ids)) if not (v and v.shadowbanned) and not (v and v.admin_level >= 2): comments = comments.join(User, User.id == Comment.author_id).filter(User.shadowbanned == None) @@ -305,7 +305,7 @@ def viewmore(v, pid, sort, offset): second = [c[0] for c in comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None, Comment.wordle_result != None), func.length(Comment.body_html) <= 100).all()] comments = first + second else: - comments = g.db.query(Comment).join(User, User.id == Comment.author_id).filter(User.shadowbanned == None, Comment.parent_submission == pid, Comment.author_id.notin_((AUTOPOLLER_ID, AUTOBETTER_ID, AUTOCHOICE_ID)), Comment.level == 1, Comment.stickied == None, Comment.id.notin_(ids)) + comments = g.db.query(Comment).join(User, User.id == Comment.author_id).filter(User.shadowbanned == None, Comment.parent_submission == pid, Comment.author_id.notin_(poll_bots), Comment.level == 1, Comment.stickied == None, Comment.id.notin_(ids)) comments = sort_comments(sort, comments) @@ -346,7 +346,7 @@ def morecomments(v, cid): tcid = g.db.query(Comment.top_comment_id).filter_by(id=cid).one_or_none()[0] if v: - votes = g.db.query(CommentVote).filter_by(user_id=v.id).subquery() + votes = g.db.query(CommentVote.vote_type, CommentVote.comment_id).filter_by(user_id=v.id).subquery() blocking = v.blocking.subquery() diff --git a/files/templates/comments.html b/files/templates/comments.html index 3feb22d82..bf18de754 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -207,9 +207,7 @@ {% if c.author.verified %} {% endif %} - {% if not c.author %} - {{c.print()}} - {% endif %} + {% if c.author.is_cakeday %} @@ -877,7 +875,7 @@ lastCount = comments['{{p.id}}'] if (lastCount) { - {% for c in p.comments %} + {% for c in p.replies %} {% if not (v and v.id==c.author_id) and not c.voted %} if ({{c.created_utc*1000}} > lastCount.t) try {document.getElementById("comment-{{c.id}}-only").classList.add('unread')} @@ -908,7 +906,7 @@ lastCount = comments['{{p.id}}'] if (lastCount) { - {% for c in p.comments %} + {% for c in p.replies %} {% if not (v and v.id==c.author_id) and not c.voted %} if ({{c.created_utc*1000}} > lastCount.t) try {document.getElementById("comment-{{c.id}}-only").classList.add('unread')} diff --git a/files/templates/submission.html b/files/templates/submission.html index 7d4ebdef4..48c3adbce 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -732,10 +732,6 @@ {% if p.over_18 %}+18{% endif %} {% if p.private %}Draft{% endif %} {% if p.active_flags(v) %}{{p.active_flags(v)}} Report{{ help.plural(p.active_flags(v)) }}{% endif %} - - {% if not p.author %} - {{p.print()}} - {% endif %} {% if p.ghost %} 👻 @@ -1127,7 +1123,7 @@ lastCount = comments['{{p.id}}'] if (lastCount) { - {% for c in p.comments %} + {% for c in p.replies %} {% if not (v and v.id==c.author_id) and not c.voted %} if ({{c.created_utc*1000}} > lastCount.t) try {document.getElementById("comment-{{c.id}}-only").classList.add('unread')} diff --git a/files/templates/submission_banned.html b/files/templates/submission_banned.html index 18bd934f2..60c7a31cd 100644 --- a/files/templates/submission_banned.html +++ b/files/templates/submission_banned.html @@ -94,7 +94,7 @@ lastCount = comments['{{p.id}}'] if (lastCount) { - {% for c in p.comments %} + {% for c in p.replies %} {% if not (v and v.id==c.author_id) and not c.voted %} if ({{c.created_utc*1000}} > lastCount.t) try {document.getElementById("comment-{{c.id}}-only").classList.add('unread')} diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index fb5c3ba45..f3b7e4f46 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -180,10 +180,6 @@ {% if p.private %}Draft{% endif %} {% if p.active_flags(v) %}{{p.active_flags(v)}} Report{{ help.plural(p.active_flags(v)) }}{% endif %} - {% if not p.author %} - {{p.print()}} - {% endif %} - {% if p.ghost %} 👻 {% else %}