Merge branch 'wip/event-vocabulary'

1 files changed, 8 insertions, 41 deletions

diff --git a/src/message/snapshot.rs b/src/message/snapshot.rs
index 522c1aa..0eb37bb 100644
--- a/src/message/snapshot.rs
+++ b/src/message/snapshot.rs
@@ -1,57 +1,24 @@
 use super::{
-    event::{Event, Kind, Sent},
+    event::{Event, Sent},
     Id,
 };
-use crate::{channel::Channel, event::Instant, login::Login};
+use crate::{channel, event::Instant, login};
 
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
-#[serde(into = "self::serialize::Message")]
 pub struct Message {
-    #[serde(skip)]
+    #[serde(flatten)]
     pub sent: Instant,
-    pub channel: Channel,
-    pub sender: Login,
+    pub channel: channel::Id,
+    pub sender: login::Id,
     pub id: Id,
     pub body: String,
 }
 
-mod serialize {
-    use crate::{channel::Channel, login::Login, message::Id};
-
-    #[derive(serde::Serialize)]
-    pub struct Message {
-        channel: Channel,
-        sender: Login,
-        #[allow(clippy::struct_field_names)]
-        // Deliberately redundant with the module path; this produces a specific serialization.
-        message: MessageData,
-    }
-
-    #[derive(serde::Serialize)]
-    pub struct MessageData {
-        id: Id,
-        body: String,
-    }
-
-    impl From<super::Message> for Message {
-        fn from(message: super::Message) -> Self {
-            Self {
-                channel: message.channel,
-                sender: message.sender,
-                message: MessageData {
-                    id: message.id,
-                    body: message.body,
-                },
-            }
-        }
-    }
-}
-
 impl Message {
     fn apply(state: Option<Self>, event: Event) -> Option<Self> {
-        match (state, event.kind) {
-            (None, Kind::Sent(event)) => Some(event.into()),
-            (Some(message), Kind::Deleted(event)) if message.id == event.message => None,
+        match (state, event) {
+            (None, Event::Sent(event)) => Some(event.into()),
+            (Some(message), Event::Deleted(event)) if message.id == event.id => None,
             (state, event) => panic!("invalid message event {event:#?} for state {state:#?}"),
         }
     }