refactor sending interface stack
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
parent
f956e8c3b5
commit
4becbed2a7
5 changed files with 95 additions and 68 deletions
|
@ -1348,16 +1348,7 @@ pub(crate) async fn invite_helper(
|
|||
"Could not accept incoming PDU as timeline event.",
|
||||
))?;
|
||||
|
||||
// Bind to variable because of lifetimes
|
||||
let servers = services()
|
||||
.rooms
|
||||
.state_cache
|
||||
.room_servers(room_id)
|
||||
.filter_map(Result::ok)
|
||||
.filter(|server| &**server != services().globals.server_name());
|
||||
|
||||
services().sending.send_pdu(servers, &pdu_id)?;
|
||||
|
||||
services().sending.send_pdu_room(room_id, &pdu_id)?;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ pub async fn send_event_to_device_route(
|
|||
messages.insert(target_user_id.clone(), map);
|
||||
let count = services().globals.next_count()?;
|
||||
|
||||
services().sending.send_reliable_edu(
|
||||
services().sending.send_edu_server(
|
||||
target_user_id.server_name(),
|
||||
serde_json::to_vec(&federation::transactions::edu::Edu::DirectToDevice(DirectDeviceContent {
|
||||
sender: sender_user.clone(),
|
||||
|
@ -46,7 +46,6 @@ pub async fn send_event_to_device_route(
|
|||
messages,
|
||||
}))
|
||||
.expect("DirectToDevice EDU can be serialized"),
|
||||
count,
|
||||
)?;
|
||||
|
||||
continue;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue