youwen/iamb
1
0
Fork 0
mirror of https://github.com/youwen5/iamb.git synced 2025-06-20 05:39:52 -07:00
Code Issues Projects Releases Packages Wiki Activity

Emote messages should always show sender (#65)

Browse source
This commit is contained in:
Ulyssa 2023-03-21 14:02:42 -07:00
parent e6cdd02f22
commit e98d58a8cc
No known key found for this signature in database
GPG key ID: 1B3965A3D18B9B64
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/message/mod.rs
View file

@ -342,6 +342,23 @@ impl MessageEvent {
}
}
pub fn content(&self) -> Option<&RoomMessageEventContent> {
match self {
MessageEvent::EncryptedOriginal(_) => None,
MessageEvent::Original(ev) => Some(&ev.content),
MessageEvent::EncryptedRedacted(_) => None,
MessageEvent::Redacted(_) => None,
MessageEvent::Local(_, content) => Some(content),
}
}
pub fn is_emote(&self) -> bool {
matches!(
self.content(),
Some(RoomMessageEventContent { msgtype: MessageType::Emote(_), .. })
)
}
pub fn body(&self) -> Cow<'_, str> {
match self {
MessageEvent::EncryptedOriginal(_) => "[Unable to decrypt message]".into(),
@ -771,7 +788,10 @@ impl Message {
settings: &ApplicationSettings,
) -> Option<Span> {
if let Some(prev) = prev {
if self.sender == prev.sender && self.timestamp.same_day(&prev.timestamp) {
if self.sender == prev.sender &&
self.timestamp.same_day(&prev.timestamp) &&
!self.event.is_emote()
{
return None;
}
}