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

Fix get_closest_parent and cleanup federation/send/:txn

Browse source
This commit is contained in:
Devin Ragotzy 2020-11-08 13:54:59 -05:00 • committed by Timo Kösters
parent b13049a6fa
commit acd144e934
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
6 changed files with 69 additions and 334 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/client_server/membership.rs
View file

@ -515,9 +515,7 @@ async fn join_room_by_id_helper(
let mut canon_json_stub: BTreeMap<_, ruma::signatures::CanonicalJsonValue> =
serde_json::from_value(join_event_stub_value).expect("json Value is canonical JSON");
// We don't leave the event id into the pdu because that's only allowed in v1 or v2 rooms
// let join_event_stub = join_event_stub_value.as_object_mut().unwrap();
// join_event_stub.remove("event_id");
// We don't leave the event id in the pdu because that's only allowed in v1 or v2 rooms
canon_json_stub.remove("event_id");
// In order to create a compatible ref hash (EventID) the `hashes` field needs to be present