update

crates/signed_state/src/inbox.rs

@@ -128,23 +128,16 @@ impl Inbox {
     }
 }
 
-/// Derive the inbox home screen's lists for `me` from the local database.
-///
-/// Returns the notification groups, the user's own git activity and the number
-/// of non-archived groups with an unread event.
+/// Derive the inbox home screen's threads for `me` from the local database.
 pub async fn query_inbox(
     client: &Client,
     me: PublicKey,
     state: &InboxReadState,
-) -> Result<(Vec<InboxItem>, Vec<Event>, usize), Error> {
+) -> Result<(Vec<InboxItem>, usize), Error> {
     let deletion_events = client.database().query(filters::deletions()).await?;
     let deletions = Deletions::from_events(deletion_events);
 
-    let (notification_events, by_id) = fetch_notifications(client, me, &deletions).await?;
-    let notifications = inbox::group(notification_events, me, state, &|id| {
-        by_id.get(&id).cloned()
-    });
-    let unread_count = notifications.iter().filter(|item| item.is_unread()).count();
+    let (notification_events, mut by_id) = fetch_notifications(client, me, &deletions).await?;
 
     let mut activity = Vec::new();
     for event in client
@@ -155,16 +148,17 @@ pub async fn query_inbox(
         if deletions.is_deleted(&event) || !filters::is_git_activity(&event) {
             continue;
         }
+        by_id.entry(event.id).or_insert_with(|| event.clone());
         activity.push(event);
     }
 
-    activity.sort_by(|a, b| {
-        b.created_at
-            .cmp(&a.created_at)
-            .then_with(|| b.id.to_hex().cmp(&a.id.to_hex()))
+    let items = inbox::group(notification_events, activity, me, state, &|id| {
+        by_id.get(&id).cloned()
     });
 
-    Ok((notifications, activity, unread_count))
+    let unread_count = items.iter().filter(|item| item.is_unread()).count();
+
+    Ok((items, unread_count))
 }
 
 /// `d` tag identifying the inbox state event of `me`.