fix(commands): only register toggle_update_role on the RetroRealm Server

Author: DevYukine

src/command/mod.rs

@@ -3,14 +3,14 @@ mod role;
 mod util;
 
 use crate::abstraction::command::{CommandData, CommandError};
-use crate::command::playmatch::{list, r#match, suggest};
+use crate::command::playmatch::{get_game_metadata, list, r#match, suggest};
 use crate::command::role::toggle_update_role;
 use crate::command::util::{help, ping};
 use lazy_static::lazy_static;
 use poise::Command;
 
 lazy_static! {
-	static ref RETROREALM_SERVER_ID: u64 = std::env::var("DISCORD_RETROREALM_SERVER_ID")
+	pub static ref RETROREALM_SERVER_ID: u64 = std::env::var("DISCORD_RETROREALM_SERVER_ID")
 		.unwrap_or_default()
 		.parse()
 		.unwrap();
@@ -23,13 +23,23 @@ lazy_static! {
 			.unwrap();
 }
 
-pub fn get_commands() -> Vec<Command<CommandData, CommandError>> {
+pub fn get_all_commands() -> Vec<Command<CommandData, CommandError>> {
+	let mut commands = get_global_commands();
+	commands.extend(retrorealm_server_commands());
+	commands
+}
+
+pub fn get_global_commands() -> Vec<Command<CommandData, CommandError>> {
 	vec![
 		help(),
 		ping(),
-		toggle_update_role(),
 		list(),
 		r#match(),
 		suggest(),
+		get_game_metadata(),
 	]
 }
+
+pub fn retrorealm_server_commands() -> Vec<Command<CommandData, CommandError>> {
+	vec![toggle_update_role()]
+}

src/main.rs

@@ -3,10 +3,13 @@ mod command;
 mod events;
 pub mod util;
 
-use crate::command::get_commands;
+use crate::command::{
+	RETROREALM_SERVER_ID, get_all_commands, get_global_commands, retrorealm_server_commands,
+};
 use abstraction::command::CommandData;
 use dotenvy::dotenv;
 use log::info;
+use serenity::all::GuildId;
 use serenity::prelude::GatewayIntents;
 
 pub mod built_info {
@@ -34,7 +37,7 @@ async fn main() -> anyhow::Result<()> {
 
 	let framework = poise::Framework::builder()
 		.options(poise::FrameworkOptions {
-			commands: get_commands(),
+			commands: get_all_commands(),
 			post_command: |ctx| {
 				Box::pin(async move {
 					let author = ctx.author();
@@ -56,9 +59,17 @@ async fn main() -> anyhow::Result<()> {
 			},
 			..Default::default()
 		})
-		.setup(|ctx, _ready, framework| {
+		.setup(|ctx, _ready, _framework| {
 			Box::pin(async move {
-				poise::builtins::register_globally(ctx, &framework.options().commands).await?;
+				poise::builtins::register_globally(ctx, get_global_commands().as_slice()).await?;
+
+				poise::builtins::register_in_guild(
+					ctx,
+					retrorealm_server_commands().as_slice(),
+					GuildId::from(*RETROREALM_SERVER_ID),
+				)
+				.await?;
+
 				Ok(CommandData::default())
 			})
 		})