daydream

commit 6dcaaa1d8a153712aab188d11dea80885bca358d
parent 3a34ab7133feb6d4ac37d924af1162f374eb8c29
Author: Marcel <mtrnord1@gmail.com>
Date:   Fri, 10 Jul 2020 16:45:09 +0200

Fix event helpers

Took 6 minutes

Diffstat:
M
src/app/components/events/mod.rs
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/components/events/mod.rs b/src/app/components/events/mod.rs
@@ -1,5 +1,5 @@
 use crate::app::matrix::types::get_media_download_url;
-use matrix_sdk::events::MessageEventStub;
+use matrix_sdk::events::{MessageEventStub, MessageEventContent};
 use matrix_sdk::Room;
 use url::Url;
 
@@ -8,7 +8,7 @@ pub mod notice;
 pub mod text;
 pub mod video;
 
-pub fn is_new_user(prev_event: Option<&MessageEventStub>, event: &MessageEventStub) -> bool {
+pub fn is_new_user<C: MessageEventContent>(prev_event: Option<&MessageEventStub<C>>, event: &MessageEventStub<C>) -> bool {
     if let Some(prev_event) = prev_event {
         prev_event.sender != event.sender
     } else {
@@ -16,7 +16,7 @@ pub fn is_new_user(prev_event: Option<&MessageEventStub>, event: &MessageEventSt
     }
 }
 
-pub fn get_sender_displayname<'a>(room: &'a Room, event: &'a MessageEventStub) -> &'a str {
+pub fn get_sender_displayname<'a, C: MessageEventContent>(room: &'a Room, event: &'a MessageEventStub<C>) -> &'a str {
     room.joined_members
         .get(&event.sender)
         .or_else(|| room.invited_members.get(&event.sender))
@@ -24,7 +24,7 @@ pub fn get_sender_displayname<'a>(room: &'a Room, event: &'a MessageEventStub) -
         .unwrap_or_else(|| event.sender.as_deref())
 }
 
-pub fn get_sender_avatar<'a>(homeserver_url: &'a Url, room: &'a Room, event: &'a MessageEventStub) -> Option<Url> {
+pub fn get_sender_avatar<'a, C: MessageEventContent>(homeserver_url: &'a Url, room: &'a Room, event: &'a MessageEventStub<C>) -> Option<Url> {
     let member = room
         .joined_members
         .get(&event.sender)