From 6f26be1c6e80d400d7230ecaeec0c2c7ac4529ec Mon Sep 17 00:00:00 2001 From: strawberry <strawberry@puppygock.gay> Date: Fri, 9 Feb 2024 20:53:04 -0500 Subject: [PATCH] eat less /ban endpoint fields, fix ban reason not consistently applied Signed-off-by: strawberry <strawberry@puppygock.gay> --- src/api/client_server/membership.rs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/api/client_server/membership.rs b/src/api/client_server/membership.rs index b953b651..054d151b 100644 --- a/src/api/client_server/membership.rs +++ b/src/api/client_server/membership.rs @@ -259,7 +259,16 @@ 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, - reason: event.reason, + displayname: services() + .users + .displayname(&body.user_id) + .unwrap_or_default(), + avatar_url: services() + .users + .avatar_url(&body.user_id) + .unwrap_or_default(), + blurhash: services().users.blurhash(&body.user_id).unwrap_or_default(), + reason: body.reason.clone(), ..event }) .map_err(|_| Error::bad_database("Invalid member event in database."))