From ea53af739af31a5254d3116d934b69d2633eb41f Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Sun, 29 Dec 2024 16:10:58 +0100
Subject: [PATCH] Add helper function for adding command to Commands

---
 euphoxide-bot/examples/examplebot.rs | 64 ++++++++++++++++------------
 euphoxide-bot/src/command.rs         |  7 +++
 2 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/euphoxide-bot/examples/examplebot.rs b/euphoxide-bot/examples/examplebot.rs
index 68fed91..b0e8365 100644
--- a/euphoxide-bot/examples/examplebot.rs
+++ b/euphoxide-bot/examples/examplebot.rs
@@ -44,35 +44,43 @@ async fn add(args: AddArgs, msg: &Message, ctx: &Context) -> euphoxide::Result<P
 async fn main() {
     let (event_tx, mut event_rx) = mpsc::channel(10);
 
-    let commands = Commands::new()
-        .then(Ping::default().general("ping").hidden())
-        .then(Ping::default().specific("ping").hidden())
-        .then(
-            ShortHelp::new("/me demonstrates how to use euphoxide")
-                .general("help")
-                .hidden(),
-        )
-        .then(
-            FullHelp::new()
-                .with_after("Created using euphoxide.")
-                .specific("help")
-                .hidden(),
-        )
-        .then(
-            FromHandler::new(pyramid)
-                .described()
-                .with_description("build a pyramid")
-                .general("pyramid"),
-        )
-        .then(
-            FromClapHandler::new(add)
-                .clap()
-                .described()
-                .with_description("add two numbers")
-                .general("add"),
-        )
-        .build();
+    let mut commands = Commands::new();
 
+    Ping::default()
+        .general("ping")
+        .hidden()
+        .add_to(&mut commands);
+
+    Ping::default()
+        .specific("ping")
+        .hidden()
+        .add_to(&mut commands);
+
+    ShortHelp::new("/me demonstrates how to use euphoxide")
+        .general("help")
+        .hidden()
+        .add_to(&mut commands);
+
+    FullHelp::new()
+        .with_after("Created using euphoxide.")
+        .specific("help")
+        .hidden()
+        .add_to(&mut commands);
+
+    FromHandler::new(pyramid)
+        .described()
+        .with_description("build a pyramid")
+        .general("pyramid")
+        .add_to(&mut commands);
+
+    FromClapHandler::new(add)
+        .clap()
+        .described()
+        .with_description("add two numbers")
+        .general("add")
+        .add_to(&mut commands);
+
+    let commands = commands.build();
     let clients = MultiClient::new(event_tx);
 
     clients
diff --git a/euphoxide-bot/src/command.rs b/euphoxide-bot/src/command.rs
index 52ca343..54f2951 100644
--- a/euphoxide-bot/src/command.rs
+++ b/euphoxide-bot/src/command.rs
@@ -153,6 +153,13 @@ pub trait CommandExt: Sized {
     fn clap(self) -> clap::Clap<Self> {
         clap::Clap(self)
     }
+
+    fn add_to<E>(self, commands: &mut Commands<E>)
+    where
+        Self: Command<E> + Send + Sync + 'static,
+    {
+        commands.add(self);
+    }
 }
 
 // Sadly this doesn't work: `impl<E, C: Command<E>> CommandExt for C {}`