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

sdf

Browse source
This commit is contained in:
Aevann1 2022-04-04 02:39:47 +02:00
parent 1888458a0f
commit 1e4444d8f6
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
files/routes/front.py
View file

@ -117,7 +117,7 @@ def notifications(v):
print("2: " + str(time.time() - t), flush=True) print("2: " + str(time.time() - t), flush=True)
all = 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, Notification.user_id == v.id,
Comment.is_banned == False, Comment.is_banned == False,
Comment.deleted_utc == 0, Comment.deleted_utc == 0,
@ -127,20 +127,21 @@ def notifications(v):
print("3: " + str(time.time() - t), flush=True) print("3: " + str(time.time() - t), flush=True)
cids = set() comms = get_comments(list(cids), v=v)
print("4: " + str(time.time() - t), flush=True)
listing = [] listing = []
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 = c.child_comments.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids))).all()
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 cids):
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 = c.child_comments.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids))).all()
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 = []
@ -152,10 +153,6 @@ def notifications(v):
if c not in listing: listing.append(c) if c not in listing: listing.append(c)
print("4: " + str(time.time() - t), flush=True)
comms = get_comments(list(cids), v=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("5: " + str(time.time() - t), flush=True) print("5: " + str(time.time() - t), flush=True)