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

0 errors left!

Browse source
This commit is contained in:
Timo Kösters 2022-10-08 13:02:52 +02:00 • committed by Nyaaori
parent f47a5cd5d5
commit d5b4754cf4
No known key found for this signature in database
GPG key ID: E7819C3ED4D1F82E
59 changed files with 656 additions and 563 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -670,7 +670,7 @@ async fn join_room_by_id_helper(
.add_pdu_outlier(&event_id, &value)?;
}
let shortstatehash = services().rooms.state.set_event_state(
let statehash_before_join = services().rooms.state.set_event_state(
event_id,
room_id,
state
@ -684,8 +684,15 @@ async fn join_room_by_id_helper(
.collect::<Result<_>>()?,
)?;
services()
.rooms
.state
.set_room_state(room_id, statehash_before_join, &state_lock)?;
// 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.
let statehash_after_join = services().rooms.state.append_to_state(&parsed_pdu)?;
services().rooms.timeline.append_pdu(
&parsed_pdu,
join_event,
@ -698,9 +705,7 @@ async fn join_room_by_id_helper(
services()
.rooms
.state
.set_room_state(room_id, shortstatehash, &state_lock)?;
let statehashid = services().rooms.state.append_to_state(&parsed_pdu)?;
.set_room_state(room_id, statehash_after_join, &state_lock)?;
} else {
let event = RoomMemberEventContent {
membership: MembershipState::Join,

2
src/api/server_server.rs
View file

@ -1319,7 +1319,7 @@ pub async fn create_join_event_template_route(
})
.expect("member event is valid value");
let (pdu, pdu_json) = services().rooms.timeline.create_hash_and_sign_event(
let (_pdu, pdu_json) = services().rooms.timeline.create_hash_and_sign_event(
PduBuilder {
event_type: RoomEventType::RoomMember,
content,