jimzah/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-01-18 20:20:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fixmakejoin' into 'next'

Browse Source 
fix: make join should not send event id

See merge request famedly/conduit!390
This commit is contained in:
Timo Kösters 2022-10-12 09:08:58 +00:00
commit 1e725bc548
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/server_server.rs
View File

@ -1313,7 +1313,7 @@ pub async fn create_join_event_template_route(
}) })
.expect("member event is valid value"); .expect("member event is valid value");
let (_pdu, pdu_json) = services().rooms.timeline.create_hash_and_sign_event( let (_pdu, mut pdu_json) = services().rooms.timeline.create_hash_and_sign_event(
PduBuilder { PduBuilder {
event_type: RoomEventType::RoomMember, event_type: RoomEventType::RoomMember,
content, content,
@ -1328,6 +1328,8 @@ pub async fn create_join_event_template_route(
drop(state_lock); drop(state_lock);
pdu_json.remove("event_id");
Ok(prepare_join_event::v1::Response { Ok(prepare_join_event::v1::Response {
room_version: Some(room_version_id), room_version: Some(room_version_id),
event: to_raw_value(&pdu_json).expect("CanonicalJson can be serialized to JSON"), event: to_raw_value(&pdu_json).expect("CanonicalJson can be serialized to JSON"),