fix: Re-add support for MSC4293

src/api/client/membership/ban.rs

@@ -34,8 +34,8 @@ pub(crate) async fn ban_user_route(
 			PartialPdu::state(
 				body.user_id.to_string(),
 				&assign!(RoomMemberEventContent::new(MembershipState::Ban), {
-					reason: body.reason.clone()
-					// TODO(upstream): MSC4293
+					reason: body.reason.clone(),
+					redact_events: body.redact_events,
 				}),
 			),
 			sender_user,

src/api/client/membership/kick.rs

@@ -38,7 +38,7 @@ pub(crate) async fn kick_user_route(
 				body.user_id.to_string(),
 				&assign!(RoomMemberEventContent::new(MembershipState::Leave), {
 					reason: body.reason.clone(),
-					// TODO(upstream): MSC4293
+					redact_events: body.redact_events,
 				}),
 			),
 			sender_user,

src/service/rooms/event_handler/parse_incoming_pdu.rs

@@ -6,7 +6,9 @@ use conduwuit::{
 };
 use itertools::Itertools;
 use ruma::{
-	CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedRoomId, RoomId, RoomVersionId };
+	CanonicalJsonObject, CanonicalJsonValue, EventId, OwnedEventId, OwnedRoomId, RoomId,
+	RoomVersionId,
+};
 use serde_json::value::RawValue as RawJsonValue;
 
 type Parsed = (OwnedRoomId, OwnedEventId, CanonicalJsonObject);
@@ -40,7 +42,10 @@ fn extract_room_id(event_type: &str, pdu: &CanonicalJsonObject) -> Result<OwnedR
 		return Err!(Request(BadJson("Unknown room version in pdu")));
 	};
 
-	if !room_version_rules.authorization.room_create_event_id_as_room_id {
+	if !room_version_rules
+		.authorization
+		.room_create_event_id_as_room_id
+	{
 		return Err!(Request(BadJson("Missing room_id in pdu")));
 	}
 
@@ -116,9 +121,10 @@ pub async fn parse_incoming_pdu(&self, pdu: &RawJsonValue) -> Result<Parsed> {
 		.rules()
 		.unwrap();
 
-	let (event_id, value) = gen_event_id_canonical_json(pdu, &room_version_rules).map_err(|e| {
-		err!(Request(InvalidParam("Could not convert event to canonical json: {e}")))
-	})?;
+	let (event_id, value) =
+		gen_event_id_canonical_json(pdu, &room_version_rules).map_err(|e| {
+			err!(Request(InvalidParam("Could not convert event to canonical json: {e}")))
+		})?;
 	self.validate_pdu(&value)?;
 	Ok((room_id, event_id, value))
 }