TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adminroom: add count to list-joined-rooms user command

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-05-04 10:35:56 -04:00 • committed by June
parent 2f3194840c
commit 29babebc4d
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/service/admin/user/user_commands.rs
View file

@ -239,7 +239,7 @@ pub(crate) async fn deactivate_all(body: Vec<&str>, leave_rooms: bool, force: bo
} }
} }
let mut deactivation_count = 0; let mut deactivation_count: u16 = 0;
let mut admins = Vec::new(); let mut admins = Vec::new();
if !force { if !force {
@ -276,7 +276,7 @@ pub(crate) async fn deactivate_all(body: Vec<&str>, leave_rooms: bool, force: bo
} }
if services().users.deactivate_account(user_id).is_ok() { if services().users.deactivate_account(user_id).is_ok() {
deactivation_count += 1; deactivation_count = deactivation_count.saturating_add(1);
} }
} }
@ -316,7 +316,7 @@ pub(crate) async fn list_joined_rooms(_body: Vec<&str>, user_id: String) -> Resu
}, },
}; };
if user_id.server_name() != services().globals.server_name() { if !user_is_local(&user_id) {
return Ok(RoomMessageEventContent::text_plain("User does not belong to our server.")); return Ok(RoomMessageEventContent::text_plain("User does not belong to our server."));
} }
@ -340,7 +340,8 @@ pub(crate) async fn list_joined_rooms(_body: Vec<&str>, user_id: String) -> Resu
rooms.reverse(); rooms.reverse();
let output_plain = format!( let output_plain = format!(
"Rooms {user_id} Joined:\n{}", "Rooms {user_id} Joined ({}):\n{}",
rooms.len(),
rooms rooms
.iter() .iter()
.map(|(id, members, name)| format!("{id}\tMembers: {members}\tName: {name}")) .map(|(id, members, name)| format!("{id}\tMembers: {members}\tName: {name}"))
@ -348,8 +349,9 @@ pub(crate) async fn list_joined_rooms(_body: Vec<&str>, user_id: String) -> Resu
.join("\n") .join("\n")
); );
let output_html = format!( let output_html = format!(
"<table><caption>Rooms {user_id} \ "<table><caption>Rooms {user_id} Joined \
Joined</caption>\n<tr><th>id</th>\t<th>members</th>\t<th>name</th></tr>\n{}</table>", ({})</caption>\n<tr><th>id</th>\t<th>members</th>\t<th>name</th></tr>\n{}</table>",
rooms.len(),
rooms rooms
.iter() .iter()
.fold(String::new(), |mut output, (id, members, name)| { .fold(String::new(), |mut output, (id, members, name)| {