From 469613872f6fb19f4579b387e19b2bc38fa52f51 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Wed, 2 Oct 2024 01:31:43 -0400
Subject: Package up common event fields as Instant

---
 src/event/types.rs | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'src/event/types.rs')

diff --git a/src/event/types.rs b/src/event/types.rs
index cd7dea6..2324dc1 100644
--- a/src/event/types.rs
+++ b/src/event/types.rs
@@ -1,16 +1,14 @@
 use crate::{
     channel::{self, Channel},
-    clock::DateTime,
-    event::Sequence,
+    event::{Instant, Sequence},
     login::Login,
     message::{self, Message},
 };
 
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
 pub struct ChannelEvent {
-    #[serde(skip)]
-    pub sequence: Sequence,
-    pub at: DateTime,
+    #[serde(flatten)]
+    pub instant: Instant,
     #[serde(flatten)]
     pub data: ChannelEventData,
 }
@@ -18,25 +16,15 @@ pub struct ChannelEvent {
 impl ChannelEvent {
     pub fn created(channel: Channel) -> Self {
         Self {
-            at: channel.created_at,
-            sequence: channel.created_sequence,
+            instant: channel.created,
             data: CreatedEvent { channel }.into(),
         }
     }
-
-    pub fn channel_id(&self) -> &channel::Id {
-        match &self.data {
-            ChannelEventData::Created(event) => &event.channel.id,
-            ChannelEventData::Message(event) => &event.channel.id,
-            ChannelEventData::MessageDeleted(event) => &event.channel.id,
-            ChannelEventData::Deleted(event) => &event.channel,
-        }
-    }
 }
 
 impl<'c> From<&'c ChannelEvent> for Sequence {
     fn from(event: &'c ChannelEvent) -> Self {
-        event.sequence
+        event.instant.sequence
     }
 }
 
-- 
cgit v1.2.3