rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

sdffsd

remotes/1693045480750635534/spooky-22
Aevann1 2021-12-06 19:12:34 +02:00
parent b18c818aba
commit 398c9a3059
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
files/routes/posts.py
View File

@ -247,7 +247,7 @@ def viewmore(v, pid, sort, offset):
if not (v and v.shadowbanned) and not (v and v.admin_level > 1): if not (v and v.shadowbanned) and not (v and v.admin_level > 1):
comments = comments.join(User, User.id == Comment.author_id).filter(User.shadowbanned == None) comments = comments.join(User, User.id == Comment.author_id).filter(User.shadowbanned == None)
comments=comments.filter(Comment.parent_submission == pid, Comment.author_id != AUTOPOLLER_ID).join( comments=comments.filter(Comment.parent_submission == pid, Comment.author_id != AUTOPOLLER_ID, Comment.is_pinned == None).join(
votes, votes,
votes.c.comment_id == Comment.id, votes.c.comment_id == Comment.id,
isouter=True isouter=True
@ -268,10 +268,8 @@ def viewmore(v, pid, sort, offset):
comment.is_blocking = c[2] or 0 comment.is_blocking = c[2] or 0
comment.is_blocked = c[3] or 0 comment.is_blocked = c[3] or 0
output.append(comment) output.append(comment)
pinned = [c[0] for c in comments.filter(Comment.is_pinned != None).all()] comments = comments.filter(Comment.level == 1)
comments = comments.filter(Comment.level == 1, Comment.is_pinned == None)
if sort == "new": if sort == "new":
comments = comments.order_by(Comment.created_utc.desc()) comments = comments.order_by(Comment.created_utc.desc())
@ -305,26 +303,24 @@ def viewmore(v, pid, sort, offset):
comments = comments.all() comments = comments.all()
if len(comments) > 60: comments2 = []
comments2 = [] count = 0
count = 0 post = get_post(pid, v=v)
post = get_post(pid, v=v) if post.created_utc > 1638672040:
if post.created_utc > 1638672040: for comment in comments:
for comment in comments: comments2.append(comment)
comments2.append(comment) count += g.db.query(Comment.id).filter_by(parent_submission=post.id, top_comment_id=comment.id).count() + 1
count += g.db.query(Comment.id).filter_by(parent_submission=post.id, top_comment_id=comment.id).count() + 1 offset += 1
offset += 1 if count > 50: break
if count > 50: break else:
else: for comment in comments:
for comment in comments: comments2.append(comment)
comments2.append(comment) count += g.db.query(Comment.id).filter_by(parent_submission=post.id, parent_comment_id=comment.id).count() + 1
count += g.db.query(Comment.id).filter_by(parent_submission=post.id, parent_comment_id=comment.id).count() + 1 offset += 1
offset += 1 if count > 10: break
if count > 10: break
if len(comments) == len(comments2): offset = None if len(comments) == len(comments2): offset = None
comments = comments2 comments = comments2
else: offset = None
return render_template("comments.html", v=v, comments=comments, render_replies=True, pid=pid, sort=sort, offset=offset) return render_template("comments.html", v=v, comments=comments, render_replies=True, pid=pid, sort=sort, offset=offset)