Skip to content

Commit 47a26bd

Browse files
NotNoromGnomedDev
andcommitted
Fix breakage caused by CacheHttp -> Http
* Use Http instead of CacheHttp * Fix examples compiling * Update MSRV lockfile --------- Co-authored-by: GnomedDev <david2005thomas@gmail.com>
1 parent a72b980 commit 47a26bd

File tree

9 files changed

+553
-697
lines changed

9 files changed

+553
-697
lines changed

.github/Cargo-msrv.lock

Lines changed: 290 additions & 355 deletions
Large diffs are not rendered by default.

Cargo.lock

Lines changed: 249 additions & 331 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/event_handler/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ async fn event_handler(
5656
let old_mentions = data.poise_mentions.fetch_add(1, Ordering::SeqCst);
5757
new_message
5858
.reply(
59-
ctx,
59+
&ctx.http,
6060
format!("Poise has been mentioned {} times", old_mentions + 1),
6161
)
6262
.await?;

examples/feature_showcase/checks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub async fn delete(
4040
#[description = "Message to be deleted"] msg: serenity::Message,
4141
reason: Option<String>,
4242
) -> Result<(), Error> {
43-
msg.delete(ctx, reason.as_deref()).await?;
43+
msg.delete(ctx.http(), reason.as_deref()).await?;
4444
Ok(())
4545
}
4646

examples/help_generation/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ async fn food_react(
239239
let reaction = FOOD[rand::thread_rng().gen_range(0..FOOD.len())];
240240
let reaction = serenity::ReactionType::Unicode(FixedString::from_str_trunc(reaction));
241241

242-
msg.react(ctx, reaction).await?;
242+
msg.react(ctx.http(), reaction).await?;
243243
ctx.say("Reacted!").await?;
244244
Ok(())
245245
}
@@ -262,7 +262,7 @@ async fn fruit_react(
262262
let reaction = FRUIT[rand::thread_rng().gen_range(0..FRUIT.len())];
263263
let reaction = serenity::ReactionType::Unicode(FixedString::from_str_trunc(reaction));
264264

265-
msg.react(ctx, reaction).await?;
265+
msg.react(ctx.http(), reaction).await?;
266266
ctx.say("Reacted!").await?;
267267
Ok(())
268268
}
@@ -281,7 +281,7 @@ async fn vegetable_react(
281281
let reaction = VEGETABLES[rand::thread_rng().gen_range(0..VEGETABLES.len())];
282282
let reaction = serenity::ReactionType::Unicode(FixedString::from_str_trunc(reaction));
283283

284-
msg.react(ctx, reaction).await?;
284+
msg.react(ctx.http(), reaction).await?;
285285
ctx.say("Reacted!").await?;
286286
Ok(())
287287
}

examples/manual_dispatch/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ struct Handler {
2020
}
2121
#[serenity::async_trait]
2222
impl serenity::EventHandler for Handler {
23-
async fn message(&self, serenity_context: &serenity::Context, new_message: &serenity::Message) {
23+
async fn message(&self, serenity_context: serenity::Context, new_message: serenity::Message) {
2424
// FrameworkContext contains all data that poise::Framework usually manages
2525
let shard_manager = (*self.shard_manager.lock().unwrap()).clone().unwrap();
2626
let framework_data = poise::FrameworkContext {
27-
serenity_context,
27+
serenity_context: &serenity_context,
2828
options: &self.options,
2929
shard_manager: &shard_manager,
3030
};
@@ -35,7 +35,7 @@ impl serenity::EventHandler for Handler {
3535

3636
let res = poise::dispatch_message(
3737
framework_data,
38-
new_message,
38+
&new_message,
3939
trigger,
4040
&invocation_data,
4141
&mut parent_commands,

src/dispatch/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,10 @@ pub async fn dispatch_event<U: Send + Sync + 'static, E>(
125125
.unwrap()
126126
.process_message_delete(*deleted_message_id);
127127
if let Some(bot_response) = bot_response {
128-
if let Err(e) = bot_response.delete(framework.serenity_context, None).await {
128+
if let Err(e) = bot_response
129+
.delete(&framework.serenity_context.http, None)
130+
.await
131+
{
129132
tracing::warn!("failed to delete bot response: {}", e);
130133
}
131134
}

src/reply/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ impl ReplyHandle<'_> {
144144
ctx: crate::Context<'_, U, E>,
145145
) -> Result<(), serenity::Error> {
146146
match &self.0 {
147-
ReplyHandleInner::Prefix(msg) => msg.delete(ctx.serenity_context(), None).await?,
147+
ReplyHandleInner::Prefix(msg) => msg.delete(ctx.http(), None).await?,
148148
ReplyHandleInner::Application {
149149
http: _,
150150
interaction,

src/reply/send_reply.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ pub async fn send_prefix_reply<'a, U: Send + Sync + 'static, E>(
154154
let new_response = ctx
155155
.msg
156156
.channel_id
157-
.send_message(ctx.serenity_context(), builder.to_prefix(ctx.msg.into()))
157+
.send_message(ctx.http(), builder.to_prefix(ctx.msg.into()))
158158
.await?;
159159
// We don't check ctx.command.reuse_response because we need to store bot responses for
160160
// track_deletion too

0 commit comments

Comments
 (0)