chain_width to 50

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

src/admin/room/alias.rs

@@ -60,7 +60,14 @@ pub(super) async fn process(command: RoomAliasCommand, context: &Context<'_>) ->
 			};
 			match command {
 				| RoomAliasCommand::Set { force, room_id, .. } => {
-					match (force, services.rooms.alias.resolve_local_alias(&room_alias).await) {
+					match (
+						force,
+						services
+							.rooms
+							.alias
+							.resolve_local_alias(&room_alias)
+							.await,
+					) {
 						| (true, Ok(id)) => {
 							match services.rooms.alias.set_alias(
 								&room_alias,
@@ -93,7 +100,12 @@ pub(super) async fn process(command: RoomAliasCommand, context: &Context<'_>) ->
 					}
 				},
 				| RoomAliasCommand::Remove { .. } => {
-					match services.rooms.alias.resolve_local_alias(&room_alias).await {
+					match services
+						.rooms
+						.alias
+						.resolve_local_alias(&room_alias)
+						.await
+					{
 						| Err(_) => Err!("Alias isn't in use."),
 						| Ok(id) => match services
 							.rooms
@@ -103,14 +115,24 @@ pub(super) async fn process(command: RoomAliasCommand, context: &Context<'_>) ->
 						{
 							| Err(err) => Err!("Failed to remove alias: {err}"),
 							| Ok(()) =>
-								context.write_str(&format!("Removed alias from {id}")).await,
+								context
+									.write_str(&format!("Removed alias from {id}"))
+									.await,
 						},
 					}
 				},
 				| RoomAliasCommand::Which { .. } => {
-					match services.rooms.alias.resolve_local_alias(&room_alias).await {
+					match services
+						.rooms
+						.alias
+						.resolve_local_alias(&room_alias)
+						.await
+					{
 						| Err(_) => Err!("Alias isn't in use."),
-						| Ok(id) => context.write_str(&format!("Alias resolves to {id}")).await,
+						| Ok(id) =>
+							context
+								.write_str(&format!("Alias resolves to {id}"))
+								.await,
 					}
 				},
 				| RoomAliasCommand::List { .. } => unreachable!(),
@@ -126,11 +148,13 @@ pub(super) async fn process(command: RoomAliasCommand, context: &Context<'_>) ->
 					.collect()
 					.await;
 
-				let plain_list = aliases.iter().fold(String::new(), |mut output, alias| {
-					writeln!(output, "- {alias}")
-						.expect("should be able to write to string buffer");
-					output
-				});
+				let plain_list = aliases
+					.iter()
+					.fold(String::new(), |mut output, alias| {
+						writeln!(output, "- {alias}")
+							.expect("should be able to write to string buffer");
+						output
+					});
 
 				let plain = format!("Aliases for {room_id}:\n{plain_list}");
 				context.write_str(&plain).await

src/admin/room/commands.rs

@@ -20,11 +20,23 @@ pub(super) async fn list_rooms(
 		.metadata
 		.iter_ids()
 		.filter_map(|room_id| async move {
-			(!exclude_disabled || !self.services.rooms.metadata.is_disabled(room_id).await)
+			(!exclude_disabled
+				|| !self
+					.services
+					.rooms
+					.metadata
+					.is_disabled(room_id)
+					.await)
 				.then_some(room_id)
 		})
 		.filter_map(|room_id| async move {
-			(!exclude_banned || !self.services.rooms.metadata.is_banned(room_id).await)
+			(!exclude_banned
+				|| !self
+					.services
+					.rooms
+					.metadata
+					.is_banned(room_id)
+					.await)
 				.then_some(room_id)
 		})
 		.then(|room_id| get_room_info(self.services, room_id))
@@ -62,7 +74,12 @@ pub(super) async fn list_rooms(
 
 #[admin_command]
 pub(super) async fn exists(&self, room_id: OwnedRoomId) -> Result {
-	let result = self.services.rooms.metadata.exists(&room_id).await;
+	let result = self
+		.services
+		.rooms
+		.metadata
+		.exists(&room_id)
+		.await;
 
 	self.write_str(&format!("{result}")).await
 }

src/admin/room/moderation.rs

@@ -70,7 +70,10 @@ async fn ban_room(&self, room: OwnedRoomOrAliasId) -> Result {
 		};
 
 		debug!("Room specified is a room ID, banning room ID");
-		self.services.rooms.metadata.ban_room(room_id, true);
+		self.services
+			.rooms
+			.metadata
+			.ban_room(room_id, true);
 
 		room_id.to_owned()
 	} else if room.is_room_alias_id() {
@@ -128,7 +131,10 @@ async fn ban_room(&self, room: OwnedRoomOrAliasId) -> Result {
 			},
 		};
 
-		self.services.rooms.metadata.ban_room(&room_id, true);
+		self.services
+			.rooms
+			.metadata
+			.ban_room(&room_id, true);
 
 		room_id
 	} else {
@@ -159,7 +165,10 @@ async fn ban_room(&self, room: OwnedRoomOrAliasId) -> Result {
 			warn!("Failed to leave room: {e}");
 		}
 
-		self.services.rooms.state_cache.forget(&room_id, user_id);
+		self.services
+			.rooms
+			.state_cache
+			.forget(&room_id, user_id);
 	}
 
 	self.services
@@ -178,9 +187,15 @@ async fn ban_room(&self, room: OwnedRoomOrAliasId) -> Result {
 		.await;
 
 	// unpublish from room directory
-	self.services.rooms.directory.set_not_public(&room_id);
+	self.services
+		.rooms
+		.directory
+		.set_not_public(&room_id);
 
-	self.services.rooms.metadata.disable_room(&room_id, true);
+	self.services
+		.rooms
+		.metadata
+		.disable_room(&room_id, true);
 
 	self.write_str(
 		"Room banned, removed all our local users, and disabled incoming federation with room.",
@@ -302,7 +317,10 @@ async fn ban_list_of_rooms(&self) -> Result {
 	}
 
 	for room_id in room_ids {
-		self.services.rooms.metadata.ban_room(&room_id, true);
+		self.services
+			.rooms
+			.metadata
+			.ban_room(&room_id, true);
 
 		debug!("Banned {room_id} successfully");
 		room_ban_count = room_ban_count.saturating_add(1);
@@ -327,7 +345,10 @@ async fn ban_list_of_rooms(&self) -> Result {
 				warn!("Failed to leave room: {e}");
 			}
 
-			self.services.rooms.state_cache.forget(&room_id, user_id);
+			self.services
+				.rooms
+				.state_cache
+				.forget(&room_id, user_id);
 		}
 
 		// remove any local aliases, ignore errors
@@ -347,9 +368,15 @@ async fn ban_list_of_rooms(&self) -> Result {
 			.await;
 
 		// unpublish from room directory, ignore errors
-		self.services.rooms.directory.set_not_public(&room_id);
+		self.services
+			.rooms
+			.directory
+			.set_not_public(&room_id);
 
-		self.services.rooms.metadata.disable_room(&room_id, true);
+		self.services
+			.rooms
+			.metadata
+			.disable_room(&room_id, true);
 	}
 
 	self.write_str(&format!(
@@ -374,7 +401,10 @@ async fn unban_room(&self, room: OwnedRoomOrAliasId) -> Result {
 		};
 
 		debug!("Room specified is a room ID, unbanning room ID");
-		self.services.rooms.metadata.ban_room(room_id, false);
+		self.services
+			.rooms
+			.metadata
+			.ban_room(room_id, false);
 
 		room_id.to_owned()
 	} else if room.is_room_alias_id() {
@@ -430,7 +460,10 @@ async fn unban_room(&self, room: OwnedRoomOrAliasId) -> Result {
 			},
 		};
 
-		self.services.rooms.metadata.ban_room(&room_id, false);
+		self.services
+			.rooms
+			.metadata
+			.ban_room(&room_id, false);
 
 		room_id
 	} else {
@@ -441,7 +474,10 @@ async fn unban_room(&self, room: OwnedRoomOrAliasId) -> Result {
 		);
 	};
 
-	self.services.rooms.metadata.disable_room(&room_id, false);
+	self.services
+		.rooms
+		.metadata
+		.disable_room(&room_id, false);
 	self.write_str("Room unbanned and federation re-enabled.")
 		.await
 }