2 files changed, 34 insertions, 51 deletions

diff --git a/src/events/repo/broadcast.rs b/src/events/repo/message.rs
index 6914573..b4724ea 100644
--- a/src/events/repo/broadcast.rs
+++ b/src/events/repo/message.rs
@@ -2,6 +2,7 @@ use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction};
 
 use crate::{
     clock::DateTime,
+    events::types::{self, Sequence},
     repo::{
         channel::Channel,
         login::{self, Login},
@@ -10,35 +11,25 @@ use crate::{
 };
 
 pub trait Provider {
-    fn broadcast(&mut self) -> Broadcast;
+    fn message_events(&mut self) -> Events;
 }
 
 impl<'c> Provider for Transaction<'c, Sqlite> {
-    fn broadcast(&mut self) -> Broadcast {
-        Broadcast(self)
+    fn message_events(&mut self) -> Events {
+        Events(self)
     }
 }
 
-pub struct Broadcast<'t>(&'t mut SqliteConnection);
+pub struct Events<'t>(&'t mut SqliteConnection);
 
-#[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
-pub struct Message {
-    pub id: message::Id,
-    #[serde(skip)]
-    pub sequence: Sequence,
-    pub sender: Login,
-    pub body: String,
-    pub sent_at: DateTime,
-}
-
-impl<'c> Broadcast<'c> {
+impl<'c> Events<'c> {
     pub async fn create(
         &mut self,
         sender: &Login,
         channel: &Channel,
         body: &str,
         sent_at: &DateTime,
-    ) -> Result<Message, sqlx::Error> {
+    ) -> Result<types::ChannelEvent, sqlx::Error> {
         let sequence = self.next_sequence_for(channel).await?;
 
         let id = message::Id::generate();
@@ -62,12 +53,16 @@ impl<'c> Broadcast<'c> {
             body,
             sent_at,
         )
-        .map(|row| Message {
-            id: row.id,
+        .map(|row| types::ChannelEvent {
             sequence: row.sequence,
-            sender: sender.clone(),
-            body: row.body,
-            sent_at: row.sent_at,
+            at: row.sent_at,
+            channel: channel.clone(),
+            data: types::MessageEvent {
+                id: row.id,
+                sender: sender.clone(),
+                body: row.body,
+            }
+            .into(),
         })
         .fetch_one(&mut *self.0)
         .await?;
@@ -76,7 +71,7 @@ impl<'c> Broadcast<'c> {
     }
 
     async fn next_sequence_for(&mut self, channel: &Channel) -> Result<Sequence, sqlx::Error> {
-        let Sequence(current) = sqlx::query_scalar!(
+        let current = sqlx::query_scalar!(
             r#"
                 -- `max` never returns null, but sqlx can't detect that
                 select max(sequence) as "sequence!: Sequence"
@@ -88,7 +83,7 @@ impl<'c> Broadcast<'c> {
         .fetch_one(&mut *self.0)
         .await?;
 
-        Ok(Sequence(current + 1))
+        Ok(current.next())
     }
 
     pub async fn expire(&mut self, expire_at: &DateTime) -> Result<(), sqlx::Error> {
@@ -109,8 +104,8 @@ impl<'c> Broadcast<'c> {
         &mut self,
         channel: &Channel,
         resume_at: Option<Sequence>,
-    ) -> Result<Vec<Message>, sqlx::Error> {
-        let messages = sqlx::query!(
+    ) -> Result<Vec<types::ChannelEvent>, sqlx::Error> {
+        let events = sqlx::query!(
             r#"
 				select
 					message.id as "id: message::Id",
@@ -128,35 +123,23 @@ impl<'c> Broadcast<'c> {
             channel.id,
             resume_at,
         )
-        .map(|row| Message {
-            id: row.id,
+        .map(|row| types::ChannelEvent {
             sequence: row.sequence,
-            sender: Login {
-                id: row.sender_id,
-                name: row.sender_name,
-            },
-            body: row.body,
-            sent_at: row.sent_at,
+            at: row.sent_at,
+            channel: channel.clone(),
+            data: types::MessageEvent {
+                id: row.id,
+                sender: login::Login {
+                    id: row.sender_id,
+                    name: row.sender_name,
+                },
+                body: row.body,
+            }
+            .into(),
         })
         .fetch_all(&mut *self.0)
         .await?;
 
-        Ok(messages)
+        Ok(events)
     }
 }
-
-#[derive(
-    Debug,
-    Eq,
-    Ord,
-    PartialEq,
-    PartialOrd,
-    Clone,
-    Copy,
-    serde::Serialize,
-    serde::Deserialize,
-    sqlx::Type,
-)]
-#[serde(transparent)]
-#[sqlx(transparent)]
-pub struct Sequence(i64);
diff --git a/src/events/repo/mod.rs b/src/events/repo/mod.rs
index 2ed3062..e216a50 100644
--- a/src/events/repo/mod.rs
+++ b/src/events/repo/mod.rs
@@ -1 +1 @@
-pub mod broadcast;
+pub mod message;