fix: membership deserializing

2021-04-09 21:38:16 +02:00 · 2021-04-09 21:38:16 +02:00 · 84f4ce73e5
commit 84f4ce73e5
parent 51aa6448bc
9 changed files with 74 additions and 63 deletions
--- a/src/client_server/membership.rs
+++ b/src/client_server/membership.rs
@ -604,12 +604,16 @@ async fn join_room_by_id_helper(
                    db.rooms.update_membership(
                        &pdu.room_id,
                        &target_user_id,
-                        serde_json::from_value::<member::MemberEventContent>(pdu.content.clone())
-                            .map_err(|_| {
-                            Error::BadRequest(
-                                ErrorKind::InvalidParam,
-                                "Invalid member event content.",
-                            )
+                        serde_json::from_value::<member::MembershipState>(
+                            pdu.content
+                                .get("membership")
+                                .ok_or_else(|| {
+                                    Error::BadServerResponse("Invalid member event content")
+                                })?
+                                .clone(),
+                        )
+                        .map_err(|_| {
+                            Error::BadServerResponse("Invalid membership state content.")
                        })?,
                        &pdu.sender,
                        &db.account_data,