Merge branch 'main' into wip/path-routing-for-channels

1 files changed, 21 insertions, 46 deletions

diff --git a/src/event/mod.rs b/src/event/mod.rs
index e748d66..69c7a10 100644
--- a/src/event/mod.rs
+++ b/src/event/mod.rs
@@ -1,13 +1,14 @@
-use crate::{channel, message};
+use crate::{channel, login, message};
 
 pub mod app;
-pub mod broadcaster;
+mod broadcaster;
 mod extract;
 pub mod repo;
 mod routes;
 mod sequence;
 
 pub use self::{
+    broadcaster::Broadcaster,
     routes::router,
     sequence::{Instant, Sequence, Sequenced},
 };
@@ -15,63 +16,37 @@ pub use self::{
 pub type ResumePoint = Option<Sequence>;
 
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
-pub struct Event {
-    #[serde(flatten)]
-    pub instant: Instant,
-    #[serde(flatten)]
-    pub kind: Kind,
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum Event {
+    Login(login::Event),
+    Channel(channel::Event),
+    Message(message::Event),
 }
 
 impl Sequenced for Event {
     fn instant(&self) -> Instant {
-        self.instant
-    }
-}
-
-impl From<channel::Event> for Event {
-    fn from(event: channel::Event) -> Self {
-        Self {
-            instant: event.instant,
-            kind: event.kind.into(),
+        match self {
+            Self::Login(event) => event.instant(),
+            Self::Channel(event) => event.instant(),
+            Self::Message(event) => event.instant(),
         }
     }
 }
 
-impl From<message::Event> for Event {
-    fn from(event: message::Event) -> Self {
-        Self {
-            instant: event.instant(),
-            kind: event.kind.into(),
-        }
+impl From<login::Event> for Event {
+    fn from(event: login::Event) -> Self {
+        Self::Login(event)
     }
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum Kind {
-    #[serde(rename = "created")]
-    ChannelCreated(channel::event::Created),
-    #[serde(rename = "message")]
-    MessageSent(message::event::Sent),
-    MessageDeleted(message::event::Deleted),
-    #[serde(rename = "deleted")]
-    ChannelDeleted(channel::event::Deleted),
-}
-
-impl From<channel::event::Kind> for Kind {
-    fn from(kind: channel::event::Kind) -> Self {
-        match kind {
-            channel::event::Kind::Created(created) => Self::ChannelCreated(created),
-            channel::event::Kind::Deleted(deleted) => Self::ChannelDeleted(deleted),
-        }
+impl From<channel::Event> for Event {
+    fn from(event: channel::Event) -> Self {
+        Self::Channel(event)
     }
 }
 
-impl From<message::event::Kind> for Kind {
-    fn from(kind: message::event::Kind) -> Self {
-        match kind {
-            message::event::Kind::Sent(created) => Self::MessageSent(created),
-            message::event::Kind::Deleted(deleted) => Self::MessageDeleted(deleted),
-        }
+impl From<message::Event> for Event {
+    fn from(event: message::Event) -> Self {
+        Self::Message(event)
     }
 }