Use a two-tier hierarchy for events.

This will make it much easier to slot in new event types (login events!).

1 files changed, 5 insertions, 17 deletions

diff --git a/src/message/event.rs b/src/message/event.rs
index 712ecc1..9f49a32 100644
--- a/src/message/event.rs
+++ b/src/message/event.rs
@@ -5,25 +5,13 @@ use crate::{
 };
 
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
-pub struct Event {
-    #[serde(flatten)]
-    pub kind: Kind,
-}
-
-impl Sequenced for Event {
-    fn instant(&self) -> Instant {
-        self.kind.instant()
-    }
-}
-
-#[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum Kind {
+#[serde(tag = "event", rename_all = "snake_case")]
+pub enum Event {
     Sent(Sent),
     Deleted(Deleted),
 }
 
-impl Sequenced for Kind {
+impl Sequenced for Event {
     fn instant(&self) -> Instant {
         match self {
             Self::Sent(sent) => sent.instant(),
@@ -44,7 +32,7 @@ impl Sequenced for Sent {
     }
 }
 
-impl From<Sent> for Kind {
+impl From<Sent> for Event {
     fn from(event: Sent) -> Self {
         Self::Sent(event)
     }
@@ -64,7 +52,7 @@ impl Sequenced for Deleted {
     }
 }
 
-impl From<Deleted> for Kind {
+impl From<Deleted> for Event {
     fn from(event: Deleted) -> Self {
         Self::Deleted(event)
     }