dolysis
/
conduwuit
mirror of https://github.com/girlbossceo/conduwuit.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'claimfast' into 'next' 

improvement: more efficient /claim

See merge request famedly/conduit!389
This commit is contained in:
Timo Kösters 2022-10-12 09:09:23 +00:00
parent 1e725bc548 0290f1f355
commit 4d982d05af
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/api/client_server/keys.rs
View File

@ -440,25 +440,35 @@ pub(crate) async fn claim_keys_helper(
let mut failures = BTreeMap::new(); let mut failures = BTreeMap::new();
for (server, vec) in get_over_federation { let mut futures: FuturesUnordered<_> = get_over_federation
.into_iter()
.map(|(server, vec)| async move {
let mut one_time_keys_input_fed = BTreeMap::new(); let mut one_time_keys_input_fed = BTreeMap::new();
for (user_id, keys) in vec { for (user_id, keys) in vec {
one_time_keys_input_fed.insert(user_id.clone(), keys.clone()); one_time_keys_input_fed.insert(user_id.clone(), keys.clone());
} }
// Ignore failures (
if let Ok(keys) = services()
.sending
.send_federation_request(
server, server,
federation::keys::claim_keys::v1::Request { services()
one_time_keys: one_time_keys_input_fed, .sending
}, .send_federation_request(
server,
federation::keys::claim_keys::v1::Request {
one_time_keys: one_time_keys_input_fed,
},
)
.await,
) )
.await }).collect();
{
one_time_keys.extend(keys.one_time_keys); while let Some((server, response)) = futures.next().await {
} else { match response {
failures.insert(server.to_string(), json!({})); Ok(keys) => {
one_time_keys.extend(keys.one_time_keys);
}
Err(_e) => {
failures.insert(server.to_string(), json!({}));
}
} }
} }