mirrors/conduwuit
1
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2026-03-29 23:20:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fmt: ran cargo format

Browse source
This commit is contained in:
NinekoTheCat 2023-12-24 19:25:51 +01:00
parent cadc36700f
commit 0add1c7c52
No known key found for this signature in database
GPG key ID: 700DB3F678A4AB66
12 changed files with 189 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/service/admin/mod.rs
View file

@ -40,7 +40,7 @@ use crate::{
Error, PduEvent, Result,
};
use super::{pdu::PduBuilder, acl::AclMode};
use super::{acl::AclMode, pdu::PduBuilder};
const PAGE_SIZE: usize = 100;
@ -81,16 +81,9 @@ enum AdminCommand {
#[cfg_attr(test, derive(Debug))]
#[derive(Subcommand)]
enum AclCommand {
Add {
mode: AclMode,
hostname: String
},
Remove {
hostname: String
},
List{
filter: Option<AclMode>
}
Add { mode: AclMode, hostname: String },
Remove { hostname: String },
List { filter: Option<AclMode> },
}
#[cfg_attr(test, derive(Debug))]
@ -1279,42 +1272,60 @@ impl Service {
AdminCommand::Acl(AclCommand::Add { mode, hostname }) => {
let host = match Host::parse(&hostname) {
Ok(host) => host,
Err(error) => return Ok(RoomMessageEventContent::text_plain(format!("failed to parse hostname with error {}",error))),
Err(error) => {
return Ok(RoomMessageEventContent::text_plain(format!(
"failed to parse hostname with error {}",
error
)))
}
};
if let Err(error) = services().acl.add_acl(host.clone(), mode) {
error!("encountered {} while trying to add acl with host {} and mode {:?}",error,host,mode);
error!(
"encountered {} while trying to add acl with host {} and mode {:?}",
error, host, mode
);
RoomMessageEventContent::text_plain("error, couldn't add acl")
} else {
RoomMessageEventContent::text_plain("successfully added ACL")
}
},
AdminCommand::Acl(AclCommand::Remove { hostname }) => {
}
AdminCommand::Acl(AclCommand::Remove { hostname }) => {
let host = match Host::parse(&hostname) {
Ok(host) => host,
Err(error) => return Ok(RoomMessageEventContent::text_plain(format!("failed to parse hostname with error {}",error))),
Err(error) => {
return Ok(RoomMessageEventContent::text_plain(format!(
"failed to parse hostname with error {}",
error
)))
}
};
if let Err(error) = services().acl.remove_acl(host.clone()) {
error!("encountered {} while trying to remove acl with host {}",error,host);
error!(
"encountered {} while trying to remove acl with host {}",
error, host
);
RoomMessageEventContent::text_plain("error, couldn't remove acl")
} else {
RoomMessageEventContent::text_plain("successfully removed ACL")
}
},
AdminCommand::Acl(AclCommand::List { filter}) => {
}
AdminCommand::Acl(AclCommand::List { filter }) => {
let results = services().acl.list_acls(filter);
let mut results_html = String::new();
results.iter().for_each(|it| {
results_html.push_str(&format!("* {} | {}\n",it.hostname,it.mode.to_emoji()));
results_html.push_str(&format!("* {} | {}\n", it.hostname, it.mode.to_emoji()));
});
RoomMessageEventContent::text_plain(format!("
RoomMessageEventContent::text_plain(format!(
"
List of services: \n
❎ = blocked\n
✅ = allowed\n
{}
",results_html))
},
",
results_html
))
}
};
Ok(reply_message_content)