summaryrefslogtreecommitdiff
path: root/src/event/app.rs
diff options
context:
space:
mode:
authorOwen Jacobson <owen@grimoire.ca>2024-10-03 20:44:07 -0400
committerOwen Jacobson <owen@grimoire.ca>2024-10-03 21:03:02 -0400
commit617172576b95bbb935a75f98a98787da5a4e9a9d (patch)
treeae72fea2e81d023960c93d4efbf7e137c3705c48 /src/event/app.rs
parent0a5599c60d20ccc2223779eeba5dc91a95ea0fe5 (diff)
List messages per channel.
Diffstat (limited to 'src/event/app.rs')
-rw-r--r--src/event/app.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/event/app.rs b/src/event/app.rs
index 32f0a97..d664ec7 100644
--- a/src/event/app.rs
+++ b/src/event/app.rs
@@ -36,7 +36,7 @@ impl<'a> Events<'a> {
let channel_events = channels
.iter()
.map(channel::History::events)
- .kmerge_by(|a, b| a.instant.sequence < b.instant.sequence)
+ .kmerge_by(Sequence::merge)
.filter(Sequence::after(resume_at))
.map(Event::from);
@@ -44,14 +44,12 @@ impl<'a> Events<'a> {
let message_events = messages
.iter()
.map(message::History::events)
- .kmerge_by(|a, b| a.instant.sequence < b.instant.sequence)
+ .kmerge_by(Sequence::merge)
.filter(Sequence::after(resume_at))
.map(Event::from);
let replay_events = channel_events
- .merge_by(message_events, |a, b| {
- a.instant.sequence < b.instant.sequence
- })
+ .merge_by(message_events, Sequence::merge)
.collect::<Vec<_>>();
let resume_live_at = replay_events.last().map(Sequenced::sequence);