refactor: Ruma upstreaming, half-baked edition

Co-authored-by: Jade Ellis <jade@ellis.link>

src/api/client/membership/ban.rs

@@ -24,30 +24,29 @@ pub(crate) async fn ban_user_route(
 		return Err!(Request(UserSuspended("You cannot perform this action while suspended.")));
 	}
 
-	let state_lock = services.rooms.state.mutex.lock(&body.room_id).await;
+	let state_lock = services.rooms.state.mutex.lock(body.room_id.as_str()).await;
 
-	let current_member_content = services
+	let mut content = services
 		.rooms
 		.state_accessor
 		.get_member(&body.room_id, &body.user_id)
 		.await
 		.unwrap_or_else(|_| RoomMemberEventContent::new(MembershipState::Ban));
 
+	content.membership = MembershipState::Ban;
+	content.reason = body.reason.clone();
+	content.displayname = None;
+	content.avatar_url = None;
+	content.is_direct = None;
+	content.join_authorized_via_users_server = None;
+	content.third_party_invite = None;
+	// TODO(upstream): MSC4293
+
 	services
 		.rooms
 		.timeline
 		.build_and_append_pdu(
-			PduBuilder::state(body.user_id.to_string(), &RoomMemberEventContent {
-				membership: MembershipState::Ban,
-				reason: body.reason.clone(),
-				displayname: None, // display name may be offensive
-				avatar_url: None,  // avatar may be offensive
-				is_direct: None,
-				join_authorized_via_users_server: None,
-				third_party_invite: None,
-				redact_events: body.redact_events,
-				..current_member_content
-			}),
+			PduBuilder::state(body.user_id.to_string(), &content),
 			sender_user,
 			Some(&body.room_id),
 			&state_lock,