diff --git a/src/admin/appservice/appservice_command.rs b/src/admin/appservice/appservice_command.rs index 409ef83b..d15cb7a6 100644 --- a/src/admin/appservice/appservice_command.rs +++ b/src/admin/appservice/appservice_command.rs @@ -47,7 +47,7 @@ pub(crate) async fn show(_body: Vec<&str>, appservice_identifier: String) -> Res { Some(config) => { let config_str = serde_yaml::to_string(&config).expect("config should've been validated on register"); - let output = format!("Config for {}:\n\n```yaml\n{}\n```", appservice_identifier, config_str,); + let output = format!("Config for {appservice_identifier}:\n\n```yaml\n{config_str}\n```",); let output_html = format!( "Config for {}:\n\n
{}
",
escape_html(&appservice_identifier),
diff --git a/src/admin/debug/debug_commands.rs b/src/admin/debug/debug_commands.rs
index a658b84d..74313089 100644
--- a/src/admin/debug/debug_commands.rs
+++ b/src/admin/debug/debug_commands.rs
@@ -294,8 +294,7 @@ pub(crate) async fn ping(_body: Vec<&str>, server: Box{:?}\n
",
- results
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
+ format!("Query completed in {query_time:?}:
\n{results:?}\n
"),
))
},
AccountData::Get {
@@ -39,11 +36,8 @@ pub(crate) async fn account_data(subcommand: AccountData) -> Result{:?}\n
",
- results
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
+ format!("Query completed in {query_time:?}:
\n{results:?}\n
"),
))
},
}
diff --git a/src/admin/query/appservice.rs b/src/admin/query/appservice.rs
index 88c74d5e..d108ca8d 100644
--- a/src/admin/query/appservice.rs
+++ b/src/admin/query/appservice.rs
@@ -17,11 +17,8 @@ pub(crate) async fn appservice(subcommand: Appservice) -> Result{:?}\n
",
- results
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
+ format!("Query completed in {query_time:?}:
\n{results:?}\n
"),
))
},
Appservice::All => {
@@ -30,11 +27,8 @@ pub(crate) async fn appservice(subcommand: Appservice) -> Result{:?}\n
",
- results
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
+ format!("Query completed in {query_time:?}:
\n{results:?}\n
"),
))
},
}
diff --git a/src/admin/query/globals.rs b/src/admin/query/globals.rs
index 37a549ad..e5249118 100644
--- a/src/admin/query/globals.rs
+++ b/src/admin/query/globals.rs
@@ -12,11 +12,8 @@ pub(crate) async fn globals(subcommand: Globals) -> Result{:?}\n
",
- results
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
+ format!("Query completed in {query_time:?}:
\n{results:?}\n
"),
))
},
Globals::CurrentCount => {
@@ -25,11 +22,8 @@ pub(crate) async fn globals(subcommand: Globals) -> Result{:?}\n
",
- results
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
+ format!("Query completed in {query_time:?}:
\n{results:?}\n
"),
))
},
Globals::LastCheckForUpdatesId => {
@@ -38,11 +32,8 @@ pub(crate) async fn globals(subcommand: Globals) -> Result{:?}\n
",
- results
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
+ format!("Query completed in {query_time:?}:
\n{results:?}\n
"),
))
},
Globals::LoadKeypair => {
@@ -51,11 +42,8 @@ pub(crate) async fn globals(subcommand: Globals) -> Result{:?}\n
",
- results
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
+ format!("Query completed in {query_time:?}:
\n{results:?}\n
"),
))
},
Globals::SigningKeysFor {
@@ -66,11 +54,8 @@ pub(crate) async fn globals(subcommand: Globals) -> Result{:?}\n
",
- results
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
+ format!("Query completed in {query_time:?}:
\n{results:?}\n
"),
))
},
}
diff --git a/src/admin/query/presence.rs b/src/admin/query/presence.rs
index b77febfa..f69dd19a 100644
--- a/src/admin/query/presence.rs
+++ b/src/admin/query/presence.rs
@@ -14,11 +14,8 @@ pub(crate) async fn presence(subcommand: Presence) -> Result{:?}\n
",
- results
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
+ format!("Query completed in {query_time:?}:
\n{results:?}\n
"),
))
},
Presence::PresenceSince {
@@ -31,11 +28,8 @@ pub(crate) async fn presence(subcommand: Presence) -> ResultQuery completed in {query_time:?}:
\n{:?}\n
",
- presence_since
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{presence_since:?}```"),
+ format!("Query completed in {query_time:?}:
\n{presence_since:?}\n
"),
))
},
}
diff --git a/src/admin/query/room_alias.rs b/src/admin/query/room_alias.rs
index eb2bac8a..62d05899 100644
--- a/src/admin/query/room_alias.rs
+++ b/src/admin/query/room_alias.rs
@@ -14,11 +14,8 @@ pub(crate) async fn room_alias(subcommand: RoomAlias) -> Result{:?}\n
",
- results
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
+ format!("Query completed in {query_time:?}:
\n{results:?}\n
"),
))
},
RoomAlias::LocalAliasesForRoom {
@@ -31,11 +28,8 @@ pub(crate) async fn room_alias(subcommand: RoomAlias) -> ResultQuery completed in {query_time:?}:
\n{:?}\n
",
- aliases
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{aliases:?}```"),
+ format!("Query completed in {query_time:?}:
\n{aliases:?}\n
"),
))
},
RoomAlias::AllLocalAliases => {
@@ -46,11 +40,8 @@ pub(crate) async fn room_alias(subcommand: RoomAlias) -> ResultQuery completed in {query_time:?}:
\n{:?}\n
",
- aliases
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{aliases:?}```"),
+ format!("Query completed in {query_time:?}:
\n{aliases:?}\n
"),
))
},
}
diff --git a/src/admin/query/sending.rs b/src/admin/query/sending.rs
index 19d73cf6..5a21ec87 100644
--- a/src/admin/query/sending.rs
+++ b/src/admin/query/sending.rs
@@ -14,11 +14,8 @@ pub(crate) async fn sending(subcommand: Sending) -> ResultQuery completed in {query_time:?}:
\n{:?}\n
",
- active_requests
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{active_requests:?}```"),
+ format!("Query completed in {query_time:?}:
\n{active_requests:?}\n
"),
))
},
Sending::QueuedRequests {
@@ -96,11 +93,8 @@ pub(crate) async fn sending(subcommand: Sending) -> ResultQuery completed in {query_time:?}:
\n{:?}\n
",
- queued_requests
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{queued_requests:?}```"),
+ format!("Query completed in {query_time:?}:
\n{queued_requests:?}\n
"),
))
},
Sending::ActiveRequestsFor {
@@ -178,11 +172,8 @@ pub(crate) async fn sending(subcommand: Sending) -> ResultQuery completed in {query_time:?}:
\n{:?}\n
",
- active_requests
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{active_requests:?}```"),
+ format!("Query completed in {query_time:?}:
\n{active_requests:?}\n
"),
))
},
Sending::GetLatestEduCount {
@@ -193,11 +184,8 @@ pub(crate) async fn sending(subcommand: Sending) -> Result{:?}\n
",
- results
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{results:?}```"),
+ format!("Query completed in {query_time:?}:
\n{results:?}\n
"),
))
},
}
diff --git a/src/admin/query/users.rs b/src/admin/query/users.rs
index 2b624ed3..ef99d880 100644
--- a/src/admin/query/users.rs
+++ b/src/admin/query/users.rs
@@ -14,11 +14,8 @@ pub(crate) async fn users(subcommand: Users) -> ResultQuery completed in {query_time:?}:
\n{:?}\n
",
- users
- ),
+ format!("Query completed in {query_time:?}:\n\n```\n{users:?}```"),
+ format!("Query completed in {query_time:?}:
\n{users:?}\n
"),
))
},
}
diff --git a/src/admin/room/room_alias_commands.rs b/src/admin/room/room_alias_commands.rs
index b767251a..33c165b8 100644
--- a/src/admin/room/room_alias_commands.rs
+++ b/src/admin/room/room_alias_commands.rs
@@ -20,7 +20,7 @@ pub(crate) async fn process(command: RoomAliasCommand, _body: Vec<&str>) -> Resu
let room_alias_str = format!("#{}:{}", room_alias_localpart, services().globals.server_name());
let room_alias = match RoomAliasId::parse_box(room_alias_str) {
Ok(alias) => alias,
- Err(err) => return Ok(RoomMessageEventContent::text_plain(format!("Failed to parse alias: {}", err))),
+ Err(err) => return Ok(RoomMessageEventContent::text_plain(format!("Failed to parse alias: {err}"))),
};
match command {
RoomAliasCommand::Set {
@@ -30,14 +30,12 @@ pub(crate) async fn process(command: RoomAliasCommand, _body: Vec<&str>) -> Resu
} => match (force, services().rooms.alias.resolve_local_alias(&room_alias)) {
(true, Ok(Some(id))) => match services().rooms.alias.set_alias(&room_alias, &room_id) {
Ok(()) => Ok(RoomMessageEventContent::text_plain(format!(
- "Successfully overwrote alias (formerly {})",
- id
+ "Successfully overwrote alias (formerly {id})"
))),
- Err(err) => Ok(RoomMessageEventContent::text_plain(format!("Failed to remove alias: {}", err))),
+ Err(err) => Ok(RoomMessageEventContent::text_plain(format!("Failed to remove alias: {err}"))),
},
(false, Ok(Some(id))) => Ok(RoomMessageEventContent::text_plain(format!(
- "Refusing to overwrite in use alias for {}, use -f or --force to overwrite",
- id
+ "Refusing to overwrite in use alias for {id}, use -f or --force to overwrite"
))),
(_, Ok(None)) => match services().rooms.alias.set_alias(&room_alias, &room_id) {
Ok(()) => Ok(RoomMessageEventContent::text_plain("Successfully set alias")),
@@ -49,18 +47,18 @@ pub(crate) async fn process(command: RoomAliasCommand, _body: Vec<&str>) -> Resu
..
} => match services().rooms.alias.resolve_local_alias(&room_alias) {
Ok(Some(id)) => match services().rooms.alias.remove_alias(&room_alias) {
- Ok(()) => Ok(RoomMessageEventContent::text_plain(format!("Removed alias from {}", id))),
- Err(err) => Ok(RoomMessageEventContent::text_plain(format!("Failed to remove alias: {}", err))),
+ Ok(()) => Ok(RoomMessageEventContent::text_plain(format!("Removed alias from {id}"))),
+ Err(err) => Ok(RoomMessageEventContent::text_plain(format!("Failed to remove alias: {err}"))),
},
Ok(None) => Ok(RoomMessageEventContent::text_plain("Alias isn't in use.")),
- Err(err) => Ok(RoomMessageEventContent::text_plain(format!("Unable to lookup alias: {}", err))),
+ Err(err) => Ok(RoomMessageEventContent::text_plain(format!("Unable to lookup alias: {err}"))),
},
RoomAliasCommand::Which {
..
} => match services().rooms.alias.resolve_local_alias(&room_alias) {
- Ok(Some(id)) => Ok(RoomMessageEventContent::text_plain(format!("Alias resolves to {}", id))),
+ Ok(Some(id)) => Ok(RoomMessageEventContent::text_plain(format!("Alias resolves to {id}"))),
Ok(None) => Ok(RoomMessageEventContent::text_plain("Alias isn't in use.")),
- Err(err) => Ok(RoomMessageEventContent::text_plain(format!("Unable to lookup alias: {}", err))),
+ Err(err) => Ok(RoomMessageEventContent::text_plain(format!("Unable to lookup alias: {err}"))),
},
RoomAliasCommand::List {
..
@@ -93,7 +91,7 @@ pub(crate) async fn process(command: RoomAliasCommand, _body: Vec<&str>) -> Resu
let html = format!("Aliases for {room_id}:\n