carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

fds

master
Aevann1 2022-04-04 02:59:22 +02:00
parent 4215e3079d
commit 4b4d78b35c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/routes/front.py
View File

@ -117,13 +117,13 @@ def notifications(v):
print("2: " + str(time.time() - t), flush=True)
cids = set([x[0] for x in g.db.query(Comment.id).join(Notification).filter(
cids = set(x[0] for x in g.db.query(Comment.id).join(Notification).filter(
Notification.user_id == v.id,
Comment.is_banned == False,
Comment.deleted_utc == 0,
Comment.author_id != AUTOJANNY_ID,
Comment.body_html.notlike('<html><body><p>New rdrama mention: <a href="https://old.reddit.com/r/%')
).order_by(Comment.top_comment_id.desc()).limit(1000).all()] + [x.id for x in comments])
).order_by(Comment.top_comment_id.desc()).all())
print("3: " + str(time.time() - t), flush=True)
@ -135,13 +135,13 @@ def notifications(v):
for c in comments:
if c.parent_submission:
if c.replies2 == None:
c.replies2 = c.child_comments.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids))).all()
c.replies2 = c.child_comments.filter(Comment.author_id == v.id).all()
for x in c.replies2:
if x.replies2 == None: x.replies2 = []
while c.parent_comment and (c.parent_comment.author_id == v.id or c.parent_comment.id in cids):
c = c.parent_comment
if c.replies2 == None:
c.replies2 = c.child_comments.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids))).all()
c.replies2 = c.child_comments.filter(Comment.author_id == v.id).all()
for x in c.replies2:
if x.replies2 == None: x.replies2 = []