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

fsd

Browse source
This commit is contained in:
Aevann1 2022-04-04 02:32:19 +02:00
parent 126a213f56
commit b205c45f30
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
files/routes/front.py
View file

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