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

sfd

remotes/1693045480750635534/spooky-22
Aevann1 2022-04-04 00:26:09 +02:00
parent 9f94a5fac4
commit 1665680523
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
files/routes/front.py
View File

@ -37,6 +37,7 @@ def unread(v):
@app.get("/notifications") @app.get("/notifications")
@auth_required @auth_required
def notifications(v): def notifications(v):
t = time.time()
try: page = int(request.values.get('page', 1)) try: page = int(request.values.get('page', 1))
except: page = 1 except: page = 1
messages = request.values.get('messages') messages = request.values.get('messages')
@ -88,6 +89,13 @@ def notifications(v):
next_exists = (len(notifications) > len(listing)) next_exists = (len(notifications) > len(listing))
else: else:
all = [x.comment_id for x in v.notifications.join(Notification.comment).filter(
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()).all()]
notifications = v.notifications.join(Notification.comment).distinct(Comment.top_comment_id).filter( notifications = v.notifications.join(Notification.comment).distinct(Comment.top_comment_id).filter(
Comment.is_banned == False, Comment.is_banned == False,
Comment.deleted_utc == 0, Comment.deleted_utc == 0,
@ -116,10 +124,9 @@ def notifications(v):
for c in comments: for c in comments:
if c.parent_submission: if c.parent_submission:
while c.parent_comment and (c.parent_comment.author_id == v.id or c.parent_comment in comments): while c.parent_comment and (c.parent_comment.author_id == v.id or c.parent_comment in comments):
parent = c.parent_comment c = c.parent_comment
if parent.replies2 == None: parent.replies2 = [c] c.replies2 = [x for x in c.child_comments if c.author_id == v.id or x.id in all]
elif c not in parent.replies2: parent.replies2.append(c) c.replies2 = [x for x in c.child_comments if c.author_id == v.id or x.id in all]
c = parent
else: else:
while c.parent_comment: while c.parent_comment:
c = c.parent_comment c = c.parent_comment
@ -130,6 +137,7 @@ def notifications(v):
if request.headers.get("Authorization"): return {"data":[x.json for x in listing]} if request.headers.get("Authorization"): return {"data":[x.json for x in listing]}
print(time.time() - t, flush=True)
return render_template("notifications.html", return render_template("notifications.html",
v=v, v=v,
notifications=listing, notifications=listing,