summaryrefslogtreecommitdiff
path: root/src/event
diff options
context:
space:
mode:
authorOwen Jacobson <owen@grimoire.ca>2024-10-03 20:17:07 -0400
committerOwen Jacobson <owen@grimoire.ca>2024-10-03 20:17:07 -0400
commit0a5599c60d20ccc2223779eeba5dc91a95ea0fe5 (patch)
treef7ce69ad18768ff53d8fa37d8eb9c6c575633f9e /src/event
parentec804134c33aedb001c426c5f42f43f53c47848f (diff)
Add endpoints for deleting channels and messages.
It is deliberate that the expire() functions do not use them. To avoid races, the transactions must be committed before events get sent, in both cases, which makes them structurally pretty different.
Diffstat (limited to 'src/event')
-rw-r--r--src/event/app.rs1
-rw-r--r--src/event/broadcaster.rs2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/event/app.rs b/src/event/app.rs
index e58bea9..32f0a97 100644
--- a/src/event/app.rs
+++ b/src/event/app.rs
@@ -61,6 +61,7 @@ impl<'a> Events<'a> {
// Filtering on the broadcast resume point filters out messages
// before resume_at, and filters out messages duplicated from
// `replay_events`.
+ .flat_map(stream::iter)
.filter(Self::resume(resume_live_at));
Ok(replay.chain(live_messages))
diff --git a/src/event/broadcaster.rs b/src/event/broadcaster.rs
index de2513a..3c4efac 100644
--- a/src/event/broadcaster.rs
+++ b/src/event/broadcaster.rs
@@ -1,3 +1,3 @@
use crate::broadcast;
-pub type Broadcaster = broadcast::Broadcaster<super::Event>;
+pub type Broadcaster = broadcast::Broadcaster<Vec<super::Event>>;