oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-08-16 18:01:35 +00:00
Code Wiki Activity

Upgrade Ruma

Browse source
This commit is contained in:
Jonas Platte 2022-04-15 12:10:16 +02:00
parent 39bc84d81c
commit eeda7cbe0a
No known key found for this signature in database
GPG key ID: CC154DE0E30B7C67
4 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/client_server/membership.rs
View file

@ -416,7 +416,7 @@ pub async fn get_member_events_route(
.room_state_full(&body.room_id)?
.iter()
.filter(|(key, _)| key.0 == StateEventType::RoomMember)
.map(|(_, pdu)| pdu.to_member_event().into())
.map(|(_, pdu)| pdu.to_member_event().cast())
.collect(),
})
}

5
src/database/pusher.rs
View file

@ -274,10 +274,7 @@ async fn send_notice(
};
let mut device = Device::new(pusher.app_id.clone(), pusher.pushkey.clone());
let mut data_minus_url = pusher.data.clone();
// The url must be stripped off according to spec
data_minus_url.url = None;
device.data = data_minus_url;
device.data = pusher.data.clone().into();
// Tweaks are only added if the format is NOT event_id_only
if !event_id_only {