LibertaCasa/takahe
Archived
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix notification pagination

Browse Source
This commit is contained in:
Andrew Godwin 2022-12-11 13:37:58 -07:00
parent 20239b5cb7
commit d5a6cbedd3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/views/notifications.py
View File

@ -1,4 +1,4 @@
from activities.models import PostInteraction, TimelineEvent from activities.models import Post, PostInteraction, TimelineEvent
from api import schemas from api import schemas
from api.decorators import identity_required from api.decorators import identity_required
from api.views.base import api_router from api.views.base import api_router
@ -38,16 +38,16 @@ def notifications(
.select_related("subject_post", "subject_post__author", "subject_identity") .select_related("subject_post", "subject_post__author", "subject_identity")
) )
if max_id: if max_id:
anchor_event = TimelineEvent.objects.get(pk=max_id) anchor_post = Post.objects.get(pk=max_id)
events = events.filter(created__lt=anchor_event.created) events = events.filter(created__lt=anchor_post.created)
if since_id: if since_id:
anchor_event = TimelineEvent.objects.get(pk=since_id) anchor_post = Post.objects.get(pk=since_id)
events = events.filter(created__gt=anchor_event.created) events = events.filter(created__gt=anchor_post.created)
if min_id: if min_id:
# Min ID requires LIMIT events _immediately_ newer than specified, so we # Min ID requires LIMIT events _immediately_ newer than specified, so we
# invert the ordering to accomodate # invert the ordering to accomodate
anchor_event = TimelineEvent.objects.get(pk=min_id) anchor_post = Post.objects.get(pk=min_id)
events = events.filter(created__gt=anchor_event.created).order_by("created") events = events.filter(created__gt=anchor_post.created).order_by("created")
events = list(events[:limit]) events = list(events[:limit])
interactions = PostInteraction.get_event_interactions(events, request.identity) interactions = PostInteraction.get_event_interactions(events, request.identity)
return [ return [