update ( i think)�

Cargo.toml

@@ -15,6 +15,7 @@ mongodb = { version = "2.4.0", features = ["bson-chrono-0_4"] }
 once_cell = "1.17.1"
 orderless = "0.1.5"
 poise = { git = "https://github.com/serenity-rs/poise", branch = "serenity-next" }
+proc-macro2 = "1.0.67"
 rand = "0.8.5"
 rust-s3 = "0.33.0"
 secrecy = "0.8.0"

src/commands/delete.rs

@@ -2,7 +2,7 @@ use std::num::NonZeroU64;
 
 use anyhow::{Context, Result};
 use mongodb::bson::doc;
-use poise::serenity_prelude::{CacheHttp, MessageId};
+use poise::serenity_prelude::MessageId;
 
 use super::{autocomplete::mate as mate_autocomplete, CommandContext};
 use crate::{

src/commands/edit.rs

@@ -2,7 +2,7 @@ use std::num::NonZeroU64;
 
 use anyhow::{Context, Result};
 use mongodb::bson::doc;
-use poise::serenity_prelude::{self as serenity, CacheHttp, EditWebhookMessage, MessageId};
+use poise::serenity_prelude::{self as serenity, EditWebhookMessage, MessageId};
 
 use super::{autocomplete::mate as mate_autocomplete, CommandContext};
 use crate::{

src/commands/info.rs

@@ -5,7 +5,7 @@ use mongodb::bson::doc;
 use poise::{
     serenity_prelude::{
         self as serenity, collector::ComponentInteractionCollector, futures::stream::StreamExt,
-        CacheHttp, CreateActionRow, CreateButton, CreateEmbed, CreateInteractionResponse,
+        CreateActionRow, CreateButton, CreateEmbed, CreateInteractionResponse,
         CreateInteractionResponseMessage, UserId,
     },
     CreateReply,
@@ -134,7 +134,7 @@ pub async fn info(
                 return Ok(());
             }
 
-            let mut collector = ComponentInteractionCollector::new(&ctx.discord().shard)
+            let mut collector = ComponentInteractionCollector::new(&ctx.serenity_context().shard)
                 .timeout(Duration::from_secs(300))
                 .filter(move |press| press.data.custom_id.starts_with(&ctx_id.to_string()))
                 .stream();
@@ -152,7 +152,7 @@ pub async fn info(
 
                 press
                     .create_response(
-                        ctx.cache_and_http(),
+                        ctx,
                         CreateInteractionResponse::UpdateMessage(
                             CreateInteractionResponseMessage::new().embed(
                                 final_embed.clone().field(

src/commands/misc.rs

@@ -1,10 +1,7 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
 use chrono::Utc;
 use mongodb::bson::doc;
-use poise::{
-    serenity_prelude::{CacheHttp, CreateEmbed},
-    CreateReply,
-};
+use poise::{serenity_prelude::CreateEmbed, CreateReply};
 
 use super::CommandContext;
 use crate::{models::DBMate, utils::misc::envvar};
@@ -15,9 +12,7 @@ pub async fn stats(ctx: CommandContext<'_>) -> Result<()> {
     let database = &ctx.data().database;
     let mates_collection = database.collection::<DBMate>("mates");
 
-    let cache = ctx
-        .cache()
-        .context("Failed to get bot cache; try again later!")?;
+    let cache = ctx.cache();
 
     let user_count = mates_collection
         .distinct("user_id", None, None)

src/main.rs

@@ -73,7 +73,7 @@ async fn main() {
             commands::admin::admin(),
             commands::switch_logs::switch_logs(),
         ],
-        listener: |event, _framework, data| {
+        event_handler: |event, _framework, data| {
             Box::pin(async move {
                 match event {
                     FullEvent::Ready {

src/utils/user_settings.rs

@@ -3,10 +3,7 @@ use mongodb::{
     bson::{self, doc},
     Collection,
 };
-use poise::{
-    futures_util::TryStreamExt,
-    serenity_prelude::{Message, UserId},
-};
+use poise::serenity_prelude::{Message, UserId};
 
 use crate::models::{AutoproxySettings, DBUserSettings, Latch};