Rename Context::shard_manager back to shard

examples/e09_collectors/src/main.rs

@@ -26,11 +26,8 @@ impl EventHandler for Handler {
         // There is a method implemented for some models to conveniently collect replies. They
         // return a builder that can be turned into a Stream, or here, where we can await a
         // single reply
-        let collector = msg
-            .author
-            .id
-            .collect_messages(ctx.shard_messenger.clone())
-            .timeout(Duration::from_secs(10));
+        let collector =
+            msg.author.id.collect_messages(ctx.shard.clone()).timeout(Duration::from_secs(10));
         if let Some(answer) = collector.await {
             if answer.content.to_lowercase() == "ferris" {
                 let _ = answer.reply(&ctx.http, "That's correct!").await;
@@ -50,7 +47,7 @@ impl EventHandler for Handler {
         // The message model can also be turned into a Collector to collect reactions on it.
         let collector = react_msg
             .id
-            .collect_reactions(ctx.shard_messenger.clone())
+            .collect_reactions(ctx.shard.clone())
             .timeout(Duration::from_secs(10))
             .author_id(msg.author.id);
 
@@ -68,7 +65,7 @@ impl EventHandler for Handler {
         let _ = msg.reply(&ctx.http, "Write 5 messages in 10 seconds").await;
 
         // We can create a collector from scratch too using this builder future.
-        let collector = MessageCollector::new(ctx.shard_messenger.clone())
+        let collector = MessageCollector::new(ctx.shard.clone())
         // Only collect messages by this user.
             .author_id(msg.author.id)
             .channel_id(msg.channel_id)
@@ -103,17 +100,16 @@ impl EventHandler for Handler {
         // We can also collect arbitrary events using the collect() function. For example, here we
         // collect updates to the messages that the user sent above and check for them updating all
         // 5 of them.
-        let mut collector =
-            serenity::collector::collect(&ctx.shard_messenger, move |event| match event {
-                // Only collect MessageUpdate events for the 5 MessageIds we're interested in.
-                Event::MessageUpdate(event)
-                    if collected.iter().any(|msg| event.message.id == msg.id) =>
-                {
-                    Some(event.message.id)
-                },
-                _ => None,
-            })
-            .take_until(Box::pin(tokio::time::sleep(Duration::from_secs(20))));
+        let mut collector = serenity::collector::collect(&ctx.shard, move |event| match event {
+            // Only collect MessageUpdate events for the 5 MessageIds we're interested in.
+            Event::MessageUpdate(event)
+                if collected.iter().any(|msg| event.message.id == msg.id) =>
+            {
+                Some(event.message.id)
+            },
+            _ => None,
+        })
+        .take_until(Box::pin(tokio::time::sleep(Duration::from_secs(20))));
 
         let _ = msg.reply(&ctx.http, "Edit each of those 5 messages in 20 seconds").await;
         let mut edited = HashSet::new();

examples/e14_message_components/src/main.rs

@@ -60,7 +60,7 @@ impl EventHandler for Handler {
         // manually in the EventHandler.
         let interaction = match m
             .id
-            .collect_component_interactions(ctx.shard_messenger.clone())
+            .collect_component_interactions(ctx.shard.clone())
             .timeout(Duration::from_secs(60 * 3))
             .await
         {
@@ -108,7 +108,7 @@ impl EventHandler for Handler {
 
         // Wait for multiple interactions
         let mut interaction_stream =
-            m.id.collect_component_interactions(ctx.shard_messenger.clone())
+            m.id.collect_component_interactions(ctx.shard.clone())
                 .timeout(Duration::from_secs(60 * 3))
                 .stream();
 

examples/testing/src/main.rs

@@ -122,7 +122,7 @@ async fn message(ctx: &Context, msg: Message) -> Result<(), serenity::Error> {
                 .await?;
             let button_press = msg
                 .id
-                .collect_component_interactions(ctx.shard_messenger.clone())
+                .collect_component_interactions(ctx.shard.clone())
                 .timeout(std::time::Duration::from_secs(10))
                 .await;
             match button_press {
@@ -181,11 +181,10 @@ async fn message(ctx: &Context, msg: Message) -> Result<(), serenity::Error> {
             .await?;
 
         let msg_id = msg.id;
-        let mut message_updates =
-            serenity::collector::collect(&ctx.shard_messenger, move |ev| match ev {
-                Event::MessageUpdate(x) if x.message.id == msg_id => Some(()),
-                _ => None,
-            });
+        let mut message_updates = serenity::collector::collect(&ctx.shard, move |ev| match ev {
+            Event::MessageUpdate(x) if x.message.id == msg_id => Some(()),
+            _ => None,
+        });
         let _ = tokio::time::timeout(Duration::from_millis(2000), message_updates.next()).await;
         msg.edit(&ctx, EditMessage::new().suppress_embeds(true)).await?;
     } else if msg.content == "voicemessage" {

src/collector/quick_modal.rs

@@ -99,7 +99,7 @@ impl<'a> CreateQuickModal<'a> {
         );
         builder.execute(&ctx.http, interaction_id, token).await?;
 
-        let collector = ModalInteractionCollector::new(ctx.shard_messenger.clone())
+        let collector = ModalInteractionCollector::new(ctx.shard.clone())
             .custom_ids(vec![FixedString::from_str_trunc(&modal_custom_id)]);
 
         let collector = match self.timeout {

src/gateway/client/context.rs

@@ -29,7 +29,7 @@ pub struct Context {
     /// [`Client::data`]: super::Client::data
     data: Arc<dyn std::any::Any + Send + Sync>,
     /// The messenger to communicate with the shard runner.
-    pub shard_messenger: ShardMessenger,
+    pub shard: ShardMessenger,
     /// The ID of the shard this context is related to.
     pub shard_id: ShardId,
     pub http: Arc<Http>,
@@ -42,7 +42,7 @@ pub struct Context {
 impl fmt::Debug for Context {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("Context")
-            .field("shard_messenger", &self.shard_messenger)
+            .field("shard", &self.shard)
             .field("shard_id", &self.shard_id)
             .finish_non_exhaustive()
     }
@@ -69,7 +69,7 @@ impl Context {
     ) -> Context {
         Context {
             data,
-            shard_messenger,
+            shard: shard_messenger,
             shard_id,
             http,
             #[cfg(feature = "cache")]
@@ -131,7 +131,7 @@ impl Context {
     ///
     /// [`Online`]: OnlineStatus::Online
     pub fn online(&self) {
-        self.shard_messenger.set_status(OnlineStatus::Online);
+        self.shard.set_status(OnlineStatus::Online);
     }
 
     /// Sets the current user as being [`Idle`]. This maintains the current activity.
@@ -158,7 +158,7 @@ impl Context {
     ///
     /// [`Idle`]: OnlineStatus::Idle
     pub fn idle(&self) {
-        self.shard_messenger.set_status(OnlineStatus::Idle);
+        self.shard.set_status(OnlineStatus::Idle);
     }
 
     /// Sets the current user as being [`DoNotDisturb`]. This maintains the current activity.
@@ -185,7 +185,7 @@ impl Context {
     ///
     /// [`DoNotDisturb`]: OnlineStatus::DoNotDisturb
     pub fn dnd(&self) {
-        self.shard_messenger.set_status(OnlineStatus::DoNotDisturb);
+        self.shard.set_status(OnlineStatus::DoNotDisturb);
     }
 
     /// Sets the current user as being [`Invisible`]. This maintains the current activity.
@@ -212,7 +212,7 @@ impl Context {
     ///
     /// [`Invisible`]: OnlineStatus::Invisible
     pub fn invisible(&self) {
-        self.shard_messenger.set_status(OnlineStatus::Invisible);
+        self.shard.set_status(OnlineStatus::Invisible);
     }
 
     /// "Resets" the current user's presence, by setting the activity to [`None`] and the online
@@ -243,7 +243,7 @@ impl Context {
     /// [`Event::Resumed`]: crate::model::event::Event::Resumed
     /// [`Online`]: OnlineStatus::Online
     pub fn reset_presence(&self) {
-        self.shard_messenger.set_presence(None, OnlineStatus::Online);
+        self.shard.set_presence(None, OnlineStatus::Online);
     }
 
     /// Sets the current activity.
@@ -271,7 +271,7 @@ impl Context {
     /// }
     /// ```
     pub fn set_activity(&self, activity: Option<ActivityData>) {
-        self.shard_messenger.set_activity(activity);
+        self.shard.set_activity(activity);
     }
 
     /// Sets the current user's presence, providing all fields to be passed.
@@ -319,7 +319,7 @@ impl Context {
     /// [`DoNotDisturb`]: OnlineStatus::DoNotDisturb
     /// [`Idle`]: OnlineStatus::Idle
     pub fn set_presence(&self, activity: Option<ActivityData>, status: OnlineStatus) {
-        self.shard_messenger.set_presence(activity, status);
+        self.shard.set_presence(activity, status);
     }
 
     /// Gets all emojis for the current application.