diff options
Diffstat (limited to 'src/message')
| -rw-r--r-- | src/message/history.rs | 5 | ||||
| -rw-r--r-- | src/message/repo.rs | 18 | ||||
| -rw-r--r-- | src/message/snapshot.rs | 13 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/message/history.rs b/src/message/history.rs index 7585e1c..d4d4500 100644 --- a/src/message/history.rs +++ b/src/message/history.rs @@ -4,12 +4,11 @@ use super::{ Id, Message, event::{Deleted, Event, Sent}, }; -use crate::event::{Instant, Sequence}; +use crate::event::Sequence; #[derive(Clone, Debug, Eq, PartialEq)] pub struct History { pub message: Message, - pub deleted: Option<Instant>, } // State interface @@ -43,7 +42,7 @@ impl History { } fn deleted(&self) -> Option<Event> { - self.deleted.map(|instant| { + self.message.deleted.map(|instant| { Deleted { instant, id: self.message.id.clone(), diff --git a/src/message/repo.rs b/src/message/repo.rs index b4c086d..2e9700a 100644 --- a/src/message/repo.rs +++ b/src/message/repo.rs @@ -58,9 +58,8 @@ impl Messages<'_> { sender: row.sender, id: row.id, body: row.body.unwrap_or_default(), - deleted_at: None, + deleted: None, }, - deleted: None, }) .fetch_one(&mut *self.0) .await?; @@ -99,9 +98,8 @@ impl Messages<'_> { sender: row.sender, id: row.id, body: row.body.unwrap_or_default(), - deleted_at: row.deleted_at, + deleted: Instant::optional(row.deleted_at, row.deleted_sequence), }, - deleted: Instant::optional(row.deleted_at, row.deleted_sequence), }) .fetch_all(&mut *self.0) .await?; @@ -136,9 +134,8 @@ impl Messages<'_> { sender: row.sender, id: row.id, body: row.body.unwrap_or_default(), - deleted_at: row.deleted_at, + deleted: Instant::optional(row.deleted_at, row.deleted_sequence), }, - deleted: Instant::optional(row.deleted_at, row.deleted_sequence), }) .fetch_all(&mut *self.0) .await?; @@ -172,9 +169,8 @@ impl Messages<'_> { sender: row.sender, id: row.id, body: row.body.unwrap_or_default(), - deleted_at: row.deleted_at, + deleted: Instant::optional(row.deleted_at, row.deleted_sequence), }, - deleted: Instant::optional(row.deleted_at, row.deleted_sequence), }) .fetch_one(&mut *self.0) .await?; @@ -277,9 +273,8 @@ impl Messages<'_> { conversation: row.conversation, sender: row.sender, body: row.body.unwrap_or_default(), - deleted_at: row.deleted_at, + deleted: Instant::optional(row.deleted_at, row.deleted_sequence), }, - deleted: Instant::optional(row.deleted_at, row.deleted_sequence), }) .fetch_all(&mut *self.0) .await?; @@ -313,9 +308,8 @@ impl Messages<'_> { sender: row.sender, id: row.id, body: row.body.unwrap_or_default(), - deleted_at: row.deleted_at, + deleted: Instant::optional(row.deleted_at, row.deleted_sequence), }, - deleted: Instant::optional(row.deleted_at, row.deleted_sequence), }) .fetch_all(&mut *self.0) .await?; diff --git a/src/message/snapshot.rs b/src/message/snapshot.rs index 12d4daa..19a98a3 100644 --- a/src/message/snapshot.rs +++ b/src/message/snapshot.rs @@ -2,7 +2,8 @@ use super::{ Body, Id, event::{Event, Sent}, }; -use crate::{clock::DateTime, conversation, event::Instant, user}; +use crate::{conversation, event::Instant, user}; +use serde_with::with_prefix; #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)] pub struct Message { @@ -12,10 +13,16 @@ pub struct Message { pub sender: user::Id, pub id: Id, pub body: Body, - #[serde(skip_serializing_if = "Option::is_none")] - pub deleted_at: Option<DateTime>, + #[serde( + flatten, + with = "prefix_deleted", + skip_serializing_if = "Option::is_none" + )] + pub deleted: Option<Instant>, } +with_prefix!(prefix_deleted "deleted_"); + impl Message { fn apply(state: Option<Self>, event: Event) -> Option<Self> { match (state, event) { |