TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improvement, maybe not safe

Browse source
This commit is contained in:
Timo Kösters 2021-12-19 10:48:28 +01:00
parent 83a9095cdc
commit ee3d2db8e0
No known key found for this signature in database
GPG key ID: 356E705610F626D5
1 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/server_server.rs
View file

@ -1686,25 +1686,6 @@ async fn upgrade_outlier_to_timeline_pdu(
// We do this by adding the current state to the list of fork states // We do this by adding the current state to the list of fork states
extremity_sstatehashes.remove(&current_sstatehash); extremity_sstatehashes.remove(&current_sstatehash);
fork_states.push(current_state_ids); fork_states.push(current_state_ids);
dbg!(&extremity_sstatehashes);
for (sstatehash, leaf_pdu) in extremity_sstatehashes {
let mut leaf_state = db
.rooms
.state_full_ids(sstatehash)
.map_err(|_| "Failed to ask db for room state.".to_owned())?;
if let Some(state_key) = &leaf_pdu.state_key {
let shortstatekey = db
.rooms
.get_or_create_shortstatekey(&leaf_pdu.kind, state_key, &db.globals)
.map_err(|_| "Failed to create shortstatekey.".to_owned())?;
leaf_state.insert(shortstatekey, Arc::from(&*leaf_pdu.event_id));
// Now it's the state after the pdu
}
fork_states.push(leaf_state);
}
// We also add state after incoming event to the fork states // We also add state after incoming event to the fork states
let mut state_after = state_at_incoming_event.clone(); let mut state_after = state_at_incoming_event.clone();
@ -1941,7 +1922,7 @@ pub(crate) fn fetch_and_handle_outliers<'a>(
} }
} }
while let Some((next_id, value)) = events_in_reverse_order.pop() { for (next_id, value) in events_in_reverse_order {
match handle_outlier_pdu( match handle_outlier_pdu(
origin, origin,
create_event, create_event,
@ -1954,7 +1935,9 @@ pub(crate) fn fetch_and_handle_outliers<'a>(
.await .await
{ {
Ok((pdu, json)) => { Ok((pdu, json)) => {
pdus.push((pdu, Some(json))); if next_id == *id {
pdus.push((pdu, Some(json)));
}
} }
Err(e) => { Err(e) => {
warn!("Authentication of event {} failed: {:?}", next_id, e); warn!("Authentication of event {} failed: {:?}", next_id, e);