rzerres/conduit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump Ruma

Browse Source
This commit is contained in:
Kévin Commaille
2023-02-26 16:29:06 +01:00
parent f704169aeb
commit f53ecaa97d
17 changed files with 228 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/service/pusher/mod.rs
View File

@@ -15,7 +15,7 @@ use ruma::{
},
events::{
room::{name::RoomNameEventContent, power_levels::RoomPowerLevelsEventContent},
RoomEventType, StateEventType,
StateEventType, TimelineEventType,
},
push::{Action, PushConditionRoomCtx, PushFormat, Ruleset, Tweak},
serde::Raw,
@@ -169,6 +169,7 @@ impl Service {
tweaks.push(tweak.clone());
continue;
}
_ => false,
};
if notify.is_some() {
@@ -248,7 +249,7 @@ impl Service {
// TODO: missed calls
notifi.counts = NotificationCounts::new(unread, uint!(0));
if event.kind == RoomEventType::RoomEncrypted
if event.kind == TimelineEventType::RoomEncrypted
|| tweaks
.iter()
.any(|t| matches!(t, Tweak::Highlight(true) | Tweak::Sound(_)))
@@ -264,7 +265,7 @@ impl Service {
notifi.event_type = Some(event.kind.clone());
notifi.content = serde_json::value::to_raw_value(&event.content).ok();
if event.kind == RoomEventType::RoomMember {
if event.kind == TimelineEventType::RoomMember {
notifi.user_is_target =
event.state_key.as_deref() == Some(event.sender.as_str());
}