From 47c43769d7701f0c22cf9da424b453520fe37d83 Mon Sep 17 00:00:00 2001
From: strawberry <strawberry@puppygock.gay>
Date: Mon, 15 Apr 2024 20:57:42 -0400
Subject: [PATCH] improve some user admin cmd checks

Signed-off-by: strawberry <strawberry@puppygock.gay>
---
 src/service/admin/user.rs | 43 +++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/service/admin/user.rs b/src/service/admin/user.rs
index 5f1bbce9..11441e86 100644
--- a/src/service/admin/user.rs
+++ b/src/service/admin/user.rs
@@ -1,7 +1,8 @@
 use std::{fmt::Write as _, sync::Arc};
 
 use clap::Subcommand;
-use ruma::{events::room::message::RoomMessageEventContent, UserId};
+use itertools::Itertools;
+use ruma::{events::room::message::RoomMessageEventContent, OwnedRoomId, UserId};
 use tracing::{error, info, warn};
 
 use crate::{
@@ -188,6 +189,16 @@ pub(crate) async fn process(command: UserCommand, body: Vec<&str>) -> Result<Roo
 				)));
 			}
 
+			// don't deactivate the conduit service account
+			if user_id
+				== UserId::parse_with_server_name("conduit", services().globals.server_name())
+					.expect("conduit user exists")
+			{
+				return Ok(RoomMessageEventContent::text_plain(
+					"Not allowed to deactivate the Conduit service account.",
+				));
+			}
+
 			if services().users.exists(&user_id)? {
 				RoomMessageEventContent::text_plain(format!("Making {user_id} leave all rooms before deactivation..."));
 
@@ -294,6 +305,19 @@ pub(crate) async fn process(command: UserCommand, body: Vec<&str>) -> Result<Roo
 						continue;
 					}
 
+					// don't deactivate the conduit service account
+					if user_id
+						== UserId::parse_with_server_name("conduit", services().globals.server_name())
+							.expect("conduit user exists")
+					{
+						continue;
+					}
+
+					// user does not exist on our server
+					if !services().users.exists(user_id)? {
+						continue;
+					}
+
 					if services().users.deactivate_account(user_id).is_ok() {
 						deactivation_count += 1;
 					}
@@ -330,13 +354,20 @@ pub(crate) async fn process(command: UserCommand, body: Vec<&str>) -> Result<Roo
 				return Ok(RoomMessageEventContent::text_plain("User does not belong to our server."));
 			}
 
-			let mut rooms = vec![]; // room ID, members joined, room name
-
-			for room_id in services().rooms.state_cache.rooms_joined(&user_id) {
-				let room_id = room_id?;
-				rooms.push(get_room_info(&room_id));
+			if !services().users.exists(&user_id)? {
+				return Ok(RoomMessageEventContent::text_plain("User does not exist on this server."));
 			}
 
+			let mut rooms: Vec<(OwnedRoomId, u64, String)> = services()
+				.rooms
+				.state_cache
+				.rooms_joined(&user_id)
+				.filter_map(Result::ok)
+				.map(|room_id| get_room_info(&room_id))
+				.sorted_unstable()
+				.dedup()
+				.collect();
+
 			if rooms.is_empty() {
 				return Ok(RoomMessageEventContent::text_plain("User is not in any rooms."));
 			}