π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Mark displayed notification IDs read without group anchors
Anand Baburajan1db0f74a0d7c
diff --git a/rust/bindings/wasm/space/src/space.rs b/rust/bindings/wasm/space/src/space.rsindex 46c606c912..27e6ff933f 100644--- a/rust/bindings/wasm/space/src/space.rs+++ b/rust/bindings/wasm/space/src/space.rs@@ -339,6 +339,7 @@ pub struct PostPage {#[serde(rename_all = "camelCase")]pub struct Notification {notification_id: String,+ notification_ids: Vec<String>,kind: String,actors: Vec<SpaceActorResponse>,actor_count: i64,@@ -365,6 +366,7 @@ impl From<ente_space::NotificationPage> for NotificationPage {.into_iter().map(|item| Notification {notification_id: item.notification_id,+ notification_ids: item.notification_ids,kind: item.kind,actors: item.actors.into_iter().map(Into::into).collect(),actor_count: item.actor_count,diff --git a/rust/crates/space/src/client/notifications.rs b/rust/crates/space/src/client/notifications.rsindex a47ca59f99..0d862a79b8 100644--- a/rust/crates/space/src/client/notifications.rs+++ b/rust/crates/space/src/client/notifications.rs@@ -51,6 +51,7 @@ impl AccountSpaceCtx {}items.push(Notification {notification_id: item.notification_id,+ notification_ids: item.notification_ids,kind: item.kind,actors,actor_count: item.actor_count,@@ -107,7 +108,7 @@ mod tests {let mut server = mockito::Server::new_async().await;let ctx = test_account_ctx(&server.url());let page = server.mock("GET", "/spaces/space_owner_main/notifications")- .with_body(json!({"items":[{"notificationId":"request-1","kind":"friend_request","actors":[{"spaceId":"requester","spaceSlug":"maya"}],"actorCount":1,"friendRequestId":7,"createdAt":"2026-10-07T10:00:00Z","unread":true}]}).to_string())+ .with_body(json!({"items":[{"notificationId":"request-1","notificationIds":["request-1"],"kind":"friend_request","actors":[{"spaceId":"requester","spaceSlug":"maya"}],"actorCount":1,"friendRequestId":7,"createdAt":"2026-10-07T10:00:00Z","unread":true}]}).to_string()).create_async().await;let notifications = ctx.list_notifications("space_owner_main", None, None)@@ -121,12 +122,13 @@ mod tests {#[tokio::test]async fn notification_feed_and_read_state_use_separate_endpoints() {+ let notification_ids: Vec<String> = (0..50).map(|i| format!("wnot_{i}")).collect();let mut server = mockito::Server::new_async().await;let ctx = test_account_ctx(&server.url());let page = server.mock("GET", "/spaces/space_owner_main/notifications").match_query(Matcher::AllOf(vec![Matcher::UrlEncoded("cursor".into(), "1000:wnot_a".into()), Matcher::UrlEncoded("limit".into(), "20".into())])).match_header("x-space-session-token", "space-session-token")- .with_body(json!({"items": [{"notificationId":"wnot_b", "kind":"post_like", "actors":[{"spaceId":"friend", "spaceSlug":"bob"},{"spaceId":"friend2", "spaceSlug":"maya"}], "actorCount":50, "unread":true, "postId":42, "createdAt":"2026-10-07T10:00:00Z"}]}).to_string())+ .with_body(json!({"items": [{"notificationId":"wnot_49", "notificationIds":notification_ids, "kind":"post_like", "actors":[{"spaceId":"friend", "spaceSlug":"bob"},{"spaceId":"friend2", "spaceSlug":"maya"}], "actorCount":50, "unread":true, "postId":42, "createdAt":"2026-10-07T10:00:00Z"}]}).to_string()).create_async().await;let shares = server.mock("GET", "/spaces/space_owner_main/friends/shares")@@ -140,7 +142,7 @@ mod tests {.await;let read = server.mock("POST", "/spaces/space_owner_main/notifications/read")- .match_body(Matcher::Json(json!({"notificationIds":["wnot_b"]})))+ .match_body(Matcher::Json(json!({"notificationIds":notification_ids}))).with_status(200).create_async().await;@@ -154,12 +156,16 @@ mod tests {assert_eq!(notifications.items[0].actors[1].space_slug, "maya");assert_eq!(notifications.items[0].actors.len(), 2);assert_eq!(notifications.items[0].actor_count, 50);+ assert_eq!(notifications.items[0].notification_ids, notification_ids);assert!(notifications.items[0].unread);assert!(notifications.next_cursor.is_empty());assert!(ctx.notifications_unread("space_owner_main").await.unwrap());- ctx.mark_notification_items_read("space_owner_main", vec!["wnot_b".into()])- .await- .unwrap();+ ctx.mark_notification_items_read(+ "space_owner_main",+ notifications.items[0].notification_ids.clone(),+ )+ .await+ .unwrap();page.assert_async().await;shares.assert_async().await;unread.assert_async().await;diff --git a/rust/crates/space/src/models.rs b/rust/crates/space/src/models.rsindex 75dbc3dbdc..55fb9c7365 100644--- a/rust/crates/space/src/models.rs+++ b/rust/crates/space/src/models.rs@@ -222,6 +222,7 @@ pub struct MessagePage {pub struct Notification {pub notification_id: String,+ pub notification_ids: Vec<String>,pub kind: String,pub actors: Vec<SpaceActor>,pub actor_count: i64,diff --git a/rust/crates/space/src/transport.rs b/rust/crates/space/src/transport.rsindex 0f2af49896..fe2d11cdef 100644--- a/rust/crates/space/src/transport.rs+++ b/rust/crates/space/src/transport.rs@@ -681,6 +681,7 @@ pub struct SpaceLookupResponse {#[serde(rename_all = "camelCase")]pub struct NotificationResponse {pub notification_id: String,+ pub notification_ids: Vec<String>,pub kind: String,pub actors: Vec<SpaceActorResponse>,pub actor_count: i64,diff --git a/rust/crates/space/tests/space.rs b/rust/crates/space/tests/space.rsindex 29cf614920..be815dc69b 100644--- a/rust/crates/space/tests/space.rs+++ b/rust/crates/space/tests/space.rs@@ -94,10 +94,7 @@ async fn request_and_confirm_friend(assert!(notification.unread);assert!(notification.actors[0].profile.as_ref().unwrap().is_some());requester_ctx- .mark_notification_items_read(- requester_space_id,- vec![notification.notification_id.clone()],- )+ .mark_notification_items_read(requester_space_id, notification.notification_ids.clone()).await.expect("acceptance should be readable");}diff --git a/server/space/api/notifications_test.go b/server/space/api/notifications_test.goindex ec40ef96da..54eef7198d 100644--- a/server/space/api/notifications_test.go+++ b/server/space/api/notifications_test.go@@ -51,6 +51,7 @@ func TestNotificationsAPIIsRecipientScoped(t *testing.T) {var page models.NotificationPagerequire.NoError(t, json.Unmarshal(response.Body.Bytes(), &page))require.Len(t, page.Items, 1)+ require.Equal(t, []string{page.Items[0].NotificationID}, page.Items[0].NotificationIDs)require.NotNil(t, page.Items[0].PostID)require.Equal(t, postID, *page.Items[0].PostID)require.Equal(t, friend.SpaceID, page.Items[0].Actors[0].SpaceID)@@ -88,6 +89,7 @@ func TestNotificationsAPIIsRecipientScoped(t *testing.T) {page = models.NotificationPage{}require.NoError(t, json.Unmarshal(response.Body.Bytes(), &page))require.Len(t, page.Items, 1)+ require.Equal(t, []string{page.Items[0].NotificationID}, page.Items[0].NotificationIDs)require.Equal(t, "friend_request", page.Items[0].Kind)require.NotNil(t, page.Items[0].FriendRequestID)require.Equal(t, request.RequestID, *page.Items[0].FriendRequestID)diff --git a/server/space/controller/notification_feed.go b/server/space/controller/notification_feed.goindex 08347371bd..5d4fed9578 100644--- a/server/space/controller/notification_feed.go+++ b/server/space/controller/notification_feed.go@@ -20,12 +20,13 @@ func (c *NotificationsController) List(ctx context.Context, space *repo.SpaceRecitems := make([]models.NotificationResponse, 0, len(records))for _, record := range records {item := models.NotificationResponse{- NotificationID: record.NotificationID,- Kind: record.Kind,- Actors: make([]models.SpaceActorResponse, 0, len(record.Actors)),- ActorCount: record.ActorCount,- CreatedAt: formatMicros(record.CreatedAt),- Unread: record.Unread,+ NotificationID: record.NotificationID,+ NotificationIDs: record.NotificationIDs,+ Kind: record.Kind,+ Actors: make([]models.SpaceActorResponse, 0, len(record.Actors)),+ ActorCount: record.ActorCount,+ CreatedAt: formatMicros(record.CreatedAt),+ Unread: record.Unread,}if record.PostID.Valid {item.PostID = &record.PostID.Int64diff --git a/server/space/models/models.go b/server/space/models/models.goindex 053a802b1e..6c72de0b03 100644--- a/server/space/models/models.go+++ b/server/space/models/models.go@@ -424,6 +424,7 @@ type ReadNotificationsRequest struct {type NotificationResponse struct {NotificationID string `json:"notificationId"`+ NotificationIDs []string `json:"notificationIds"`Kind string `json:"kind"`Actors []SpaceActorResponse `json:"actors"`ActorCount int64 `json:"actorCount"`diff --git a/server/space/repo/friend_notifications_test.go b/server/space/repo/friend_notifications_test.goindex 718b3cb6e0..d37a56a8cc 100644--- a/server/space/repo/friend_notifications_test.go+++ b/server/space/repo/friend_notifications_test.go@@ -153,12 +153,14 @@ func TestFriendAcceptanceNotificationsGroupByActor(t *testing.T) {UPDATE space_notifications SET created_at = 1500 WHERE kind = 'post_like' RETURNING notification_id`).Scan(&likeID))+ groups := make(map[string][]string)cursor := ""for i, id := range []string{"bob-z-latest", "charlie-latest", likeID} {items, next, err := module.Notifications.List(ctx, alice.SpaceID, cursor, 1)require.NoError(t, err)require.Len(t, items, 1)require.Equal(t, id, items[0].NotificationID)+ groups[id] = items[0].NotificationIDsrequire.Equal(t, int64(1), items[0].ActorCount)require.Len(t, items[0].Actors, 1)require.True(t, items[0].Unread)@@ -174,11 +176,11 @@ func TestFriendAcceptanceNotificationsGroupByActor(t *testing.T) {cursor = next}- require.NoError(t, module.Notifications.MarkRead(ctx, bob.SpaceID, []string{"bob-z-latest"}))+ require.NoError(t, module.Notifications.MarkRead(ctx, bob.SpaceID, groups["bob-z-latest"]))require.Equal(t, int64(2), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications WHERE recipient_space_id = $1 AND actor_space_id = $2 AND kind = 'friend_accepted' AND read_at IS NULL`, alice.SpaceID, bob.SpaceID))- require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, []string{"bob-z-latest"}))+ require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, groups["bob-z-latest"]))items, _, err := module.Notifications.List(ctx, alice.SpaceID, "", 20)require.NoError(t, err)require.Len(t, items, 3)@@ -188,7 +190,7 @@ func TestFriendAcceptanceNotificationsGroupByActor(t *testing.T) {require.Equal(t, int64(0), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications WHERE recipient_space_id = $1 AND actor_space_id = $2 AND kind = 'friend_accepted' AND read_at IS NULL`, alice.SpaceID, bob.SpaceID))- require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, []string{"charlie-latest", likeID}))+ require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, append(groups["charlie-latest"], likeID)))unread, err := module.Notifications.HasUnread(ctx, alice.SpaceID)require.NoError(t, err)require.False(t, unread)@@ -201,7 +203,7 @@ func TestFriendAcceptanceNotificationsGroupByActor(t *testing.T) {VALUES ('bob-new', $1, $2, 'friend_accepted', 5000)`, alice.SpaceID, bob.SpaceID)require.NoError(t, err)- require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, []string{"bob-z-latest"}))+ require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, groups["bob-z-latest"]))items, _, err = module.Notifications.List(ctx, alice.SpaceID, "", 20)require.NoError(t, err)require.Len(t, items, 3)diff --git a/server/space/repo/notifications.go b/server/space/repo/notifications.goindex 22d0782b68..76e56883a2 100644--- a/server/space/repo/notifications.go+++ b/server/space/repo/notifications.go@@ -15,6 +15,7 @@ type NotificationsRepository struct {type SpaceNotificationRecord struct {NotificationID string+ NotificationIDs []stringKind stringActors []SpaceActorRecordActorCount int64@@ -54,6 +55,7 @@ func (r *NotificationsRepository) List(ctx context.Context, recipientSpaceID, cu` + notificationSourcesSQL + ` WHERE n.recipient_space_id = $1 AND ` + notificationVisibleSQL + `), ranked AS (SELECT notification_id, kind, actor_space_id, post_id, friend_request_id, created_at, group_id,+ ARRAY_AGG(notification_id) OVER (PARTITION BY kind, group_id) AS notification_ids,CASE WHEN kind = 'post_like' THEN COUNT(*) OVER (PARTITION BY kind, group_id) ELSE 1 END AS actor_count,BOOL_OR(read_at IS NULL) OVER (PARTITION BY kind, group_id) AS unread,ROW_NUMBER() OVER (PARTITION BY kind, group_id ORDER BY created_at DESC, notification_id DESC) AS position@@ -68,7 +70,7 @@ func (r *NotificationsRepository) List(ctx context.Context, recipientSpaceID, cuargs = append(args, limit+1)query += ` ORDER BY created_at DESC, notification_id DESC LIMIT $` + strconv.Itoa(len(args)) + `)- SELECT page.notification_id, page.kind, page.post_id, page.friend_request_id, page.created_at, page.actor_count, page.unread, ` + spaceActorSelectColumns("actor", "avatar", "actor") + `+ SELECT page.notification_id, page.notification_ids, page.kind, page.post_id, page.friend_request_id, page.created_at, page.actor_count, page.unread, ` + spaceActorSelectColumns("actor", "avatar", "actor") + `FROM pageJOIN ranked sample ON sample.kind = page.kind AND sample.group_id = page.group_idAND sample.position <= CASE WHEN page.kind = 'post_like' THEN 2 ELSE 1 END@@ -84,7 +86,7 @@ func (r *NotificationsRepository) List(ctx context.Context, recipientSpaceID, cufor rows.Next() {var item SpaceNotificationRecordvar actor SpaceActorRecord- dest := []any{&item.NotificationID, &item.Kind, &item.PostID, &item.FriendRequestID, &item.CreatedAt, &item.ActorCount, &item.Unread}+ dest := []any{&item.NotificationID, pq.Array(&item.NotificationIDs), &item.Kind, &item.PostID, &item.FriendRequestID, &item.CreatedAt, &item.ActorCount, &item.Unread}dest = append(dest, spaceActorScanDest(&actor)...)if err := rows.Scan(dest...); err != nil {return nil, "", stacktrace.Propagate(err, "")@@ -116,20 +118,12 @@ func (r *NotificationsRepository) HasUnread(ctx context.Context, recipientSpaceIfunc (r *NotificationsRepository) MarkRead(ctx context.Context, recipientSpaceID string, notificationIDs []string) error {_, err := r.DB.ExecContext(ctx, `WITH visible AS (- SELECT n.notification_id, n.kind, n.actor_space_id, l.post_id, n.created_at- `+notificationSourcesSQL+` WHERE n.recipient_space_id = $1 AND `+notificationVisibleSQL+`+ SELECT n.notification_id+ `+notificationSourcesSQL+` WHERE n.recipient_space_id = $1 AND n.notification_id = ANY($2) AND `+notificationVisibleSQL+`)UPDATE space_notifications n SET read_at = now_utc_micro_seconds()- FROM visible item, visible anchor+ FROM visible itemWHERE n.notification_id = item.notification_id AND n.read_at IS NULL- AND anchor.notification_id = ANY($2)- AND (item.notification_id = anchor.notification_id OR (- item.kind = anchor.kind AND (- (item.kind = 'post_like' AND item.post_id = anchor.post_id)- OR (item.kind IN ('friend_accepted', 'poke') AND item.actor_space_id = anchor.actor_space_id)- )- AND (item.created_at, item.notification_id) <= (anchor.created_at, anchor.notification_id)- ))`, recipientSpaceID, pq.Array(notificationIDs))return stacktrace.Propagate(err, "")}diff --git a/server/space/repo/notifications_test.go b/server/space/repo/notifications_test.goindex 951bbf2199..f6a1d0987b 100644--- a/server/space/repo/notifications_test.go+++ b/server/space/repo/notifications_test.go@@ -178,6 +178,8 @@ func TestNotificationsPaginateCompletePostGroups(t *testing.T) {require.Len(t, first, 2)require.Equal(t, posts[0], first[0].PostID.Int64)require.Equal(t, int64(25), first[0].ActorCount)+ require.Len(t, first[0].NotificationIDs, 25)+ require.Contains(t, first[0].NotificationIDs, first[0].NotificationID)require.Len(t, first[0].Actors, 2)require.Equal(t, actors[24].SpaceID, first[0].Actors[0].SpaceID)require.Equal(t, actors[23].SpaceID, first[0].Actors[1].SpaceID)@@ -199,7 +201,7 @@ func TestNotificationsPaginateCompletePostGroups(t *testing.T) {require.NoError(t, testSetPostLike(ctx, module, posts[0], bob.SpaceID, false))require.NoError(t, testSetPostLike(ctx, module, posts[0], bob.SpaceID, true))- require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, []string{first[0].NotificationID}))+ require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, first[0].NotificationIDs))updated, _, err := module.Notifications.List(ctx, alice.SpaceID, "", 2)require.NoError(t, err)require.True(t, updated[0].Unread)@@ -211,7 +213,7 @@ func TestNotificationsPaginateCompletePostGroups(t *testing.T) {SELECT COUNT(*) FROM space_notifications n JOIN space_post_likes l ON l.like_id = n.post_like_idWHERE l.post_id = $1 AND n.read_at IS NULL`, posts[0]))- require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, []string{updated[0].NotificationID}))+ require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, updated[0].NotificationIDs))updated, _, err = module.Notifications.List(ctx, alice.SpaceID, "", 2)require.NoError(t, err)require.False(t, updated[0].Unread)@@ -233,7 +235,7 @@ func TestNotificationsPaginateCompletePostGroups(t *testing.T) {require.Equal(t, int64(22), updated[0].ActorCount)require.Equal(t, actors[22].SpaceID, updated[0].Actors[0].SpaceID)require.False(t, updated[0].Unread)- require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, []string{updated[0].NotificationID}))+ require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, updated[0].NotificationIDs))require.Equal(t, int64(2), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications n JOIN space_post_likes l ON l.like_id = n.post_like_idWHERE l.post_id = $1 AND n.read_at IS NULL@@ -253,6 +255,46 @@ func TestNotificationsPaginateCompletePostGroups(t *testing.T) {require.Empty(t, next)}+func TestNotificationReadAfterLatestLikeRemoved(t *testing.T) {+ for _, newLike := range []bool{false, true} {+ t.Run(fmt.Sprintf("newLike=%t", newLike), func(t *testing.T) {+ module := newSpaceTestModule(t)+ ctx := t.Context()+ alice, bob := notificationTestSpaces(t, module)+ charlieID := insertSpaceUser(t, module, "[email protected]", "public")+ charlie, err := testCreateSpace(ctx, module, charlieID, "charlie_notifications", "root", "public", "secret", "nonce", "profile")+ require.NoError(t, err)+ require.NoError(t, testAddFriend(ctx, module, charlieID, charlie.SpaceID, alice.SpaceID, "share", 1, "share", 1))+ postID, err := testCreatePost(ctx, module, alice.OwnerID, alice.SpaceID, "key", nil, 1, nil)+ require.NoError(t, err)+ require.NoError(t, testSetPostLike(ctx, module, postID, bob.SpaceID, true))+ _, err = module.Notifications.DB.ExecContext(ctx, `UPDATE space_notifications SET created_at = 1000`)+ require.NoError(t, err)+ require.NoError(t, testSetPostLike(ctx, module, postID, charlie.SpaceID, true))+ page, _, err := module.Notifications.List(ctx, alice.SpaceID, "", 20)+ require.NoError(t, err)+ require.Len(t, page, 1)+ require.Len(t, page[0].NotificationIDs, 2)+ require.Equal(t, charlie.SpaceID, page[0].Actors[0].SpaceID)+ require.NoError(t, testSetPostLike(ctx, module, postID, charlie.SpaceID, false))+ require.Equal(t, int64(0), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications WHERE notification_id = $1`, page[0].NotificationID))+ if newLike {+ require.NoError(t, testSetPostLike(ctx, module, postID, charlie.SpaceID, true))+ }++ require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, page[0].NotificationIDs))+ require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, page[0].NotificationIDs))+ require.Equal(t, int64(0), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications WHERE actor_space_id = $1 AND read_at IS NULL`, bob.SpaceID))+ unread, err := module.Notifications.HasUnread(ctx, alice.SpaceID)+ require.NoError(t, err)+ require.Equal(t, newLike, unread)+ if newLike {+ require.Equal(t, int64(1), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications WHERE read_at IS NULL`))+ }+ })+ }+}+func TestNotificationsMigrationPreservesLikesAndReadState(t *testing.T) {module := newSpaceTestModule(t)ctx := t.Context()diff --git a/server/space/repo/pokes_test.go b/server/space/repo/pokes_test.goindex 272a570b84..99929a12e6 100644--- a/server/space/repo/pokes_test.go+++ b/server/space/repo/pokes_test.go@@ -52,17 +52,17 @@ func TestPokesCreateNotificationsOnceAndGroupReadState(t *testing.T) {require.Equal(t, bob.SpaceID, page[0].Actors[0].SpaceID)require.Equal(t, int64(1), page[0].ActorCount)require.True(t, page[0].Unread)- require.NoError(t, module.Notifications.MarkRead(ctx, bob.SpaceID, []string{page[0].NotificationID}))+ require.NoError(t, module.Notifications.MarkRead(ctx, bob.SpaceID, page[0].NotificationIDs))unread, err = module.Notifications.HasUnread(ctx, alice.SpaceID)require.NoError(t, err)require.True(t, unread)_, err = module.Pokes.Create(ctx, bob.SpaceID, alice.SpaceID, "third")require.NoError(t, err)- require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, []string{page[0].NotificationID}))+ require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, page[0].NotificationIDs))require.Equal(t, int64(1), countSpaceRows(t, module, `SELECT COUNT(*) FROM space_notifications WHERE read_at IS NULL`))page, _, err = module.Notifications.List(ctx, alice.SpaceID, "", 20)require.NoError(t, err)- require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, []string{page[0].NotificationID}))+ require.NoError(t, module.Notifications.MarkRead(ctx, alice.SpaceID, page[0].NotificationIDs))unread, err = module.Notifications.HasUnread(ctx, alice.SpaceID)require.NoError(t, err)require.False(t, unread)diff --git a/web/apps/space/src/pages/app/notifications.tsx b/web/apps/space/src/pages/app/notifications.tsxindex 7495c3bea6..d421183c3c 100644--- a/web/apps/space/src/pages/app/notifications.tsx+++ b/web/apps/space/src/pages/app/notifications.tsx@@ -689,7 +689,11 @@ const NotificationsFeed: React.FC<{ spaceId: string; profileLink: string }> = ({setItems(page.items.map((item) => ({...item,- read: item.read || readIDs.current.has(item.id),+ read:+ item.read ||+ item.notificationIds.every((id) =>+ readIDs.current.has(id),+ ),})),);setNewIDs(@@ -704,7 +708,10 @@ const NotificationsFeed: React.FC<{ spaceId: string; profileLink: string }> = ({setCursor(page.nextCursor);setFailedReadIDs((current) =>current.filter((id) =>- page.items.some((item) => item.id == id && !item.read),+ page.items.some(+ (item) =>+ item.notificationIds.includes(id) && !item.read,+ ),),);})@@ -751,7 +758,11 @@ const NotificationsFeed: React.FC<{ spaceId: string; profileLink: string }> = ({ids.forEach((id) => readIDs.current.add(id));setItems((current) =>current.map((item) =>- ids.includes(item.id) ? { ...item, read: true } : item,+ item.notificationIds.every((id) =>+ readIDs.current.has(id),+ )+ ? { ...item, read: true }+ : item,),);setFailedReadIDs((current) =>@@ -769,8 +780,10 @@ const NotificationsFeed: React.FC<{ spaceId: string; profileLink: string }> = ({);React.useEffect(() => {- const unreadIDs = new Set(- items.filter((item) => !item.read).map((item) => item.id),+ const unreadGroups = new Map(+ items+ .filter((item) => !item.read)+ .map((item) => [item.id, item.notificationIds]),);const observer = new IntersectionObserver((entries) => {@@ -786,11 +799,8 @@ const NotificationsFeed: React.FC<{ spaceId: string; profileLink: string }> = ({(entry.target as HTMLElement).dataset.notificationId!,)- .filter(- (id) =>- unreadIDs.has(id) &&- !attemptedReadIDs.current.has(id),- );+ .flatMap((id) => unreadGroups.get(id) ?? [])+ .filter((id) => !attemptedReadIDs.current.has(id));if (ids.length > 0) void markRead(ids);},{ threshold: 0.5 },diff --git a/web/apps/space/src/services/space.ts b/web/apps/space/src/services/space.tsindex 6db450bda2..68dfd7bbe5 100644--- a/web/apps/space/src/services/space.ts+++ b/web/apps/space/src/services/space.ts@@ -1014,6 +1014,7 @@ export const loadCurrentUnreadStatus = async (export interface SpaceNotification {id: string;+ notificationIds: string[];kind: string;actors: FriendProfile[];actorCount: number;@@ -1046,6 +1047,7 @@ export const loadCurrentNotifications = async ();return {id: item.notificationId,+ notificationIds: item.notificationIds,kind: item.kind,actors,actorCount: item.actorCount,diff --git a/web/apps/space/tests/notification-avatars.test.ts b/web/apps/space/tests/notification-avatars.test.tsindex 259a783451..dec26b25ec 100644--- a/web/apps/space/tests/notification-avatars.test.ts+++ b/web/apps/space/tests/notification-avatars.test.ts@@ -56,6 +56,7 @@ beforeEach(() => {items: [{notificationId: "like-1",+ notificationIds: ["like-1"],kind: "post_like",actors: [actor],actorCount: 1,@@ -94,6 +95,10 @@ test("notifications restore the same cached avatar as Messages before returning});test("notification groups preserve full counts with only the latest two actors", async () => {+ const notificationIds = Array.from(+ { length: 50 },+ (_, i) => `like-${i + 1}`,+ );const secondActor = {...actor,spaceId: "second-friend",@@ -104,6 +109,7 @@ test("notification groups preserve full counts with only the latest two actors",items: [{notificationId: "like-50",+ notificationIds,kind: "post_like",actors: [actor, secondActor],actorCount: 50,@@ -125,6 +131,7 @@ test("notification groups preserve full counts with only the latest two actors",expect(page.items).toHaveLength(1);expect(page.items[0]).toMatchObject({id: "like-50",+ notificationIds,actorCount: 50,read: false,actors: [{ fullName: "Maya Patel" }, { fullName: "Sam Reed" }],@@ -160,6 +167,7 @@ test("friend notifications preserve request targets without inventing post targeitems: [{notificationId: "request-1",+ notificationIds: ["request-1"],kind: "friend_request",actors: [{ spaceId: "requester", spaceSlug: "maya" }],actorCount: 1,@@ -169,6 +177,7 @@ test("friend notifications preserve request targets without inventing post targe},{notificationId: "accepted-1",+ notificationIds: ["accepted-1"],kind: "friend_accepted",actors: [actor],actorCount: 1,