diff options
| author | Owen Jacobson <owen@grimoire.ca> | 2025-08-21 23:47:15 -0400 |
|---|---|---|
| committer | Owen Jacobson <owen@grimoire.ca> | 2025-08-24 04:50:49 -0400 |
| commit | 53944ef14af4d37c08464cb1bb9f3a8f09277194 (patch) | |
| tree | 8458167c1608222a914ce0bdcc1fb5f966cf4f95 /src/message/repo.rs | |
| parent | fd6a74e8ca1f5ded2a760b8ac644124862d80d54 (diff) | |
Collapse redundant "deleted_at" timestaps and "deleted" event instants.
These were separated as there wasn't an obvious way to serialize two fields with the same _type_ with different _prefixes_. Turns out this is a common problem, and someone's written a crate for it that remaps the names for you.
Diffstat (limited to 'src/message/repo.rs')
| -rw-r--r-- | src/message/repo.rs | 18 |
1 files changed, 6 insertions, 12 deletions
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?; |