chain_width to 50

Signed-off-by: Jason Volk <jason@zemos.net>

src/api/client/room/aliases.rs

@@ -15,7 +15,10 @@ pub(crate) async fn get_room_aliases_route(
 	State(services): State<crate::State>,
 	body: Ruma<aliases::v3::Request>,
 ) -> Result<aliases::v3::Response> {
-	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+	let sender_user = body
+		.sender_user
+		.as_ref()
+		.expect("user is authenticated");
 
 	if !services
 		.rooms

src/api/client/room/create.rs

@@ -58,7 +58,10 @@ pub(crate) async fn create_room_route(
 ) -> Result<create_room::v3::Response> {
 	use create_room::v3::RoomPreset;
 
-	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+	let sender_user = body
+		.sender_user
+		.as_ref()
+		.expect("user is authenticated");
 
 	if !services.globals.allow_room_creation()
 		&& body.appservice_info.is_none()
@@ -76,7 +79,13 @@ pub(crate) async fn create_room_route(
 	};
 
 	// check if room ID doesn't already exist instead of erroring on auth check
-	if services.rooms.short.get_shortroomid(&room_id).await.is_ok() {
+	if services
+		.rooms
+		.short
+		.get_shortroomid(&room_id)
+		.await
+		.is_ok()
+	{
 		return Err(Error::BadRequest(
 			ErrorKind::RoomInUse,
 			"Room with that custom room ID already exists",
@@ -84,7 +93,10 @@ pub(crate) async fn create_room_route(
 	}
 
 	if body.visibility == room::Visibility::Public
-		&& services.server.config.lockdown_public_room_directory
+		&& services
+			.server
+			.config
+			.lockdown_public_room_directory
 		&& !services.users.is_admin(sender_user).await
 		&& body.appservice_info.is_none()
 	{
@@ -123,7 +135,10 @@ pub(crate) async fn create_room_route(
 
 	let room_version = match body.room_version.clone() {
 		| Some(room_version) =>
-			if services.server.supported_room_version(&room_version) {
+			if services
+				.server
+				.supported_room_version(&room_version)
+			{
 				room_version
 			} else {
 				return Err(Error::BadRequest(
@@ -131,7 +146,11 @@ pub(crate) async fn create_room_route(
 					"This server does not support that room version.",
 				));
 			},
-		| None => services.server.config.default_room_version.clone(),
+		| None => services
+			.server
+			.config
+			.default_room_version
+			.clone(),
 	};
 
 	let create_content = match &body.creation_content {
@@ -160,9 +179,11 @@ pub(crate) async fn create_room_route(
 			}
 			content.insert(
 				"room_version".into(),
-				json!(room_version.as_str()).try_into().map_err(|_| {
-					Error::BadRequest(ErrorKind::BadJson, "Invalid creation content")
-				})?,
+				json!(room_version.as_str())
+					.try_into()
+					.map_err(|_| {
+						Error::BadRequest(ErrorKind::BadJson, "Invalid creation content")
+					})?,
 			);
 			content
 		},
@@ -231,18 +252,29 @@ pub(crate) async fn create_room_route(
 	// 3. Power levels
 
 	// Figure out preset. We need it for preset specific events
-	let preset = body.preset.clone().unwrap_or(match &body.visibility {
-		| room::Visibility::Public => RoomPreset::PublicChat,
-		| _ => RoomPreset::PrivateChat, // Room visibility should not be custom
-	});
+	let preset = body
+		.preset
+		.clone()
+		.unwrap_or(match &body.visibility {
+			| room::Visibility::Public => RoomPreset::PublicChat,
+			| _ => RoomPreset::PrivateChat, // Room visibility should not be custom
+		});
 
 	let mut users = BTreeMap::from_iter([(sender_user.clone(), int!(100))]);
 
 	if preset == RoomPreset::TrustedPrivateChat {
 		for invite in &body.invite {
-			if services.users.user_is_ignored(sender_user, invite).await {
+			if services
+				.users
+				.user_is_ignored(sender_user, invite)
+				.await
+			{
 				continue;
-			} else if services.users.user_is_ignored(invite, sender_user).await {
+			} else if services
+				.users
+				.user_is_ignored(invite, sender_user)
+				.await
+			{
 				// silently drop the invite to the recipient if they've been ignored by the
 				// sender, pretend it worked
 				continue;
@@ -353,10 +385,12 @@ pub(crate) async fn create_room_route(
 
 	// 6. Events listed in initial_state
 	for event in &body.initial_state {
-		let mut pdu_builder = event.deserialize_as::<PduBuilder>().map_err(|e| {
-			warn!("Invalid initial state event: {:?}", e);
-			Error::BadRequest(ErrorKind::InvalidParam, "Invalid initial state event.")
-		})?;
+		let mut pdu_builder = event
+			.deserialize_as::<PduBuilder>()
+			.map_err(|e| {
+				warn!("Invalid initial state event: {:?}", e);
+				Error::BadRequest(ErrorKind::InvalidParam, "Invalid initial state event.")
+			})?;
 
 		debug_info!("Room creation initial state event: {event:?}");
 
@@ -370,7 +404,9 @@ pub(crate) async fn create_room_route(
 		}
 
 		// Implicit state key defaults to ""
-		pdu_builder.state_key.get_or_insert_with(StateKey::new);
+		pdu_builder
+			.state_key
+			.get_or_insert_with(StateKey::new);
 
 		// Silently skip encryption events if they are not allowed
 		if pdu_builder.event_type == TimelineEventType::RoomEncryption
@@ -419,9 +455,17 @@ pub(crate) async fn create_room_route(
 	// 8. Events implied by invite (and TODO: invite_3pid)
 	drop(state_lock);
 	for user_id in &body.invite {
-		if services.users.user_is_ignored(sender_user, user_id).await {
+		if services
+			.users
+			.user_is_ignored(sender_user, user_id)
+			.await
+		{
 			continue;
-		} else if services.users.user_is_ignored(user_id, sender_user).await {
+		} else if services
+			.users
+			.user_is_ignored(user_id, sender_user)
+			.await
+		{
 			// silently drop the invite to the recipient if they've been ignored by the
 			// sender, pretend it worked
 			continue;

src/api/client/room/initial_sync.rs

@@ -43,7 +43,11 @@ pub(crate) async fn room_initial_sync_route(
 		.await?;
 
 	let messages = PaginationChunk {
-		start: events.last().map(at!(0)).as_ref().map(ToString::to_string),
+		start: events
+			.last()
+			.map(at!(0))
+			.as_ref()
+			.map(ToString::to_string),
 
 		end: events
 			.first()
@@ -64,7 +68,12 @@ pub(crate) async fn room_initial_sync_route(
 		account_data: None,
 		state: state.into(),
 		messages: messages.chunk.is_empty().or_some(messages),
-		visibility: services.rooms.directory.visibility(room_id).await.into(),
+		visibility: services
+			.rooms
+			.directory
+			.visibility(room_id)
+			.await
+			.into(),
 		membership: services
 			.rooms
 			.state_cache

src/api/client/room/summary.rs

@@ -102,7 +102,9 @@ async fn room_summary_response(
 		room_version: room.room_version,
 		encryption: room.encryption,
 		allowed_room_ids: room.allowed_room_ids,
-		membership: sender_user.is_some().then_some(MembershipState::Leave),
+		membership: sender_user
+			.is_some()
+			.then_some(MembershipState::Leave),
 	})
 }
 
@@ -112,9 +114,18 @@ async fn local_room_summary_response(
 	sender_user: Option<&UserId>,
 ) -> Result<get_summary::msc3266::Response> {
 	trace!(?sender_user, "Sending local room summary response for {room_id:?}");
-	let join_rule = services.rooms.state_accessor.get_join_rules(room_id);
-	let world_readable = services.rooms.state_accessor.is_world_readable(room_id);
-	let guest_can_join = services.rooms.state_accessor.guest_can_join(room_id);
+	let join_rule = services
+		.rooms
+		.state_accessor
+		.get_join_rules(room_id);
+	let world_readable = services
+		.rooms
+		.state_accessor
+		.is_world_readable(room_id);
+	let guest_can_join = services
+		.rooms
+		.state_accessor
+		.guest_can_join(room_id);
 
 	let (join_rule, world_readable, guest_can_join) =
 		join3(join_rule, world_readable, guest_can_join).await;
@@ -137,11 +148,23 @@ async fn local_room_summary_response(
 		.get_canonical_alias(room_id)
 		.ok();
 
-	let name = services.rooms.state_accessor.get_name(room_id).ok();
+	let name = services
+		.rooms
+		.state_accessor
+		.get_name(room_id)
+		.ok();
 
-	let topic = services.rooms.state_accessor.get_room_topic(room_id).ok();
+	let topic = services
+		.rooms
+		.state_accessor
+		.get_room_topic(room_id)
+		.ok();
 
-	let room_type = services.rooms.state_accessor.get_room_type(room_id).ok();
+	let room_type = services
+		.rooms
+		.state_accessor
+		.get_room_type(room_id)
+		.ok();
 
 	let avatar_url = services
 		.rooms
@@ -149,7 +172,11 @@ async fn local_room_summary_response(
 		.get_avatar(room_id)
 		.map(|res| res.into_option().unwrap_or_default().url);
 
-	let room_version = services.rooms.state.get_room_version(room_id).ok();
+	let room_version = services
+		.rooms
+		.state
+		.get_room_version(room_id)
+		.ok();
 
 	let encryption = services
 		.rooms
@@ -208,7 +235,10 @@ async fn local_room_summary_response(
 		room_version,
 		encryption,
 		membership,
-		allowed_room_ids: join_rule.allowed_rooms().map(Into::into).collect(),
+		allowed_room_ids: join_rule
+			.allowed_rooms()
+			.map(Into::into)
+			.collect(),
 		join_rule: join_rule.into(),
 	})
 }
@@ -292,10 +322,16 @@ where
 				.rooms
 				.state_accessor
 				.user_can_see_state_events(sender_user, room_id);
-			let is_guest = services.users.is_deactivated(sender_user).unwrap_or(false);
-			let user_in_allowed_restricted_room = allowed_room_ids
-				.stream()
-				.any(|room| services.rooms.state_cache.is_joined(sender_user, room));
+			let is_guest = services
+				.users
+				.is_deactivated(sender_user)
+				.unwrap_or(false);
+			let user_in_allowed_restricted_room = allowed_room_ids.stream().any(|room| {
+				services
+					.rooms
+					.state_cache
+					.is_joined(sender_user, room)
+			});
 
 			let (user_can_see_state_events, is_guest, user_in_allowed_restricted_room) =
 				join3(user_can_see_state_events, is_guest, user_in_allowed_restricted_room)

src/api/client/room/upgrade.rs

@@ -54,9 +54,15 @@ pub(crate) async fn upgrade_room_route(
 		TRANSFERABLE_STATE_EVENTS.is_sorted(),
 		"TRANSFERABLE_STATE_EVENTS is not sorted"
 	);
-	let sender_user = body.sender_user.as_ref().expect("user is authenticated");
+	let sender_user = body
+		.sender_user
+		.as_ref()
+		.expect("user is authenticated");
 
-	if !services.server.supported_room_version(&body.new_version) {
+	if !services
+		.server
+		.supported_room_version(&body.new_version)
+	{
 		return Err(Error::BadRequest(
 			ErrorKind::UnsupportedRoomVersion,
 			"This server does not support that room version.",
@@ -72,7 +78,12 @@ pub(crate) async fn upgrade_room_route(
 		.get_or_create_shortroomid(&replacement_room)
 		.await;
 
-	let state_lock = services.rooms.state.mutex.lock(&body.room_id).await;
+	let state_lock = services
+		.rooms
+		.state
+		.mutex
+		.lock(&body.room_id)
+		.await;
 
 	// Send a m.room.tombstone event to the old room to indicate that it is not
 	// intended to be used any further Fail if the sender does not have the required
@@ -93,7 +104,12 @@ pub(crate) async fn upgrade_room_route(
 
 	// Change lock to replacement room
 	drop(state_lock);
-	let state_lock = services.rooms.state.mutex.lock(&replacement_room).await;
+	let state_lock = services
+		.rooms
+		.state
+		.mutex
+		.lock(&replacement_room)
+		.await;
 
 	// Get the old room creation event
 	let mut create_event_content: CanonicalJsonObject = services