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

Use reddit-style notifs without context

Browse source 
The notifications schema is already set up for reddit-style
chronological notifications. We simply have to remove the logic that
builds the context and patch up a few places in the frontend that
were expecting full reply trees.

`Comment.header_msg` previously expected the user's own comment to
be top-level in comment replies. Logic is revised to expect the actual
reply.

`files.routes.front.notifications_main` now has reduced query volume
because we aren't expiring the session when marking notifications read.
This also allows us to remove the unused `comms` variable, which is a
makeshift "pattern" of storing duplicate database replies across a
commit so the templates don't requery (thus losing data attached to
the runtime object, like `c.unread` / `c.notif_utc`).

We move the `is_notification_page` flag to the route callers rather
than templates checking `request.path`.

Minor UI style: "Clear all notifications" -> "Mark All Read", since
this was a persistent point of user confusion upstream, with people
expecting their inbox to empty out. Also less margin between notifs
to be consistent with tighter comment display elsewhere and removed
need to separate groups of comments vs single comments.
This commit is contained in:
TLSM 2023-07-12 00:11:24 -04:00 • committed by Ben Rog-Wilhelm
parent 695e6b6dbd
commit 6fde14a92c
4 changed files with 19 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

50
files/routes/front.py
View file

@ -62,47 +62,17 @@ def notifications_main(v: User):
next_exists = (len(comments) > 25)
comments = comments[:25]
cids = [x[0].id for x in comments]
comms = get_comments(cids, v=v)
listing = []
for c, n in comments:
if n.created_utc > 1620391248: c.notif_utc = n.created_utc
if not n.read:
n.read = True
c.unread = True
g.db.add(n)
c.notif_utc = n.created_utc
c.unread = not n.read
n.read = True
if c.parent_submission:
if c.replies2 == None:
c.replies2 = (c.child_comments
.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids)))
.order_by(Comment.created_utc.desc()).all())
for x in c.replies2:
if x.replies2 == None: x.replies2 = []
count = 0
while (count < 50 and c.parent_comment
and (c.parent_comment.author_id == v.id or c.parent_comment.id in cids)):
count += 1
c = c.parent_comment
if c.replies2 == None:
c.replies2 = (c.child_comments
.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids)))
.order_by(Comment.created_utc.desc()).all())
for x in c.replies2:
if x.replies2 == None:
x.replies2 = (x.child_comments
.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids)))
.order_by(Comment.created_utc.desc()).all())
else:
while c.parent_comment:
c = c.parent_comment
c.replies2 = c.child_comments.order_by(Comment.id).all()
if c not in listing: listing.append(c)
listing: list[Comment] = [c for c, _ in comments]
# TODO: commit after request rendered, then default session expiry is fine
g.db.expire_on_commit = False
g.db.commit()
g.db.expire_on_commit = True
if request.headers.get("Authorization"):
return {"data": [x.json for x in listing]}
@ -113,7 +83,8 @@ def notifications_main(v: User):
next_exists=next_exists,
page=page,
standalone=True,
render_replies=True,
render_replies=False,
is_notification_page=True,
)
@ -153,6 +124,7 @@ def notifications_posts(v: User):
page=page,
standalone=True,
render_replies=True,
is_notification_page=True,
)
@ -177,6 +149,7 @@ def notifications_modmail(v: User):
page=page,
standalone=True,
render_replies=True,
is_notification_page=True,
)
@ -210,6 +183,7 @@ def notifications_messages(v: User):
page=page,
standalone=True,
render_replies=True,
is_notification_page=True,
)