diff --git a/src/admin/appservice/appservice_command.rs b/src/admin/appservice/appservice_command.rs
index d15cb7a6da3e0749a9db4a25b44cb3f4254abf18..6f36ebf73b327fad7b5b7f0c1755b4bae0b7f1f7 100644
--- a/src/admin/appservice/appservice_command.rs
+++ b/src/admin/appservice/appservice_command.rs
@@ -3,26 +3,26 @@
use crate::{escape_html, services, Result};
pub(crate) async fn register(body: Vec<&str>) -> Result<RoomMessageEventContent> {
- if body.len() > 2 && body[0].trim().starts_with("```") && body.last().unwrap().trim() == "```" {
- let appservice_config = body[1..body.len().checked_sub(1).unwrap()].join("\n");
- let parsed_config = serde_yaml::from_str::<Registration>(&appservice_config);
- match parsed_config {
- Ok(yaml) => match services().appservice.register_appservice(yaml).await {
- Ok(id) => Ok(RoomMessageEventContent::text_plain(format!(
- "Appservice registered with ID: {id}."
- ))),
- Err(e) => Ok(RoomMessageEventContent::text_plain(format!(
- "Failed to register appservice: {e}"
- ))),
- },
+ if body.len() < 2 || !body[0].trim().starts_with("```") || body.last().unwrap_or(&"").trim() != "```" {
+ return Ok(RoomMessageEventContent::text_plain(
+ "Expected code block in command body. Add --help for details.",
+ ));
+ }
+
+ let appservice_config = body[1..body.len().checked_sub(1).unwrap()].join("\n");
+ let parsed_config = serde_yaml::from_str::<Registration>(&appservice_config);
+ match parsed_config {
+ Ok(yaml) => match services().appservice.register_appservice(yaml).await {
+ Ok(id) => Ok(RoomMessageEventContent::text_plain(format!(
+ "Appservice registered with ID: {id}."
+ ))),
Err(e) => Ok(RoomMessageEventContent::text_plain(format!(
- "Could not parse appservice config: {e}"
+ "Failed to register appservice: {e}"
))),
- }
- } else {
- Ok(RoomMessageEventContent::text_plain(
- "Expected code block in command body. Add --help for details.",
- ))
+ },
+ Err(e) => Ok(RoomMessageEventContent::text_plain(format!(
+ "Could not parse appservice config: {e}"
+ ))),
}
}
diff --git a/src/admin/debug/debug_commands.rs b/src/admin/debug/debug_commands.rs
index 56563748a377564d2836e5a5421c4fbb6656cb07..bd15ba50aab513c2ddf8be6c2aeab76b3ef92c05 100644
--- a/src/admin/debug/debug_commands.rs
+++ b/src/admin/debug/debug_commands.rs
@@ -43,28 +43,30 @@ pub(crate) async fn get_auth_chain(_body: Vec<&str>, event_id: Box<EventId>) ->
}
pub(crate) async fn parse_pdu(body: Vec<&str>) -> Result<RoomMessageEventContent> {
- if body.len() > 2 && body[0].trim().starts_with("```") && body.last().unwrap().trim() == "```" {
- let string = body[1..body.len() - 1].join("\n");
- match serde_json::from_str(&string) {
- Ok(value) => match ruma::signatures::reference_hash(&value, &RoomVersionId::V6) {
- Ok(hash) => {
- let event_id = EventId::parse(format!("${hash}"));
-
- match serde_json::from_value::<PduEvent>(serde_json::to_value(value).expect("value is json")) {
- Ok(pdu) => Ok(RoomMessageEventContent::text_plain(format!("EventId: {event_id:?}\n{pdu:#?}"))),
- Err(e) => Ok(RoomMessageEventContent::text_plain(format!(
- "EventId: {event_id:?}\nCould not parse event: {e}"
- ))),
- }
- },
- Err(e) => Ok(RoomMessageEventContent::text_plain(format!("Could not parse PDU JSON: {e:?}"))),
+ if body.len() < 2 || !body[0].trim().starts_with("```") || body.last().unwrap_or(&"").trim() != "```" {
+ return Ok(RoomMessageEventContent::text_plain(
+ "Expected code block in command body. Add --help for details.",
+ ));
+ }
+
+ let string = body[1..body.len() - 1].join("\n");
+ match serde_json::from_str(&string) {
+ Ok(value) => match ruma::signatures::reference_hash(&value, &RoomVersionId::V6) {
+ Ok(hash) => {
+ let event_id = EventId::parse(format!("${hash}"));
+
+ match serde_json::from_value::<PduEvent>(serde_json::to_value(value).expect("value is json")) {
+ Ok(pdu) => Ok(RoomMessageEventContent::text_plain(format!("EventId: {event_id:?}\n{pdu:#?}"))),
+ Err(e) => Ok(RoomMessageEventContent::text_plain(format!(
+ "EventId: {event_id:?}\nCould not parse event: {e}"
+ ))),
+ }
},
- Err(e) => Ok(RoomMessageEventContent::text_plain(format!(
- "Invalid json in command body: {e}"
- ))),
- }
- } else {
- Ok(RoomMessageEventContent::text_plain("Expected code block in command body."))
+ Err(e) => Ok(RoomMessageEventContent::text_plain(format!("Could not parse PDU JSON: {e:?}"))),
+ },
+ Err(e) => Ok(RoomMessageEventContent::text_plain(format!(
+ "Invalid json in command body: {e}"
+ ))),
}
}
@@ -117,33 +119,40 @@ pub(crate) async fn get_remote_pdu_list(
if server == services().globals.server_name() {
return Ok(RoomMessageEventContent::text_plain(
- "Not allowed to send federation requests to ourselves. Please use `get-pdu` for fetching local PDUs.",
+ "Not allowed to send federation requests to ourselves. Please use `get-pdu` for fetching local PDUs from \
+ the database.",
));
}
- if body.len() > 2 && body[0].trim().starts_with("```") && body.last().unwrap().trim() == "```" {
- let list = body
- .clone()
- .drain(1..body.len().checked_sub(1).unwrap())
- .filter_map(|pdu| EventId::parse(pdu).ok())
- .collect::<Vec<_>>();
-
- for pdu in list {
- if force {
- if let Err(e) = get_remote_pdu(Vec::new(), Box::from(pdu), server.clone()).await {
- warn!(%e, "Failed to get remote PDU, ignoring error");
- }
- } else {
- get_remote_pdu(Vec::new(), Box::from(pdu), server.clone()).await?;
+ if body.len() < 2 || !body[0].trim().starts_with("```") || body.last().unwrap_or(&"").trim() != "```" {
+ return Ok(RoomMessageEventContent::text_plain(
+ "Expected code block in command body. Add --help for details.",
+ ));
+ }
+
+ let list = body
+ .clone()
+ .drain(1..body.len().checked_sub(1).unwrap())
+ .filter_map(|pdu| EventId::parse(pdu).ok())
+ .collect::<Vec<_>>();
+
+ for pdu in list {
+ if force {
+ if let Err(e) = get_remote_pdu(Vec::new(), Box::from(pdu), server.clone()).await {
+ services()
+ .admin
+ .send_message(RoomMessageEventContent::text_plain(format!(
+ "Failed to get remote PDU, ignoring error: {e}"
+ )))
+ .await;
+ warn!(%e, "Failed to get remote PDU, ignoring error");
}
+ } else {
+ get_remote_pdu(Vec::new(), Box::from(pdu), server.clone()).await?;
}
-
- return Ok(RoomMessageEventContent::text_plain("Fetched list of remote PDUs."));
}
- Ok(RoomMessageEventContent::text_plain(
- "Expected code block in command body. Add --help for details.",
- ))
+ Ok(RoomMessageEventContent::text_plain("Fetched list of remote PDUs."))
}
pub(crate) async fn get_remote_pdu(
@@ -384,55 +393,55 @@ pub(crate) async fn change_log_level(
}
pub(crate) async fn sign_json(body: Vec<&str>) -> Result<RoomMessageEventContent> {
- if body.len() > 2 && body[0].trim().starts_with("```") && body.last().unwrap().trim() == "```" {
- let string = body[1..body.len().checked_sub(1).unwrap()].join("\n");
- match serde_json::from_str(&string) {
- Ok(mut value) => {
- ruma::signatures::sign_json(
- services().globals.server_name().as_str(),
- services().globals.keypair(),
- &mut value,
- )
- .expect("our request json is what ruma expects");
- let json_text = serde_json::to_string_pretty(&value).expect("canonical json is valid json");
- Ok(RoomMessageEventContent::text_plain(json_text))
- },
- Err(e) => Ok(RoomMessageEventContent::text_plain(format!("Invalid json: {e}"))),
- }
- } else {
- Ok(RoomMessageEventContent::text_plain(
+ if body.len() < 2 || !body[0].trim().starts_with("```") || body.last().unwrap_or(&"").trim() != "```" {
+ return Ok(RoomMessageEventContent::text_plain(
"Expected code block in command body. Add --help for details.",
- ))
+ ));
+ }
+
+ let string = body[1..body.len().checked_sub(1).unwrap()].join("\n");
+ match serde_json::from_str(&string) {
+ Ok(mut value) => {
+ ruma::signatures::sign_json(
+ services().globals.server_name().as_str(),
+ services().globals.keypair(),
+ &mut value,
+ )
+ .expect("our request json is what ruma expects");
+ let json_text = serde_json::to_string_pretty(&value).expect("canonical json is valid json");
+ Ok(RoomMessageEventContent::text_plain(json_text))
+ },
+ Err(e) => Ok(RoomMessageEventContent::text_plain(format!("Invalid json: {e}"))),
}
}
pub(crate) async fn verify_json(body: Vec<&str>) -> Result<RoomMessageEventContent> {
- if body.len() > 2 && body[0].trim().starts_with("```") && body.last().unwrap().trim() == "```" {
- let string = body[1..body.len().checked_sub(1).unwrap()].join("\n");
- match serde_json::from_str(&string) {
- Ok(value) => {
- let pub_key_map = RwLock::new(BTreeMap::new());
-
- services()
- .rooms
- .event_handler
- .fetch_required_signing_keys([&value], &pub_key_map)
- .await?;
-
- let pub_key_map = pub_key_map.read().await;
- match ruma::signatures::verify_json(&pub_key_map, &value) {
- Ok(()) => Ok(RoomMessageEventContent::text_plain("Signature correct")),
- Err(e) => Ok(RoomMessageEventContent::text_plain(format!(
- "Signature verification failed: {e}"
- ))),
- }
- },
- Err(e) => Ok(RoomMessageEventContent::text_plain(format!("Invalid json: {e}"))),
- }
- } else {
- Ok(RoomMessageEventContent::text_plain(
+ if body.len() < 2 || !body[0].trim().starts_with("```") || body.last().unwrap_or(&"").trim() != "```" {
+ return Ok(RoomMessageEventContent::text_plain(
"Expected code block in command body. Add --help for details.",
- ))
+ ));
+ }
+
+ let string = body[1..body.len().checked_sub(1).unwrap()].join("\n");
+ match serde_json::from_str(&string) {
+ Ok(value) => {
+ let pub_key_map = RwLock::new(BTreeMap::new());
+
+ services()
+ .rooms
+ .event_handler
+ .fetch_required_signing_keys([&value], &pub_key_map)
+ .await?;
+
+ let pub_key_map = pub_key_map.read().await;
+ match ruma::signatures::verify_json(&pub_key_map, &value) {
+ Ok(()) => Ok(RoomMessageEventContent::text_plain("Signature correct")),
+ Err(e) => Ok(RoomMessageEventContent::text_plain(format!(
+ "Signature verification failed: {e}"
+ ))),
+ }
+ },
+ Err(e) => Ok(RoomMessageEventContent::text_plain(format!("Invalid json: {e}"))),
}
}
diff --git a/src/admin/media/media_commands.rs b/src/admin/media/media_commands.rs
index 956f5743d1b7a8bcf6daee1fe18f3a4bcc018eab..a78ee3873b2d17119a6c871818ad57ada316fa46 100644
--- a/src/admin/media/media_commands.rs
+++ b/src/admin/media/media_commands.rs
@@ -138,30 +138,30 @@ pub(crate) async fn delete(
}
pub(crate) async fn delete_list(body: Vec<&str>) -> Result<RoomMessageEventContent> {
- if body.len() > 2 && body[0].trim().starts_with("```") && body.last().unwrap().trim() == "```" {
- let mxc_list = body
- .clone()
- .drain(1..body.len().checked_sub(1).unwrap())
- .collect::<Vec<_>>();
+ if body.len() < 2 || !body[0].trim().starts_with("```") || body.last().unwrap_or(&"").trim() != "```" {
+ return Ok(RoomMessageEventContent::text_plain(
+ "Expected code block in command body. Add --help for details.",
+ ));
+ }
- let mut mxc_deletion_count: usize = 0;
+ let mxc_list = body
+ .clone()
+ .drain(1..body.len().checked_sub(1).unwrap())
+ .collect::<Vec<_>>();
- for mxc in mxc_list {
- debug!("Deleting MXC {mxc} in bulk");
- services().media.delete(mxc.to_owned()).await?;
- mxc_deletion_count = mxc_deletion_count
- .checked_add(1)
- .expect("mxc_deletion_count should not get this high");
- }
+ let mut mxc_deletion_count: usize = 0;
- return Ok(RoomMessageEventContent::text_plain(format!(
- "Finished bulk MXC deletion, deleted {mxc_deletion_count} total MXCs from our database and the filesystem.",
- )));
+ for mxc in mxc_list {
+ debug!("Deleting MXC {mxc} in bulk");
+ services().media.delete(mxc.to_owned()).await?;
+ mxc_deletion_count = mxc_deletion_count
+ .checked_add(1)
+ .expect("mxc_deletion_count should not get this high");
}
- Ok(RoomMessageEventContent::text_plain(
- "Expected code block in command body. Add --help for details.",
- ))
+ Ok(RoomMessageEventContent::text_plain(format!(
+ "Finished bulk MXC deletion, deleted {mxc_deletion_count} total MXCs from our database and the filesystem.",
+ )))
}
pub(crate) async fn delete_past_remote_media(
diff --git a/src/admin/room/room_moderation_commands.rs b/src/admin/room/room_moderation_commands.rs
index 6b759c9bb7ee5a43369ffcbb6d7420cfbf636008..f6d3206ab9bd4d8df1c91cd41e9d5cc1dfa0cace 100644
--- a/src/admin/room/room_moderation_commands.rs
+++ b/src/admin/room/room_moderation_commands.rs
@@ -187,135 +187,137 @@ async fn ban_room(
}
async fn ban_list_of_rooms(body: Vec<&str>, force: bool, disable_federation: bool) -> Result<RoomMessageEventContent> {
- if body.len() > 2 && body[0].trim().starts_with("```") && body.last().unwrap().trim() == "```" {
- let rooms_s = body.clone().drain(1..body.len() - 1).collect::<Vec<_>>();
-
- let admin_room_alias: Box<RoomAliasId> = format!("#admins:{}", services().globals.server_name())
- .try_into()
- .expect("#admins:server_name is a valid alias name");
-
- let mut room_ban_count: usize = 0;
- let mut room_ids: Vec<OwnedRoomId> = Vec::new();
-
- for &room in &rooms_s {
- match <&RoomOrAliasId>::try_from(room) {
- Ok(room_alias_or_id) => {
- if let Some(admin_room_id) = Service::get_admin_room().await? {
- if room.to_owned().eq(&admin_room_id) || room.to_owned().eq(&admin_room_alias) {
- info!("User specified admin room in bulk ban list, ignoring");
- continue;
- }
- }
+ if body.len() < 2 || !body[0].trim().starts_with("```") || body.last().unwrap_or(&"").trim() != "```" {
+ return Ok(RoomMessageEventContent::text_plain(
+ "Expected code block in command body. Add --help for details.",
+ ));
+ }
- if room_alias_or_id.is_room_id() {
- let room_id = match RoomId::parse(room_alias_or_id) {
- Ok(room_id) => room_id,
- Err(e) => {
- if force {
- // ignore rooms we failed to parse if we're force banning
- warn!(
- "Error parsing room \"{room}\" during bulk room banning, ignoring error and \
- logging here: {e}"
- );
- continue;
- }
+ let rooms_s = body.clone().drain(1..body.len() - 1).collect::<Vec<_>>();
+
+ let admin_room_alias: Box<RoomAliasId> = format!("#admins:{}", services().globals.server_name())
+ .try_into()
+ .expect("#admins:server_name is a valid alias name");
- return Ok(RoomMessageEventContent::text_plain(format!(
- "{room} is not a valid room ID or room alias, please fix the list and try again: \
- {e}"
- )));
- },
- };
+ let mut room_ban_count: usize = 0;
+ let mut room_ids: Vec<OwnedRoomId> = Vec::new();
- room_ids.push(room_id);
+ for &room in &rooms_s {
+ match <&RoomOrAliasId>::try_from(room) {
+ Ok(room_alias_or_id) => {
+ if let Some(admin_room_id) = Service::get_admin_room().await? {
+ if room.to_owned().eq(&admin_room_id) || room.to_owned().eq(&admin_room_alias) {
+ info!("User specified admin room in bulk ban list, ignoring");
+ continue;
}
+ }
- if room_alias_or_id.is_room_alias_id() {
- match RoomAliasId::parse(room_alias_or_id) {
- Ok(room_alias) => {
- let room_id =
- if let Some(room_id) = services().rooms.alias.resolve_local_alias(&room_alias)? {
- room_id
- } else {
- debug!(
- "We don't have this room alias to a room ID locally, attempting to fetch \
- room ID over federation"
- );
-
- match get_alias_helper(room_alias, None).await {
- Ok(response) => {
- debug!(
- "Got federation response fetching room ID for room {room}: {:?}",
- response
- );
- response.room_id
- },
- Err(e) => {
- // don't fail if force blocking
- if force {
- warn!("Failed to resolve room alias {room} to a room ID: {e}");
- continue;
- }
-
- return Ok(RoomMessageEventContent::text_plain(format!(
- "Failed to resolve room alias {room} to a room ID: {e}"
- )));
- },
- }
- };
-
- room_ids.push(room_id);
- },
- Err(e) => {
- if force {
- // ignore rooms we failed to parse if we're force deleting
- error!(
- "Error parsing room \"{room}\" during bulk room banning, ignoring error and \
- logging here: {e}"
+ if room_alias_or_id.is_room_id() {
+ let room_id = match RoomId::parse(room_alias_or_id) {
+ Ok(room_id) => room_id,
+ Err(e) => {
+ if force {
+ // ignore rooms we failed to parse if we're force banning
+ warn!(
+ "Error parsing room \"{room}\" during bulk room banning, ignoring error and \
+ logging here: {e}"
+ );
+ continue;
+ }
+
+ return Ok(RoomMessageEventContent::text_plain(format!(
+ "{room} is not a valid room ID or room alias, please fix the list and try again: {e}"
+ )));
+ },
+ };
+
+ room_ids.push(room_id);
+ }
+
+ if room_alias_or_id.is_room_alias_id() {
+ match RoomAliasId::parse(room_alias_or_id) {
+ Ok(room_alias) => {
+ let room_id =
+ if let Some(room_id) = services().rooms.alias.resolve_local_alias(&room_alias)? {
+ room_id
+ } else {
+ debug!(
+ "We don't have this room alias to a room ID locally, attempting to fetch room \
+ ID over federation"
);
- continue;
- }
-
- return Ok(RoomMessageEventContent::text_plain(format!(
- "{room} is not a valid room ID or room alias, please fix the list and try again: \
- {e}"
- )));
- },
- }
- }
- },
- Err(e) => {
- if force {
- // ignore rooms we failed to parse if we're force deleting
- error!(
- "Error parsing room \"{room}\" during bulk room banning, ignoring error and logging here: \
- {e}"
- );
- continue;
+
+ match get_alias_helper(room_alias, None).await {
+ Ok(response) => {
+ debug!(
+ "Got federation response fetching room ID for room {room}: {:?}",
+ response
+ );
+ response.room_id
+ },
+ Err(e) => {
+ // don't fail if force blocking
+ if force {
+ warn!("Failed to resolve room alias {room} to a room ID: {e}");
+ continue;
+ }
+
+ return Ok(RoomMessageEventContent::text_plain(format!(
+ "Failed to resolve room alias {room} to a room ID: {e}"
+ )));
+ },
+ }
+ };
+
+ room_ids.push(room_id);
+ },
+ Err(e) => {
+ if force {
+ // ignore rooms we failed to parse if we're force deleting
+ error!(
+ "Error parsing room \"{room}\" during bulk room banning, ignoring error and \
+ logging here: {e}"
+ );
+ continue;
+ }
+
+ return Ok(RoomMessageEventContent::text_plain(format!(
+ "{room} is not a valid room ID or room alias, please fix the list and try again: {e}"
+ )));
+ },
}
+ }
+ },
+ Err(e) => {
+ if force {
+ // ignore rooms we failed to parse if we're force deleting
+ error!(
+ "Error parsing room \"{room}\" during bulk room banning, ignoring error and logging here: {e}"
+ );
+ continue;
+ }
- return Ok(RoomMessageEventContent::text_plain(format!(
- "{room} is not a valid room ID or room alias, please fix the list and try again: {e}"
- )));
- },
- }
+ return Ok(RoomMessageEventContent::text_plain(format!(
+ "{room} is not a valid room ID or room alias, please fix the list and try again: {e}"
+ )));
+ },
}
+ }
- for room_id in room_ids {
- if services().rooms.metadata.ban_room(&room_id, true).is_ok() {
- debug!("Banned {room_id} successfully");
- room_ban_count = room_ban_count.saturating_add(1);
- }
+ for room_id in room_ids {
+ if services().rooms.metadata.ban_room(&room_id, true).is_ok() {
+ debug!("Banned {room_id} successfully");
+ room_ban_count = room_ban_count.saturating_add(1);
+ }
- debug!("Making all users leave the room {}", &room_id);
- if force {
- for local_user in services()
- .rooms
- .state_cache
- .room_members(&room_id)
- .filter_map(|user| {
- user.ok().filter(|local_user| {
- local_user.server_name() == services().globals.server_name()
+ debug!("Making all users leave the room {}", &room_id);
+ if force {
+ for local_user in services()
+ .rooms
+ .state_cache
+ .room_members(&room_id)
+ .filter_map(|user| {
+ user.ok().filter(|local_user| {
+ local_user.server_name() == services().globals.server_name()
// additional wrapped check here is to avoid adding remote users
// who are in the admin room to the list of local users (would fail auth check)
&& (local_user.server_name()
@@ -324,31 +326,31 @@ async fn ban_list_of_rooms(body: Vec<&str>, force: bool, disable_federation: boo
.users
.is_admin(local_user)
.unwrap_or(true)) // since this is a
- // force operation,
- // assume user is
- // an admin if
- // somehow this
- // fails
- })
+ // force operation,
+ // assume user is
+ // an admin if
+ // somehow this
+ // fails
})
- .collect::<Vec<OwnedUserId>>()
- {
- debug!(
- "Attempting leave for user {} in room {} (forced, ignoring all errors, evicting admins too)",
- &local_user, room_id
- );
- if let Err(e) = leave_room(&local_user, &room_id, None).await {
- warn!(%e, "Failed to leave room");
- }
+ })
+ .collect::<Vec<OwnedUserId>>()
+ {
+ debug!(
+ "Attempting leave for user {} in room {} (forced, ignoring all errors, evicting admins too)",
+ &local_user, room_id
+ );
+ if let Err(e) = leave_room(&local_user, &room_id, None).await {
+ warn!(%e, "Failed to leave room");
}
- } else {
- for local_user in services()
- .rooms
- .state_cache
- .room_members(&room_id)
- .filter_map(|user| {
- user.ok().filter(|local_user| {
- local_user.server_name() == services().globals.server_name()
+ }
+ } else {
+ for local_user in services()
+ .rooms
+ .state_cache
+ .room_members(&room_id)
+ .filter_map(|user| {
+ user.ok().filter(|local_user| {
+ local_user.server_name() == services().globals.server_name()
// additional wrapped check here is to avoid adding remote users
// who are in the admin room to the list of local users (would fail auth check)
&& (local_user.server_name()
@@ -357,45 +359,41 @@ async fn ban_list_of_rooms(body: Vec<&str>, force: bool, disable_federation: boo
.users
.is_admin(local_user)
.unwrap_or(false))
- })
})
- .collect::<Vec<OwnedUserId>>()
- {
- debug!("Attempting leave for user {} in room {}", &local_user, &room_id);
- if let Err(e) = leave_room(&local_user, &room_id, None).await {
- error!(
- "Error attempting to make local user {} leave room {} during bulk room banning: {}",
- &local_user, &room_id, e
- );
- return Ok(RoomMessageEventContent::text_plain(format!(
- "Error attempting to make local user {} leave room {} during room banning (room is still \
- banned but not removing any more users and not banning any more rooms): {}\nIf you would \
- like to ignore errors, use --force",
- &local_user, &room_id, e
- )));
- }
+ })
+ .collect::<Vec<OwnedUserId>>()
+ {
+ debug!("Attempting leave for user {} in room {}", &local_user, &room_id);
+ if let Err(e) = leave_room(&local_user, &room_id, None).await {
+ error!(
+ "Error attempting to make local user {} leave room {} during bulk room banning: {}",
+ &local_user, &room_id, e
+ );
+ return Ok(RoomMessageEventContent::text_plain(format!(
+ "Error attempting to make local user {} leave room {} during room banning (room is still \
+ banned but not removing any more users and not banning any more rooms): {}\nIf you would \
+ like to ignore errors, use --force",
+ &local_user, &room_id, e
+ )));
}
}
-
- if disable_federation {
- services().rooms.metadata.disable_room(&room_id, true)?;
- }
}
if disable_federation {
- return Ok(RoomMessageEventContent::text_plain(format!(
- "Finished bulk room ban, banned {room_ban_count} total rooms, evicted all users, and disabled \
- incoming federation with the room."
- )));
+ services().rooms.metadata.disable_room(&room_id, true)?;
}
- return Ok(RoomMessageEventContent::text_plain(format!(
- "Finished bulk room ban, banned {room_ban_count} total rooms and evicted all users."
- )));
}
- Ok(RoomMessageEventContent::text_plain(
- "Expected code block in command body. Add --help for details.",
- ))
+ if disable_federation {
+ Ok(RoomMessageEventContent::text_plain(format!(
+ "Finished bulk room ban, banned {room_ban_count} total rooms, evicted all users, and disabled incoming \
+ federation with the room."
+ )))
+ } else {
+ Ok(RoomMessageEventContent::text_plain(format!(
+ "Finished bulk room ban, banned {room_ban_count} total rooms and evicted all users."
+ )))
+ }
}
async fn unban_room(