From 9bf53afebf5da07db8db8e30a026c210fa1fab92 Mon Sep 17 00:00:00 2001 From: Bill Thiede Date: Mon, 24 Feb 2025 17:08:57 -0800 Subject: [PATCH] server: sort catchup ids by timestamp across all sources --- server/src/graphql.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/src/graphql.rs b/server/src/graphql.rs index 80145ee..2d548c7 100644 --- a/server/src/graphql.rs +++ b/server/src/graphql.rs @@ -331,10 +331,15 @@ impl QueryRoot { notmuch_results.len(), ); - let results: Vec<_> = newsreader_results + let mut results: Vec<_> = newsreader_results .into_iter() .chain(notmuch_results) .collect(); + // The leading '-' is to reverse sort + results.sort_by_key(|item| match item { + ThreadSummaryCursor::Newsreader(_, ts) => -ts.timestamp, + ThreadSummaryCursor::Notmuch(_, ts) => -ts.timestamp, + }); let ids = results .into_iter() .map(|r| match r {