Make ClientBuilder directly accept boxed handler types

DPlayer234 · DPlayer234 · commit 32600a0d684f · 2025-10-11T15:40:38.000+02:00
diff --git a/examples/e01_basic_ping_bot/src/main.rs b/examples/e01_basic_ping_bot/src/main.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use serenity::async_trait;
 use serenity::gateway::client::FullEvent;
 use serenity::prelude::*;
@@ -54,8 +56,10 @@ async fn main() {
 
     // Create a new instance of the Client, logging in as a bot. This will automatically prepend
     // your bot token with "Bot ", which is a requirement by Discord for bot users.
-    let mut client =
-        Client::builder(token, intents).event_handler(Handler).await.expect("Err creating client");
+    let mut client = Client::builder(token, intents)
+        .event_handler(Arc::new(Handler))
+        .await
+        .expect("Err creating client");
 
     // Finally, start a single shard, and start listening to events.
     //
diff --git a/examples/e02_transparent_guild_sharding/src/main.rs b/examples/e02_transparent_guild_sharding/src/main.rs
@@ -1,4 +1,6 @@
 #![expect(clippy::collapsible_if)]
+use std::sync::Arc;
+
 use serenity::async_trait;
 use serenity::gateway::client::FullEvent;
 use serenity::prelude::*;
@@ -51,8 +53,10 @@ async fn main() {
     let intents = GatewayIntents::GUILD_MESSAGES
         | GatewayIntents::DIRECT_MESSAGES
         | GatewayIntents::MESSAGE_CONTENT;
-    let mut client =
-        Client::builder(token, intents).event_handler(Handler).await.expect("Err creating client");
+    let mut client = Client::builder(token, intents)
+        .event_handler(Arc::new(Handler))
+        .await
+        .expect("Err creating client");
 
     // The total number of shards to use. The "current shard number" of a shard - that is, the
     // shard it is assigned to - is indexed at 0, while the total shard count is indexed at 1.
diff --git a/examples/e03_struct_utilities/src/main.rs b/examples/e03_struct_utilities/src/main.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use serenity::async_trait;
 use serenity::builder::CreateMessage;
 use serenity::gateway::client::FullEvent;
@@ -47,8 +49,10 @@ async fn main() {
     let intents = GatewayIntents::GUILD_MESSAGES
         | GatewayIntents::DIRECT_MESSAGES
         | GatewayIntents::MESSAGE_CONTENT;
-    let mut client =
-        Client::builder(token, intents).event_handler(Handler).await.expect("Err creating client");
+    let mut client = Client::builder(token, intents)
+        .event_handler(Arc::new(Handler))
+        .await
+        .expect("Err creating client");
 
     if let Err(why) = client.start().await {
         println!("Client error: {why:?}");
diff --git a/examples/e04_message_builder/src/main.rs b/examples/e04_message_builder/src/main.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use serenity::async_trait;
 use serenity::gateway::client::FullEvent;
 use serenity::prelude::*;
@@ -56,8 +58,10 @@ async fn main() {
     let intents = GatewayIntents::GUILD_MESSAGES
         | GatewayIntents::DIRECT_MESSAGES
         | GatewayIntents::MESSAGE_CONTENT;
-    let mut client =
-        Client::builder(token, intents).event_handler(Handler).await.expect("Err creating client");
+    let mut client = Client::builder(token, intents)
+        .event_handler(Arc::new(Handler))
+        .await
+        .expect("Err creating client");
 
     if let Err(why) = client.start().await {
         println!("Client error: {why:?}");
diff --git a/examples/e05_sample_bot_structure/src/main.rs b/examples/e05_sample_bot_structure/src/main.rs
@@ -1,6 +1,7 @@
 mod commands;
 
 use std::env;
+use std::sync::Arc;
 
 use serenity::async_trait;
 use serenity::builder::{CreateInteractionResponse, CreateInteractionResponseMessage};
@@ -94,7 +95,7 @@ async fn main() {
 
     // Build our client.
     let mut client = Client::builder(token, GatewayIntents::empty())
-        .event_handler(Handler)
+        .event_handler(Arc::new(Handler))
         .await
         .expect("Error creating client");
 
diff --git a/examples/e06_env_logging/src/main.rs b/examples/e06_env_logging/src/main.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use serenity::async_trait;
 use serenity::prelude::*;
 use tracing::{debug, error, info, instrument};
@@ -50,8 +52,10 @@ async fn main() {
         | GatewayIntents::DIRECT_MESSAGES
         | GatewayIntents::MESSAGE_CONTENT;
 
-    let mut client =
-        Client::builder(token, intents).event_handler(Handler).await.expect("Err creating client");
+    let mut client = Client::builder(token, intents)
+        .event_handler(Arc::new(Handler))
+        .await
+        .expect("Err creating client");
 
     if let Err(why) = client.start().await {
         error!("Client error: {:?}", why);
diff --git a/examples/e07_shard_manager/src/main.rs b/examples/e07_shard_manager/src/main.rs
@@ -19,6 +19,7 @@
 //! Note that it may take a minute or more for a latency to be recorded or to update, depending on
 //! how often Discord tells the client to send a heartbeat.
 #![expect(clippy::collapsible_if)]
+use std::sync::Arc;
 use std::time::Duration;
 
 use serenity::async_trait;
@@ -54,8 +55,10 @@ async fn main() {
     let intents = GatewayIntents::GUILD_MESSAGES
         | GatewayIntents::DIRECT_MESSAGES
         | GatewayIntents::MESSAGE_CONTENT;
-    let mut client =
-        Client::builder(token, intents).event_handler(Handler).await.expect("Err creating client");
+    let mut client = Client::builder(token, intents)
+        .event_handler(Arc::new(Handler))
+        .await
+        .expect("Err creating client");
 
     // Here we get a DashMap of of the shards' status that we move into a new thread.
     let runners = client.shard_manager.runners.clone();
diff --git a/examples/e08_create_message_builder/src/main.rs b/examples/e08_create_message_builder/src/main.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use serenity::async_trait;
 use serenity::builder::{CreateAttachment, CreateEmbed, CreateEmbedFooter, CreateMessage};
 use serenity::gateway::client::FullEvent;
@@ -62,8 +64,10 @@ async fn main() {
     let intents = GatewayIntents::GUILD_MESSAGES
         | GatewayIntents::DIRECT_MESSAGES
         | GatewayIntents::MESSAGE_CONTENT;
-    let mut client =
-        Client::builder(token, intents).event_handler(Handler).await.expect("Err creating client");
+    let mut client = Client::builder(token, intents)
+        .event_handler(Arc::new(Handler))
+        .await
+        .expect("Err creating client");
 
     if let Err(why) = client.start().await {
         println!("Client error: {why:?}");
diff --git a/examples/e09_collectors/src/main.rs b/examples/e09_collectors/src/main.rs
@@ -1,6 +1,7 @@
 //! This example will showcase the beauty of collectors. They allow to await messages or reactions
 //! from a user in the middle of a control flow, one being a command.
 use std::collections::HashSet;
+use std::sync::Arc;
 use std::time::Duration;
 
 use serenity::async_trait;
@@ -163,8 +164,10 @@ async fn main() {
         | GatewayIntents::MESSAGE_CONTENT
         | GatewayIntents::GUILD_MESSAGE_REACTIONS;
 
-    let mut client =
-        Client::builder(token, intents).event_handler(Handler).await.expect("Err creating client");
+    let mut client = Client::builder(token, intents)
+        .event_handler(Arc::new(Handler))
+        .await
+        .expect("Err creating client");
 
     if let Err(why) = client.start().await {
         println!("Client error: {why:?}");
diff --git a/examples/e10_gateway_intents/src/main.rs b/examples/e10_gateway_intents/src/main.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use serenity::async_trait;
 use serenity::prelude::*;
 
@@ -41,7 +43,7 @@ async fn main() {
         GatewayIntents::GUILDS | GatewayIntents::GUILD_MESSAGES | GatewayIntents::MESSAGE_CONTENT;
     // Build our client.
     let mut client = Client::builder(token, intents)
-        .event_handler(Handler)
+        .event_handler(Arc::new(Handler))
         .await
         .expect("Error creating client");
 
diff --git a/examples/e11_global_data/src/main.rs b/examples/e11_global_data/src/main.rs
@@ -88,7 +88,7 @@ async fn main() {
         // guarantee that Context::data will not panic if the same type is given, as providing the
         // incorrect type will lead to a compiler error, rather than a runtime panic.
         .data::<UserData>(Arc::new(data))
-        .event_handler(Handler)
+        .event_handler(Arc::new( Handler))
         .await
         .expect("Err creating client");
 
diff --git a/examples/e12_parallel_loops/src/main.rs b/examples/e12_parallel_loops/src/main.rs
@@ -1,4 +1,5 @@
 #![expect(clippy::collapsible_if)]
+use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::Duration;
 
@@ -117,9 +118,9 @@ async fn main() {
         | GatewayIntents::GUILDS
         | GatewayIntents::MESSAGE_CONTENT;
     let mut client = Client::builder(token, intents)
-        .event_handler(Handler {
+        .event_handler(Arc::new(Handler {
             is_loop_running: AtomicBool::new(false),
-        })
+        }))
         .await
         .expect("Error creating client");
 
diff --git a/examples/e13_sqlite_database/src/main.rs b/examples/e13_sqlite_database/src/main.rs
@@ -1,6 +1,7 @@
 // It is recommended that you read the README file, it is very important to this example.
 // This example will help us to use a sqlite database with our bot.
 use std::fmt::Write as _;
+use std::sync::Arc;
 
 use serenity::async_trait;
 use serenity::model::prelude::*;
@@ -106,9 +107,9 @@ async fn main() {
     // Run migrations, which updates the database's schema to the latest version.
     sqlx::migrate!("./migrations").run(&database).await.expect("Couldn't run database migrations");
 
-    let bot = Bot {
+    let bot = Arc::new(Bot {
         database,
-    };
+    });
 
     let intents = GatewayIntents::GUILD_MESSAGES
         | GatewayIntents::DIRECT_MESSAGES
diff --git a/examples/e14_message_components/src/main.rs b/examples/e14_message_components/src/main.rs
@@ -1,4 +1,5 @@
 use std::borrow::Cow;
+use std::sync::Arc;
 use std::time::Duration;
 
 use dotenv::dotenv;
@@ -170,7 +171,7 @@ async fn main() {
         | GatewayIntents::DIRECT_MESSAGES
         | GatewayIntents::MESSAGE_CONTENT;
     let mut client = Client::builder(token, intents)
-        .event_handler(Handler)
+        .event_handler(Arc::new(Handler))
         .await
         .expect("Error creating client");
 
diff --git a/examples/testing/src/main.rs b/examples/testing/src/main.rs
@@ -1,4 +1,5 @@
 use std::borrow::Cow;
+use std::sync::Arc;
 
 use serenity::async_trait;
 use serenity::builder::*;
@@ -430,6 +431,7 @@ async fn main() {
         Token::from_env("DISCORD_TOKEN").expect("Expected a valid token in the environment");
     let intents = GatewayIntents::non_privileged() | GatewayIntents::MESSAGE_CONTENT;
 
-    let mut client = Client::builder(token, intents).event_handler(Handler).await.unwrap();
+    let mut client =
+        Client::builder(token, intents).event_handler(Arc::new(Handler)).await.unwrap();
     client.start().await.unwrap();
 }
diff --git a/src/gateway/client/mod.rs b/src/gateway/client/mod.rs
@@ -150,11 +150,10 @@ impl ClientBuilder {
     /// *Info*: If a reference to the framework is required for manual dispatch, you can implement
     /// [`Framework`] on [`Arc<YourFrameworkType>`] instead of `YourFrameworkType`.
     #[cfg(feature = "framework")]
-    pub fn framework<F>(mut self, framework: F) -> Self
-    where
-        F: Framework + 'static,
-    {
-        self.framework = Some(Box::new(framework));
+    pub fn framework(mut self, framework: Box<dyn Framework>) -> Self {
+        // This `Box` is converted to an `Arc` after `init` is called. The init step requires a
+        // mutable reference, and therefore accepting an `Arc` here would be misleading at best.
+        self.framework = Some(framework);
 
         self
     }
@@ -188,11 +187,8 @@ impl ClientBuilder {
     /// Sets the voice gateway handler to be used. It will receive voice events sent over the
     /// gateway and then consider - based on its settings - whether to dispatch a command.
     #[cfg(feature = "voice")]
-    pub fn voice_manager<V>(mut self, voice_manager: impl Into<Arc<V>>) -> Self
-    where
-        V: VoiceGatewayManager + 'static,
-    {
-        self.voice_manager = Some(voice_manager.into());
+    pub fn voice_manager<V>(mut self, voice_manager: Arc<dyn VoiceGatewayManager>) -> Self {
+        self.voice_manager = Some(voice_manager);
         self
     }
 
@@ -236,34 +232,28 @@ impl ClientBuilder {
     }
 
     /// Adds an event handler with multiple methods for each possible event.
-    pub fn event_handler<H>(mut self, event_handler: impl Into<Arc<H>>) -> Self
-    where
-        H: EventHandler + 'static,
-    {
-        self.event_handler = Some(event_handler.into());
+    pub fn event_handler(mut self, event_handler: Arc<dyn EventHandler>) -> Self {
+        self.event_handler = Some(event_handler);
         self
     }
 
     /// Gets the added event handlers. See [`Self::event_handler`] for more info.
     #[must_use]
-    pub fn get_event_handler(&self) -> Option<&Arc<dyn EventHandler>> {
-        self.event_handler.as_ref()
+    pub fn get_event_handler(&self) -> Option<Arc<dyn EventHandler>> {
+        self.event_handler.clone()
     }
 
     /// Adds an event handler with a single method where all received gateway events will be
     /// dispatched.
-    pub fn raw_event_handler<H>(mut self, raw_event_handler: impl Into<Arc<H>>) -> Self
-    where
-        H: RawEventHandler + 'static,
-    {
-        self.raw_event_handler = Some(raw_event_handler.into());
+    pub fn raw_event_handler(mut self, raw_event_handler: Arc<dyn RawEventHandler>) -> Self {
+        self.raw_event_handler = Some(raw_event_handler);
         self
     }
 
     /// Gets the added raw event handlers. See [`Self::raw_event_handler`] for more info.
     #[must_use]
-    pub fn get_raw_event_handler(&self) -> Option<&Arc<dyn RawEventHandler>> {
-        self.raw_event_handler.as_ref()
+    pub fn get_raw_event_handler(&self) -> Option<Arc<dyn RawEventHandler>> {
+        self.raw_event_handler.clone()
     }
 
     /// Sets the initial activity.
