From 58abd51d1ec486d980d59f01b3e98874fe1401ad Mon Sep 17 00:00:00 2001
From: Timo <timo@koesters.xyz>
Date: Wed, 12 Aug 2020 14:11:11 +0200
Subject: [PATCH] Fix create_join_event and create_join_event_template
 endpoints

---
 ruma-federation-api/CHANGELOG.md                           | 3 ++-
 ruma-federation-api/src/membership/create_join_event.rs    | 1 +
 ruma-federation-api/src/membership/create_join_event/v1.rs | 5 +++--
 ruma-federation-api/src/membership/create_join_event/v2.rs | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ruma-federation-api/CHANGELOG.md b/ruma-federation-api/CHANGELOG.md
index 1bd904e3..8e996ccf 100644
--- a/ruma-federation-api/CHANGELOG.md
+++ b/ruma-federation-api/CHANGELOG.md
@@ -3,6 +3,7 @@
 Breaking Changes:
 
 * Replace `directory::get_public_rooms::v1::{PublicRoomsChunk, RoomNetwork}` with types from `ruma_common::directory`
+* Wrap `PduStub`s in `membership::create_join_event` in `Raw`
 
 Improvements:
 
@@ -17,6 +18,7 @@ Improvements:
       query_keys::v1,
   },
   membership::create_invite::{v1, v2},
+  membership::create_join_event::v2,
   ```
 
 # 0.0.3
@@ -31,7 +33,6 @@ Improvements:
 
   ```
   authorization::get_event_authorization::v1,
-  membership::create_join_event::v2,
   openid::get_openid_userinfo::v1,
   query::get_profile_information::v1,
   transactions::send_transaction_message::v1,
diff --git a/ruma-federation-api/src/membership/create_join_event.rs b/ruma-federation-api/src/membership/create_join_event.rs
index f216186f..4e8f8e76 100644
--- a/ruma-federation-api/src/membership/create_join_event.rs
+++ b/ruma-federation-api/src/membership/create_join_event.rs
@@ -1,6 +1,7 @@
 //! Endpoint to send join events to remote homeservers.
 
 pub mod v1;
+pub mod v2;
 
 use ruma_common::Raw;
 use ruma_events::pdu::Pdu;
diff --git a/ruma-federation-api/src/membership/create_join_event/v1.rs b/ruma-federation-api/src/membership/create_join_event/v1.rs
index f60af334..2b28d199 100644
--- a/ruma-federation-api/src/membership/create_join_event/v1.rs
+++ b/ruma-federation-api/src/membership/create_join_event/v1.rs
@@ -2,6 +2,7 @@
 
 use ruma_api::ruma_api;
 use ruma_events::pdu::PduStub;
+use ruma_common::Raw;
 use ruma_identifiers::{EventId, RoomId};
 
 use super::RoomState;
@@ -26,11 +27,11 @@ ruma_api! {
 
         /// PDU type without event and room IDs.
         #[ruma_api(body)]
-        pub pdu_stub: PduStub,
+        pub pdu_stub: Raw<PduStub>,
     }
 
     response: {
-        /// Full state of the room.
+        /// Full state and auth chain of the room prior to the join event.
         #[ruma_api(body)]
         #[serde(with = "crate::serde::room_state")]
         pub room_state: RoomState,
diff --git a/ruma-federation-api/src/membership/create_join_event/v2.rs b/ruma-federation-api/src/membership/create_join_event/v2.rs
index dfb1eb39..89a15334 100644
--- a/ruma-federation-api/src/membership/create_join_event/v2.rs
+++ b/ruma-federation-api/src/membership/create_join_event/v2.rs
@@ -2,6 +2,7 @@
 
 use ruma_api::ruma_api;
 use ruma_events::pdu::PduStub;
+use ruma_common::Raw;
 use ruma_identifiers::{EventId, RoomId};
 
 use super::RoomState;
@@ -26,11 +27,12 @@ ruma_api! {
 
         /// PDU type without event and room IDs.
         #[ruma_api(body)]
-        pub pdu_stub: PduStub,
+        pub pdu_stub: Raw<PduStub>,
     }
 
     response: {
         /// Full state of the room.
+        #[ruma_api(body)]
         pub room_state: RoomState,
     }
 }