dolysis/conduwuit
3
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2024-11-27 11:45:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pdu-success' into 'master'

Browse source 
fix: also return successful PDUs in /send/:txnId

See merge request famedly/conduit!90
This commit is contained in:
Timo Kösters 2021-05-27 21:24:43 +00:00
parent 25b1cd2683 7db59c550f
commit 0805f4ac2a
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/server_server.rs
View file

@ -628,19 +628,20 @@ pub async fn send_transaction_message_route<'a>(
};
let start_time = Instant::now();
if let Err(e) = handle_incoming_pdu(
&body.origin,
&event_id,
value,
true,
&db,
&pub_key_map,
&mut auth_cache,
)
.await
{
resolved_map.insert(event_id.clone(), Err(e));
}
resolved_map.insert(
event_id.clone(),
handle_incoming_pdu(
&body.origin,
&event_id,
value,
true,
&db,
&pub_key_map,
&mut auth_cache,
)
.await
.map(|_| ()),
);
let elapsed = start_time.elapsed();
if elapsed > Duration::from_secs(1) {