MirrorHub/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-11-16 05:11:05 +01:00
Code Issues Releases Activity

cargo fmt

Browse source
This commit is contained in:
Timo Kösters 2022-10-11 18:10:51 +02:00
parent d1e5acd7b3
commit 8105c5cc60
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/api/client_server/sync.rs
View file

@ -901,10 +901,10 @@ async fn sync_helper(
.state_full_ids(left_shortstatehash)
.await?;
let leave_shortstatekey = services().rooms.short.get_or_create_shortstatekey(
&StateEventType::RoomMember,
&sender_user.as_str(),
)?;
let leave_shortstatekey = services()
.rooms
.short
.get_or_create_shortstatekey(&StateEventType::RoomMember, &sender_user.as_str())?;
left_state_ids.insert(leave_shortstatekey, left_event_id);

19
src/api/server_server.rs
View file

@ -1149,18 +1149,15 @@ pub async fn get_room_state_route(
Ok(get_room_state::v1::Response {
auth_chain: auth_chain_ids
.filter_map(|id| {
match services()
.rooms
.timeline
.get_pdu_json(&id).ok()? {
Some(json) => Some(PduEvent::convert_to_outgoing_federation_event(json)),
None => {
error!("Could not find event json for {id} in db.");
None
}
.filter_map(
|id| match services().rooms.timeline.get_pdu_json(&id).ok()? {
Some(json) => Some(PduEvent::convert_to_outgoing_federation_event(json)),
None => {
error!("Could not find event json for {id} in db.");
None
}
})
},
)
.collect(),
pdus,
})