Merge branch 'fixmakejoin' into 'next'

fix: make join should not send event id

See merge request famedly/conduit!390

src/api/server_server.rs

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