federation-api: Make /v1/send_join use RawValue for body rather than using query parameters

crates/ruma-federation-api/CHANGELOG.md

@@ -1,5 +1,10 @@
 # [unreleased]
 
+Breaking changes:
+
+* Use `RawValue` to represent body of `/v1/send_join` request, rather than incorrectly using
+  query parameters
+
 Improvements:
 
 * Implement `From<SpaceHierarchyParentSummary>` for `SpaceHierarchyChildSummary`

crates/ruma-federation-api/src/membership/create_leave_event/v1.rs

@@ -2,15 +2,12 @@
 //!
 //! [spec]: https://spec.matrix.org/latest/server-server-api/#put_matrixfederationv1send_leaveroomideventid
 
-use js_int::UInt;
 use ruma_common::{
     api::{request, response, Metadata},
-    metadata,
+    metadata, OwnedEventId, OwnedRoomId,
-    serde::Raw,
-    MilliSecondsSinceUnixEpoch, OwnedEventId, OwnedRoomId, OwnedServerName, OwnedUserId,
 };
-use ruma_events::{room::member::RoomMemberEventContent, StateEventType};
 use serde::{Deserialize, Serialize};
+use serde_json::value::RawValue as RawJsonValue;
 
 const METADATA: Metadata = metadata! {
     method: PUT,
@@ -26,6 +23,8 @@ const METADATA: Metadata = metadata! {
 #[request]
 pub struct Request {
     /// The room ID that is about to be left.
+    ///
+    /// Do not use this. Instead, use the `room_id` field inside the PDU.
     #[ruma_api(path)]
     pub room_id: OwnedRoomId,
 
@@ -33,34 +32,9 @@ pub struct Request {
     #[ruma_api(path)]
     pub event_id: OwnedEventId,
 
-    /// The user ID of the leaving member.
+    /// The PDU.
-    #[ruma_api(query)]
+    #[ruma_api(body)]
-    pub sender: OwnedUserId,
+    pub pdu: Box<RawJsonValue>,
-
-    /// The name of the leaving homeserver.
-    #[ruma_api(query)]
-    pub origin: OwnedServerName,
-
-    /// A timestamp added by the leaving homeserver.
-    #[ruma_api(query)]
-    pub origin_server_ts: MilliSecondsSinceUnixEpoch,
-
-    /// The value `m.room.member`.
-    #[ruma_api(query)]
-    #[serde(rename = "type")]
-    pub event_type: StateEventType,
-
-    /// The user ID of the leaving member.
-    #[ruma_api(query)]
-    pub state_key: String,
-
-    /// The content of the event.
-    #[ruma_api(query)]
-    pub content: Raw<RoomMemberEventContent>,
-
-    /// This field must be present but is ignored; it may be 0.
-    #[ruma_api(query)]
-    pub depth: UInt,
 }
 
 /// Response type for the `create_leave_event` endpoint.
@@ -75,66 +49,10 @@ pub struct Response {
     pub empty: Empty,
 }
 
-/// Initial set of fields of `Request`.
+impl Request {
-///
+    /// Creates a new `Request` from the given room ID, event ID and PDU.
-/// This struct will not be updated even if additional fields are added to `Request` in a
+    pub fn new(room_id: OwnedRoomId, event_id: OwnedEventId, pdu: Box<RawJsonValue>) -> Self {
-/// new (non-breaking) release of the Matrix specification.
+        Self { room_id, event_id, pdu }
-#[derive(Debug)]
-#[allow(clippy::exhaustive_structs)]
-pub struct RequestInit {
-    /// The room ID that is about to be left.
-    pub room_id: OwnedRoomId,
-
-    /// The event ID for the leave event.
-    pub event_id: OwnedEventId,
-
-    /// The user ID of the leaving member.
-    pub sender: OwnedUserId,
-
-    /// The name of the leaving homeserver.
-    pub origin: OwnedServerName,
-
-    /// A timestamp added by the leaving homeserver.
-    pub origin_server_ts: MilliSecondsSinceUnixEpoch,
-
-    /// The value `m.room.member`.
-    pub event_type: StateEventType,
-
-    /// The user ID of the leaving member.
-    pub state_key: String,
-
-    /// The content of the event.
-    pub content: Raw<RoomMemberEventContent>,
-
-    /// This field must be present but is ignored; it may be 0.
-    pub depth: UInt,
-}
-
-impl From<RequestInit> for Request {
-    /// Creates a new `Request` from `RequestInit`.
-    fn from(init: RequestInit) -> Self {
-        let RequestInit {
-            room_id,
-            event_id,
-            sender,
-            origin,
-            origin_server_ts,
-            event_type,
-            state_key,
-            content,
-            depth,
-        } = init;
-        Self {
-            room_id,
-            event_id,
-            sender,
-            origin,
-            origin_server_ts,
-            event_type,
-            state_key,
-            content,
-            depth,
-        }
     }
 }