Fix breakage caused by CacheHttp -> Http

* Use Http instead of CacheHttp * Fix examples compiling * Update MSRV lockfile --------- Co-authored-by: GnomedDev <[email protected]>
serenity-rs · Jun 8, 2024 · 47bbbad · 47bbbad
1 parent fdf55be
commit 47bbbad
Show file tree

Hide file tree

Showing 9 changed files with 4,516 additions and 11 deletions.
diff --git a/.github/Cargo-msrv.lock b/.github/Cargo-msrv.lock
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/event_handler/main.rs b/examples/event_handler/main.rs
@@ -56,7 +56,7 @@ async fn event_handler(
                 let old_mentions = data.poise_mentions.fetch_add(1, Ordering::SeqCst);
                 new_message
                     .reply(
-                        ctx,
+                        &ctx.http,
                         format!("Poise has been mentioned {} times", old_mentions + 1),
                     )
                     .await?;

diff --git a/examples/feature_showcase/checks.rs b/examples/feature_showcase/checks.rs
@@ -40,7 +40,7 @@ pub async fn delete(
     #[description = "Message to be deleted"] msg: serenity::Message,
     reason: Option<String>,
 ) -> Result<(), Error> {
-    msg.delete(ctx, reason.as_deref()).await?;
+    msg.delete(ctx.http(), reason.as_deref()).await?;
     Ok(())
 }
 

diff --git a/examples/help_generation/main.rs b/examples/help_generation/main.rs
@@ -239,7 +239,7 @@ async fn food_react(
     let reaction = FOOD[rand::thread_rng().gen_range(0..FOOD.len())];
     let reaction = serenity::ReactionType::Unicode(FixedString::from_str_trunc(reaction));
 
-    msg.react(ctx, reaction).await?;
+    msg.react(ctx.http(), reaction).await?;
     ctx.say("Reacted!").await?;
     Ok(())
 }
@@ -262,7 +262,7 @@ async fn fruit_react(
     let reaction = FRUIT[rand::thread_rng().gen_range(0..FRUIT.len())];
     let reaction = serenity::ReactionType::Unicode(FixedString::from_str_trunc(reaction));
 
-    msg.react(ctx, reaction).await?;
+    msg.react(ctx.http(), reaction).await?;
     ctx.say("Reacted!").await?;
     Ok(())
 }
@@ -281,7 +281,7 @@ async fn vegetable_react(
     let reaction = VEGETABLES[rand::thread_rng().gen_range(0..VEGETABLES.len())];
     let reaction = serenity::ReactionType::Unicode(FixedString::from_str_trunc(reaction));
 
-    msg.react(ctx, reaction).await?;
+    msg.react(ctx.http(), reaction).await?;
     ctx.say("Reacted!").await?;
     Ok(())
 }

diff --git a/examples/manual_dispatch/main.rs b/examples/manual_dispatch/main.rs
@@ -20,11 +20,11 @@ struct Handler {
 }
 #[serenity::async_trait]
 impl serenity::EventHandler for Handler {
-    async fn message(&self, serenity_context: &serenity::Context, new_message: &serenity::Message) {
+    async fn message(&self, serenity_context: serenity::Context, new_message: serenity::Message) {
         // FrameworkContext contains all data that poise::Framework usually manages
         let shard_manager = (*self.shard_manager.lock().unwrap()).clone().unwrap();
         let framework_data = poise::FrameworkContext {
-            serenity_context,
+            serenity_context: &serenity_context,
             options: &self.options,
             shard_manager: &shard_manager,
         };
@@ -35,7 +35,7 @@ impl serenity::EventHandler for Handler {
 
         let res = poise::dispatch_message(
             framework_data,
-            new_message,
+            &new_message,
             trigger,
             &invocation_data,
             &mut parent_commands,

diff --git a/src/dispatch/mod.rs b/src/dispatch/mod.rs
@@ -125,7 +125,10 @@ pub async fn dispatch_event<U: Send + Sync + 'static, E>(
                     .unwrap()
                     .process_message_delete(*deleted_message_id);
                 if let Some(bot_response) = bot_response {
-                    if let Err(e) = bot_response.delete(framework.serenity_context, None).await {
+                    if let Err(e) = bot_response
+                        .delete(&framework.serenity_context.http, None)
+                        .await
+                    {
                         tracing::warn!("failed to delete bot response: {}", e);
                     }
                 }

diff --git a/src/reply/mod.rs b/src/reply/mod.rs
@@ -144,7 +144,7 @@ impl ReplyHandle<'_> {
         ctx: crate::Context<'_, U, E>,
     ) -> Result<(), serenity::Error> {
         match &self.0 {
-            ReplyHandleInner::Prefix(msg) => msg.delete(ctx.serenity_context(), None).await?,
+            ReplyHandleInner::Prefix(msg) => msg.delete(ctx.http(), None).await?,
             ReplyHandleInner::Application {
                 http: _,
                 interaction,

diff --git a/src/reply/send_reply.rs b/src/reply/send_reply.rs
@@ -154,7 +154,7 @@ pub async fn send_prefix_reply<'a, U: Send + Sync + 'static, E>(
         let new_response = ctx
             .msg
             .channel_id
-            .send_message(ctx.serenity_context(), builder.to_prefix(ctx.msg.into()))
+            .send_message(ctx.http(), builder.to_prefix(ctx.msg.into()))
             .await?;
         // We don't check ctx.command.reuse_response because we need to store bot responses for
         // track_deletion too