finish general admin room cleanup

Signed-off-by: strawberry <strawberry@puppygock.gay>

src/service/admin/query/mod.rs

@@ -5,14 +5,13 @@ pub(crate) mod presence;
 pub(crate) mod room_alias;
 
 use clap::Subcommand;
-use ruma::events::room::message::RoomMessageEventContent;
+use ruma::{
+	events::{room::message::RoomMessageEventContent, RoomAccountDataEventType},
+	RoomAliasId, RoomId, ServerName, UserId,
+};
 
 use self::{
-	account_data::{account_data, AccountData},
-	appservice::{appservice, Appservice},
-	globals::{globals, Globals},
-	presence::{presence, Presence},
-	room_alias::{room_alias, RoomAlias},
+	account_data::account_data, appservice::appservice, globals::globals, presence::presence, room_alias::room_alias,
 };
 use crate::Result;
 
@@ -41,14 +40,105 @@ pub(crate) enum QueryCommand {
 	Globals(Globals),
 }
 
+#[cfg_attr(test, derive(Debug))]
+#[derive(Subcommand)]
+/// All the getters and iterators from src/database/key_value/account_data.rs
+pub(crate) enum AccountData {
+	/// - Returns all changes to the account data that happened after `since`.
+	ChangesSince {
+		/// Full user ID
+		user_id: Box<UserId>,
+		/// UNIX timestamp since (u64)
+		since: u64,
+		/// Optional room ID of the account data
+		room_id: Option<Box<RoomId>>,
+	},
+
+	/// - Searches the account data for a specific kind.
+	Get {
+		/// Full user ID
+		user_id: Box<UserId>,
+		/// Account data event type
+		kind: RoomAccountDataEventType,
+		/// Optional room ID of the account data
+		room_id: Option<Box<RoomId>>,
+	},
+}
+
+#[cfg_attr(test, derive(Debug))]
+#[derive(Subcommand)]
+/// All the getters and iterators from src/database/key_value/appservice.rs
+pub(crate) enum Appservice {
+	/// - Gets the appservice registration info/details from the ID as a string
+	GetRegistration {
+		/// Appservice registration ID
+		appservice_id: Box<str>,
+	},
+}
+
+#[cfg_attr(test, derive(Debug))]
+#[derive(Subcommand)]
+/// All the getters and iterators from src/database/key_value/presence.rs
+pub(crate) enum Presence {
+	/// - Returns the latest presence event for the given user.
+	GetPresence {
+		/// Full user ID
+		user_id: Box<UserId>,
+	},
+
+	/// - Iterator of the most recent presence updates that happened after the
+	///   event with id `since`.
+	PresenceSince {
+		/// UNIX timestamp since (u64)
+		since: u64,
+	},
+}
+
+#[cfg_attr(test, derive(Debug))]
+#[derive(Subcommand)]
+/// All the getters and iterators from src/database/key_value/rooms/alias.rs
+pub(crate) enum RoomAlias {
+	ResolveLocalAlias {
+		/// Full room alias
+		alias: Box<RoomAliasId>,
+	},
+
+	/// - Iterator of all our local room aliases for the room ID
+	LocalAliasesForRoom {
+		/// Full room ID
+		room_id: Box<RoomId>,
+	},
+
+	/// - Iterator of all our local aliases in our database with their room IDs
+	AllLocalAliases,
+}
+
+#[cfg_attr(test, derive(Debug))]
+#[derive(Subcommand)]
+/// All the getters and iterators from src/database/key_value/globals.rs
+pub(crate) enum Globals {
+	DatabaseVersion,
+
+	CurrentCount,
+
+	LastCheckForUpdatesId,
+
+	LoadKeypair,
+
+	/// - This returns an empty `Ok(BTreeMap<..>)` when there are no keys found
+	///   for the server.
+	SigningKeysFor {
+		origin: Box<ServerName>,
+	},
+}
+
 /// Processes admin query commands
-#[allow(non_snake_case)]
 pub(crate) async fn process(command: QueryCommand, _body: Vec<&str>) -> Result<RoomMessageEventContent> {
 	Ok(match command {
-		QueryCommand::AccountData(AccountData) => account_data(AccountData).await?,
-		QueryCommand::Appservice(Appservice) => appservice(Appservice).await?,
-		QueryCommand::Presence(Presence) => presence(Presence).await?,
-		QueryCommand::RoomAlias(RoomAlias) => room_alias(RoomAlias).await?,
-		QueryCommand::Globals(Globals) => globals(Globals).await?,
+		QueryCommand::AccountData(command) => account_data(command).await?,
+		QueryCommand::Appservice(command) => appservice(command).await?,
+		QueryCommand::Presence(command) => presence(command).await?,
+		QueryCommand::RoomAlias(command) => room_alias(command).await?,
+		QueryCommand::Globals(command) => globals(command).await?,
 	})
 }