From 155f6f2556b21e6b25afe096b19adcde1255c598 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Fri, 27 Sep 2024 23:46:55 -0400
Subject: Expire channels, too.

---
 src/events/repo/message.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/events/repo/message.rs')

diff --git a/src/events/repo/message.rs b/src/events/repo/message.rs
index 32419d5..f8bae2b 100644
--- a/src/events/repo/message.rs
+++ b/src/events/repo/message.rs
@@ -56,8 +56,8 @@ impl<'c> Events<'c> {
         .map(|row| types::ChannelEvent {
             sequence: row.sequence,
             at: row.sent_at,
-            channel: channel.clone(),
             data: types::MessageEvent {
+                channel: channel.clone(),
                 sender: sender.clone(),
                 message: Message {
                     id: row.id,
@@ -72,7 +72,7 @@ impl<'c> Events<'c> {
         Ok(message)
     }
 
-    async fn assign_sequence(&mut self, channel: &Channel) -> Result<Sequence, sqlx::Error> {
+    pub async fn assign_sequence(&mut self, channel: &Channel) -> Result<Sequence, sqlx::Error> {
         let next = sqlx::query_scalar!(
             r#"
                 update channel
@@ -92,10 +92,9 @@ impl<'c> Events<'c> {
         &mut self,
         channel: &Channel,
         message: &message::Id,
+        sequence: Sequence,
         deleted_at: &DateTime,
     ) -> Result<types::ChannelEvent, sqlx::Error> {
-        let sequence = self.assign_sequence(channel).await?;
-
         sqlx::query_scalar!(
             r#"
                 delete from message
@@ -110,8 +109,8 @@ impl<'c> Events<'c> {
         Ok(types::ChannelEvent {
             sequence,
             at: *deleted_at,
-            channel: channel.clone(),
             data: types::MessageDeletedEvent {
+                channel: channel.clone(),
                 message: message.clone(),
             }
             .into(),
@@ -178,8 +177,8 @@ impl<'c> Events<'c> {
         .map(|row| types::ChannelEvent {
             sequence: row.sequence,
             at: row.sent_at,
-            channel: channel.clone(),
             data: types::MessageEvent {
+                channel: channel.clone(),
                 sender: login::Login {
                     id: row.sender_id,
                     name: row.sender_name,
-- 
cgit v1.2.3