From 0f6b771cdd55633af3bcdb706d48139532106412 Mon Sep 17 00:00:00 2001
From: Matthias Ahouansou <matthias@ahouansou.cz>
Date: Wed, 3 Apr 2024 22:42:14 +0100
Subject: [PATCH] fix(membership): remove join_authorized_via_users_server
 field on state update

---
 src/api/client_server/membership.rs | 2 ++
 src/api/client_server/profile.rs    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/api/client_server/membership.rs b/src/api/client_server/membership.rs
index bc84b262..86ac5950 100644
--- a/src/api/client_server/membership.rs
+++ b/src/api/client_server/membership.rs
@@ -270,6 +270,7 @@ pub async fn ban_user_route(body: Ruma<ban_user::v3::Request>) -> Result<ban_use
                 serde_json::from_str(event.content.get())
                     .map(|event: RoomMemberEventContent| RoomMemberEventContent {
                         membership: MembershipState::Ban,
+                        join_authorized_via_users_server: None,
                         ..event
                     })
                     .map_err(|_| Error::bad_database("Invalid member event in database."))
@@ -1465,6 +1466,7 @@ pub async fn leave_room(user_id: &UserId, room_id: &RoomId, reason: Option<Strin
 
         event.membership = MembershipState::Leave;
         event.reason = reason;
+        event.join_authorized_via_users_server = None;
 
         services()
             .rooms
diff --git a/src/api/client_server/profile.rs b/src/api/client_server/profile.rs
index 9e6b277d..cf1db2d7 100644
--- a/src/api/client_server/profile.rs
+++ b/src/api/client_server/profile.rs
@@ -40,6 +40,7 @@ pub async fn set_displayname_route(
                     event_type: TimelineEventType::RoomMember,
                     content: to_raw_value(&RoomMemberEventContent {
                         displayname: body.displayname.clone(),
+                        join_authorized_via_users_server: None,
                         ..serde_json::from_str(
                             services()
                                 .rooms
@@ -174,6 +175,7 @@ pub async fn set_avatar_url_route(
                     event_type: TimelineEventType::RoomMember,
                     content: to_raw_value(&RoomMemberEventContent {
                         avatar_url: body.avatar_url.clone(),
+                        join_authorized_via_users_server: None,
                         ..serde_json::from_str(
                             services()
                                 .rooms