refactor: put commands into categories

ryanccn · Jan 17, 2024 · d42befc · d42befc
1 parent 9a35867
commit d42befc
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 26 deletions.
diff --git a/src/commands/fun/mod.rs b/src/commands/fun/mod.rs
@@ -0,0 +1,3 @@
+pub mod owo;
+pub mod pomelo;
+pub mod shiggy;
diff --git a/src/commands/owo.rs → src/commands/fun/owo.rs b/src/commands/owo.rs → src/commands/fun/owo.rs
diff --git a/src/commands/pomelo.rs → src/commands/fun/pomelo.rs b/src/commands/pomelo.rs → src/commands/fun/pomelo.rs
diff --git a/src/commands/shiggy.rs → src/commands/fun/shiggy.rs b/src/commands/shiggy.rs → src/commands/fun/shiggy.rs
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
@@ -1,19 +1,20 @@
 use crate::Context;
 
-mod lighthouse;
-mod owo;
-mod ping;
-mod pomelo;
-mod presence;
-mod say;
-mod self_timeout;
-mod shiggy;
-mod sysinfo;
-mod template_channel;
-mod translate;
-mod version;
+mod fun;
+mod useful;
+mod utils;
 
-pub use presence::restore as restore_presence;
+pub use utils::presence::restore as restore_presence;
+
+macro_rules! command {
+    ($category: ident, $name: ident) => {
+        $category::$name::$name()
+    };
+
+    ($category: ident, $name: ident, $override: ident) => {
+        $category::$name::$override()
+    };
+}
 
 pub fn to_vec() -> Vec<
     poise::Command<
@@ -22,18 +23,18 @@ pub fn to_vec() -> Vec<
     >,
 > {
     vec![
-        lighthouse::lighthouse(),
-        owo::owo(),
-        ping::ping(),
-        pomelo::pomelo(),
-        presence::presence(),
-        say::say(),
-        self_timeout::self_timeout(),
-        self_timeout::transparency(),
-        shiggy::shiggy(),
-        sysinfo::sysinfo(),
-        template_channel::template_channel(),
-        translate::translate(),
-        version::version(),
+        command!(useful, lighthouse),
+        command!(useful, self_timeout),
+        command!(useful, self_timeout, transparency),
+        command!(useful, translate),
+        command!(fun, owo),
+        command!(fun, pomelo),
+        command!(fun, shiggy),
+        command!(utils, ping),
+        command!(utils, presence),
+        command!(utils, say),
+        command!(utils, sysinfo),
+        command!(utils, template_channel),
+        command!(utils, version),
     ]
 }
diff --git a/src/commands/lighthouse.rs → src/commands/useful/lighthouse.rs b/src/commands/lighthouse.rs → src/commands/useful/lighthouse.rs
diff --git a/src/commands/useful/mod.rs b/src/commands/useful/mod.rs
@@ -0,0 +1,3 @@
+pub mod lighthouse;
+pub mod self_timeout;
+pub mod translate;
diff --git a/src/commands/self_timeout.rs → src/commands/useful/self_timeout.rs b/src/commands/self_timeout.rs → src/commands/useful/self_timeout.rs
diff --git a/src/commands/translate.rs → src/commands/useful/translate.rs b/src/commands/translate.rs → src/commands/useful/translate.rs
diff --git a/src/commands/utils/mod.rs b/src/commands/utils/mod.rs
@@ -0,0 +1,6 @@
+pub mod ping;
+pub mod presence;
+pub mod say;
+pub mod sysinfo;
+pub mod template_channel;
+pub mod version;
diff --git a/src/commands/ping.rs → src/commands/utils/ping.rs b/src/commands/ping.rs → src/commands/utils/ping.rs
diff --git a/src/commands/presence.rs → src/commands/utils/presence.rs b/src/commands/presence.rs → src/commands/utils/presence.rs
diff --git a/src/commands/say.rs → src/commands/utils/say.rs b/src/commands/say.rs → src/commands/utils/say.rs
diff --git a/src/commands/sysinfo.rs → src/commands/utils/sysinfo.rs b/src/commands/sysinfo.rs → src/commands/utils/sysinfo.rs
diff --git a/src/commands/template_channel.rs → src/commands/utils/template_channel.rs b/src/commands/template_channel.rs → src/commands/utils/template_channel.rs
diff --git a/src/commands/version.rs → src/commands/utils/version.rs b/src/commands/version.rs → src/commands/utils/version.rs