nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

fix: update state_cache on join over federation

Browse source
This commit is contained in:
Timo Kösters 2022-10-09 13:15:26 +02:00 • committed by Nyaaori
parent 5a04559cb4
commit 1a7893dbbd
No known key found for this signature in database
GPG key ID: E7819C3ED4D1F82E
6 changed files with 22 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/api/client_server/membership.rs
View file

@ -669,24 +669,21 @@ async fn join_room_by_id_helper(
.add_pdu_outlier(&event_id, &value)?;
}
let statehash_before_join = services().rooms.state.set_event_state(
event_id,
let (statehash_before_join, new, removed) = services().rooms.state_compressor.save_state(
room_id,
state
.into_iter()
.map(|(k, id)| {
services()
.rooms
.state_compressor
.compress_state_event(k, &id)
})
.map(|(k, id)| services().rooms.state_compressor.compress_state_event(k, &id))
.collect::<Result<_>>()?,
)?;
services()
.rooms
.state
.set_room_state(room_id, statehash_before_join, &state_lock)?;
.force_state(room_id, statehash_before_join, new, removed, &state_lock)
.await?;
services().rooms.state_cache.update_joined_count(room_id)?;
// We append to state before appending the pdu, so we don't have a moment in time with the
// pdu without it's state. This is okay because append_pdu can't fail.