Skip to content

Filtering on listNotifications #3225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dholms merged 17 commits into from
Dec 11, 2024
Merged

Filtering on listNotifications #3225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4ddaefd
Add filter param to listNotifications
gaearon Dec 10, 2024
c7644d8
Codegen
gaearon Dec 10, 2024
415a359
Changeset
gaearon Dec 10, 2024
9d1b0ce
update schemas
dholms Dec 10, 2024
219582b
update schemas
dholms Dec 10, 2024
a72dd2a
impl server-side notif pagination
dholms Dec 10, 2024
79f0f89
add notification tests
dholms Dec 10, 2024
3239b5f
tweak schema
dholms Dec 10, 2024
4b1e7e8
merge
dholms Dec 10, 2024
789b4f4
revert lockfile changes
dholms Dec 10, 2024
1190734
dont paginate for unfiltered
dholms Dec 10, 2024
da63617
fix snaps
dholms Dec 10, 2024
63c2615
fix priority notif bug
dholms Dec 11, 2024
78c5a8d
filter -> reasons
dholms Dec 11, 2024
d806813
Merge branch 'notif-filter' into notif-filter-impl
dholms Dec 11, 2024
c30c60f
filter -> reasons
dholms Dec 11, 2024
c566ca7
Merge branch 'main' into notif-filter-impl
dholms Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 54 additions & 2 deletions packages/bsky/src/api/app/bsky/notification/listNotifications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,56 @@ export default function (server: Server, ctx: AppContext) {
})
}

const paginateNotifications = async (opts: {
ctx: Context
priority: boolean
reasons?: string[]
cursor?: string
limit: number
viewer: string
}) => {
const { ctx, priority, reasons, limit, viewer } = opts

// if not filtering, then just pass through the response from dataplane
if (!reasons) {
const res = await ctx.hydrator.dataplane.getNotifications({
actorDid: viewer,
priority,
cursor: opts.cursor,
limit,
})
return {
notifications: res.notifications,
cursor: res.cursor,
}
}

let nextCursor: string | undefined = opts.cursor
let toReturn: Notification[] = []
const maxAttempts = 10
const attemptSize = Math.ceil(limit / 2)
for (let i = 0; i < maxAttempts; i++) {
const res = await ctx.hydrator.dataplane.getNotifications({
actorDid: viewer,
priority,
cursor: nextCursor,
limit,
Comment thread
This conversation was marked as resolved.
})
const filtered = res.notifications.filter((notif) =>
reasons.includes(notif.reason),
)
toReturn = [...toReturn, ...filtered]
nextCursor = res.cursor ?? undefined
if (toReturn.length >= attemptSize || !nextCursor) {
break
}
}
return {
notifications: toReturn,
cursor: nextCursor,
}
}

const skeleton = async (
input: SkeletonFnInput<Context, Params>,
): Promise<SkeletonState> => {
Expand All @@ -56,11 +106,13 @@ const skeleton = async (
return { notifs: [], priority }
}
const [res, lastSeenRes] = await Promise.all([
ctx.hydrator.dataplane.getNotifications({
actorDid: viewer,
paginateNotifications({
ctx,
priority,
reasons: params.reasons,
cursor: params.cursor,
limit: params.limit,
viewer,
}),
ctx.hydrator.dataplane.getNotificationSeen({
actorDid: viewer,
Expand Down
257 changes: 257 additions & 0 deletions packages/bsky/tests/views/__snapshots__/notifications.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1263,6 +1263,263 @@ Array [
]
`;

exports[`notification views filters notifications by multiple reasons 1`] = `
Object {
"notifications": Array [
Object {
"author": Object {
"did": "user(0)",
"handle": "carol.test",
"labels": Array [],
"viewer": Object {
"blockedBy": false,
"followedBy": "record(2)",
"following": "record(1)",
"muted": false,
},
},
"cid": "cids(0)",
"indexedAt": "1970-01-01T00:00:00.000Z",
"isRead": false,
"labels": Array [],
"reason": "reply",
"reasonSubject": "record(3)",
"record": Object {
"$type": "app.bsky.feed.post",
"createdAt": "1970-01-01T00:00:00.000Z",
"reply": Object {
"parent": Object {
"cid": "cids(2)",
"uri": "record(3)",
},
"root": Object {
"cid": "cids(1)",
"uri": "record(4)",
},
},
"text": "indeed",
},
"uri": "record(0)",
},
Object {
"author": Object {
"did": "user(0)",
"handle": "carol.test",
"labels": Array [],
"viewer": Object {
"blockedBy": false,
"followedBy": "record(2)",
"following": "record(1)",
"muted": false,
},
},
"cid": "cids(3)",
"indexedAt": "1970-01-01T00:00:00.000Z",
"isRead": false,
"labels": Array [],
"reason": "reply",
"reasonSubject": "record(4)",
"record": Object {
"$type": "app.bsky.feed.post",
"createdAt": "1970-01-01T00:00:00.000Z",
"reply": Object {
"parent": Object {
"cid": "cids(1)",
"uri": "record(4)",
},
"root": Object {
"cid": "cids(1)",
"uri": "record(4)",
},
},
"text": "of course",
},
"uri": "record(5)",
},
Object {
"author": Object {
"avatar": "https://bsky.public.url/img/avatar/plain/user(2)/cids(5)@jpeg",
"createdAt": "1970-01-01T00:00:00.000Z",
"description": "hi im bob label_me",
"did": "user(1)",
"displayName": "bobby",
"handle": "bob.test",
"indexedAt": "1970-01-01T00:00:00.000Z",
"labels": Array [],
"viewer": Object {
"blockedBy": false,
"followedBy": "record(8)",
"following": "record(7)",
"muted": false,
},
},
"cid": "cids(4)",
"indexedAt": "1970-01-01T00:00:00.000Z",
"isRead": false,
"labels": Array [
Object {
"cid": "cids(4)",
"cts": "1970-01-01T00:00:00.000Z",
"src": "did:example:labeler",
"uri": "record(6)",
"val": "test-label",
},
Object {
"cid": "cids(4)",
"cts": "1970-01-01T00:00:00.000Z",
"src": "did:example:labeler",
"uri": "record(6)",
"val": "test-label-2",
},
],
"reason": "reply",
"reasonSubject": "record(4)",
"record": Object {
"$type": "app.bsky.feed.post",
"createdAt": "1970-01-01T00:00:00.000Z",
"embed": Object {
"$type": "app.bsky.embed.images",
"images": Array [
Object {
"alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
"image": Object {
"$type": "blob",
"mimeType": "image/jpeg",
"ref": Object {
"$link": "cids(6)",
},
"size": 4114,
},
},
],
},
"reply": Object {
"parent": Object {
"cid": "cids(1)",
"uri": "record(4)",
},
"root": Object {
"cid": "cids(1)",
"uri": "record(4)",
},
},
"text": "hear that label_me label_me_2",
},
"uri": "record(6)",
},
Object {
"author": Object {
"associated": Object {
"chat": Object {
"allowIncoming": "none",
},
},
"did": "user(3)",
"handle": "dan.test",
"labels": Array [],
"viewer": Object {
"blockedBy": false,
"following": "record(10)",
"muted": false,
},
},
"cid": "cids(7)",
"indexedAt": "1970-01-01T00:00:00.000Z",
"isRead": false,
"labels": Array [],
"reason": "mention",
"record": Object {
"$type": "app.bsky.feed.post",
"createdAt": "1970-01-01T00:00:00.000Z",
"embed": Object {
"$type": "app.bsky.embed.record",
"record": Object {
"cid": "cids(8)",
"uri": "record(11)",
},
},
"facets": Array [
Object {
"features": Array [
Object {
"$type": "app.bsky.richtext.facet#mention",
"did": "user(4)",
},
],
"index": Object {
"byteEnd": 18,
"byteStart": 0,
},
},
],
"text": "@alice.bluesky.xyz is the best",
},
"uri": "record(9)",
},
],
"priority": false,
"seenAt": "1970-01-01T00:00:00.000Z",
}
`;

exports[`notification views filters notifications by reason 1`] = `
Object {
"notifications": Array [
Object {
"author": Object {
"associated": Object {
"chat": Object {
"allowIncoming": "none",
},
},
"did": "user(0)",
"handle": "dan.test",
"labels": Array [],
"viewer": Object {
"blockedBy": false,
"following": "record(1)",
"muted": false,
},
},
"cid": "cids(0)",
"indexedAt": "1970-01-01T00:00:00.000Z",
"isRead": false,
"labels": Array [],
"reason": "mention",
"record": Object {
"$type": "app.bsky.feed.post",
"createdAt": "1970-01-01T00:00:00.000Z",
"embed": Object {
"$type": "app.bsky.embed.record",
"record": Object {
"cid": "cids(1)",
"uri": "record(2)",
},
},
"facets": Array [
Object {
"features": Array [
Object {
"$type": "app.bsky.richtext.facet#mention",
"did": "user(1)",
},
],
"index": Object {
"byteEnd": 18,
"byteStart": 0,
},
},
],
"text": "@alice.bluesky.xyz is the best",
},
"uri": "record(0)",
},
],
"priority": false,
"seenAt": "1970-01-01T00:00:00.000Z",
}
`;

exports[`notification views generates notifications for quotes 1`] = `
Array [
Object {
Expand Down
Loading