diff options
Diffstat (limited to 'src/events')
| -rw-r--r-- | src/events/repo/message.rs | 12 | ||||
| -rw-r--r-- | src/events/types.rs | 3 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/events/repo/message.rs b/src/events/repo/message.rs index b4724ea..ec17d55 100644 --- a/src/events/repo/message.rs +++ b/src/events/repo/message.rs @@ -58,9 +58,11 @@ impl<'c> Events<'c> { at: row.sent_at, channel: channel.clone(), data: types::MessageEvent { - id: row.id, sender: sender.clone(), - body: row.body, + message: message::Message { + id: row.id, + body: row.body, + }, } .into(), }) @@ -128,12 +130,14 @@ impl<'c> Events<'c> { at: row.sent_at, channel: channel.clone(), data: types::MessageEvent { - id: row.id, sender: login::Login { id: row.sender_id, name: row.sender_name, }, - body: row.body, + message: message::Message { + id: row.id, + body: row.body, + }, } .into(), }) diff --git a/src/events/types.rs b/src/events/types.rs index 7c0e0a4..944321a 100644 --- a/src/events/types.rs +++ b/src/events/types.rs @@ -123,9 +123,8 @@ pub enum ChannelEventData { #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)] pub struct MessageEvent { - pub id: message::Id, pub sender: Login, - pub body: String, + pub message: message::Message, } impl From<MessageEvent> for ChannelEventData { |