From a48c19f8c933291a3e65a3143eabda03e8bf1ede Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Sun, 15 Sep 2024 22:39:23 -0400
Subject: Annotate channel events with channel ID at the router, not
 intrinsically.

This bugged me aesthetically. At `app.channel().events(channel)`, the caller knows the channel ID; they don't need to be told. Having the same info come back out in the returned events felt bad.
---
 src/channel/repo/messages.rs | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/channel')

diff --git a/src/channel/repo/messages.rs b/src/channel/repo/messages.rs
index e15a02a..2c89724 100644
--- a/src/channel/repo/messages.rs
+++ b/src/channel/repo/messages.rs
@@ -26,7 +26,6 @@ pub struct Messages<'t>(&'t mut SqliteConnection);
 pub struct BroadcastMessage {
     pub id: Id,
     pub sender: Login,
-    pub channel: ChannelId,
     pub body: String,
     pub sent_at: DateTime,
 }
@@ -51,7 +50,6 @@ impl<'c> Messages<'c> {
                 returning
                     id as "id: Id",
                     sender as "sender: LoginId",
-                    channel as "channel: ChannelId",
                     body,
                     sent_at as "sent_at: DateTime"
             "#,
@@ -66,7 +64,6 @@ impl<'c> Messages<'c> {
             BroadcastMessage {
                 id: row.id,
                 sender: sender.clone(),
-                channel: row.channel,
                 body: row.body,
                 sent_at: row.sent_at,
             }
@@ -88,7 +85,6 @@ impl<'c> Messages<'c> {
                     message.id as "id: Id",
                     login.id as "sender_id: LoginId",
                     login.name as sender_name,
-                    message.channel as "channel: ChannelId",
                     message.body,
                     message.sent_at as "sent_at: DateTime"
                 from message
@@ -106,7 +102,6 @@ impl<'c> Messages<'c> {
                 id: row.sender_id,
                 name: row.sender_name,
             },
-            channel: row.channel,
             body: row.body,
             sent_at: row.sent_at,
         })
-- 
cgit v1.2.3