rebase to serenity@next

Author: jamesbt365

Cargo.lock

@@ -12,14 +12,16 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
 
 # Discord API
-poise = "0.6"
-serenity = "0.12"
+serenity = { git = "https://github.com/serenity-rs/serenity", branch = "next" }
+poise = { git = "https://github.com/serenity-rs/poise", branch = "serenity-next" }
 tokio = { version = "1.29.1", features = ["macros", "signal", "rt-multi-thread"] }
 
 # Misc
-regex = "1.10.2"
-octocrab = "0.19.0"
-reqwest = "0.11.22"
+regex = "1.10"
 hex = "0.4.3"
-to-arraystring = "0.1.3"
+octocrab = "0.38"
+reqwest = "0.12"
+to-arraystring = "0.2"
 arrayvec = "0.7.4"
+futures = "0.3.30"
+aformat = "0.1.3"

Cargo.toml

@@ -6,7 +6,6 @@ pub(crate) const ACCENT_COLOUR: Colour = Colour(0x8957e5);
 pub(crate) const OK_COLOUR: Colour = Colour(0x2ecc71);
 pub(crate) const ERROR_COLOUR: Colour = Colour(0xe74c3c);
 
-use arrayvec::ArrayString;
 use to_arraystring::ToArrayString;
 
 use crate::{Context, Error};
@@ -25,7 +24,7 @@ pub async fn register(ctx: Context<'_>) -> Result<(), Error> {
     Ok(())
 }
 
-pub async fn respond_embed(ctx: &Context<'_>, embed: CreateEmbed, ephemeral: bool) {
+pub async fn respond_embed(ctx: &Context<'_>, embed: CreateEmbed<'_>, ephemeral: bool) {
     let builder = poise::CreateReply::default()
         .embed(embed)
         .ephemeral(ephemeral);
@@ -65,7 +64,7 @@ pub async fn interaction_err(ctx: &serenity::Context, press: &ComponentInteracti
             )
             .ephemeral(true),
     );
-    let _ = press.create_response(ctx, builder).await;
+    let _ = press.create_response(&ctx.http, builder).await;
 }
 
 enum Kind {
@@ -92,13 +91,8 @@ pub async fn paginate_lists(
 ) -> Result<(), Error> {
     let ctx_id = ctx.id().to_arraystring();
 
-    let mut prev_button_id = ArrayString::<24>::new();
-    prev_button_id.push_str(&ctx_id);
-    prev_button_id.push_str("prev");
-
-    let mut next_button_id = ArrayString::<24>::new();
-    next_button_id.push_str(&ctx_id);
-    next_button_id.push_str("next");
+    let prev_button_id = format!("{ctx_id}prev");
+    let next_button_id = format!("{ctx_id}next");
 
     let colour = Colour::TEAL;
 
@@ -135,10 +129,11 @@ pub async fn paginate_lists(
     let msg = ctx.send(reply).await?;
 
     if pages.len() > 1 {
-        while let Some(press) = ComponentInteractionCollector::new(ctx)
-            .filter(move |press| press.data.custom_id.starts_with(&ctx_id.to_string()))
-            .timeout(std::time::Duration::from_secs(180))
-            .await
+        while let Some(press) =
+            ComponentInteractionCollector::new(ctx.serenity_context().shard.clone())
+                .filter(move |press| press.data.custom_id.starts_with(ctx_id.as_str()))
+                .timeout(std::time::Duration::from_secs(180))
+                .await
         {
             match Kind::from_id(&press.data.custom_id, &ctx_id) {
                 Some(Kind::Next) => {
@@ -155,7 +150,7 @@ pub async fn paginate_lists(
 
             press
                 .create_response(
-                    ctx.serenity_context(),
+                    ctx.http(),
                     CreateInteractionResponse::UpdateMessage(
                         CreateInteractionResponseMessage::new().embed(
                             serenity::CreateEmbed::new()

src/commands/mod.rs

@@ -66,29 +66,29 @@ pub async fn create_snippet(
     #[description = "The snippet's title"] title: String,
     #[description = "The snippet's content"] content: String,
 ) -> Result<(), Error> {
+    let snippet = Snippet {
+        id: id.clone(),
+        title,
+        content: content.replace(r"\n", "\n"),
+    };
+
+    let mut embed = snippet.embed();
+    embed = embed.colour(super::OK_COLOUR);
+
     let embed = {
-        let mut rwlock_guard = ctx.data().state.write().unwrap();
+        let data = ctx.data();
+        let mut rwlock_guard = data.state.write().unwrap();
 
         if let Some(position) = rwlock_guard.snippets.iter().position(|s| s.id.eq(&id)) {
             rwlock_guard.snippets.remove(position);
         }
 
-        let snippet = Snippet {
-            id,
-            title,
-            content: content.replace(r"\n", "\n"),
-        };
-
         println!("New snippet created '{}: {}'", snippet.id, snippet.title);
 
-        let mut embed = snippet.embed();
-
-        embed = embed.colour(super::OK_COLOUR);
-
-        rwlock_guard.snippets.push(snippet);
+        rwlock_guard.snippets.push(snippet.clone());
         rwlock_guard.write();
 
-        embed
+        embed.clone()
     };
 
     respond_embed(&ctx, embed, false).await;
@@ -117,7 +117,8 @@ pub async fn edit_snippet(
             }
 
             {
-                let mut rwlock_guard = ctx.data().state.write().unwrap();
+                let data = ctx.data();
+                let mut rwlock_guard = data.state.write().unwrap();
                 rwlock_guard.snippets.push(snippet.clone());
                 println!("Snippet edited '{}: {}'", snippet.title, snippet.content);
                 rwlock_guard.write();
@@ -206,8 +207,10 @@ pub async fn export_snippet(
 ) -> Result<(), Error> {
     match get_snippet_lazy(&ctx, &id) {
         Some(snippet) => {
-            let attachment =
-                CreateAttachment::bytes(snippet.content.replace('\n', r"\n"), "snippet.txt");
+            let attachment = CreateAttachment::bytes(
+                snippet.content.replace('\n', r"\n").into_bytes(),
+                "snippet.txt",
+            );
             let message = poise::CreateReply::default()
                 .attachment(attachment)
                 .embed(snippet.embed());
@@ -224,7 +227,7 @@ pub async fn export_snippet(
 }
 
 impl Embeddable for Snippet {
-    fn embed(&self) -> CreateEmbed {
+    fn embed(&self) -> CreateEmbed<'_> {
         CreateEmbed::default()
             .title(&self.title)
             .description(&self.content)
@@ -297,10 +300,11 @@ async fn remove_snippet_confirm(ctx: &Context<'_>, snippet: &Snippet) -> Result<
 
     ctx.send(builder).await?;
 
-    while let Some(press) = serenity::ComponentInteractionCollector::new(ctx)
-        .filter(move |press| press.data.custom_id.starts_with(&ctx_id.to_string()))
-        .timeout(std::time::Duration::from_secs(60))
-        .await
+    while let Some(press) =
+        serenity::ComponentInteractionCollector::new(ctx.serenity_context().shard.clone())
+            .filter(move |press| press.data.custom_id.starts_with(&ctx_id.to_string()))
+            .timeout(std::time::Duration::from_secs(60))
+            .await
     {
         if press.data.custom_id == delete_id {
             handle_delete(ctx, snippet, press).await?;
@@ -320,7 +324,7 @@ async fn handle_delete(
     rm_snippet(ctx, snippet);
     interaction
         .create_response(
-            ctx,
+            ctx.http(),
             CreateInteractionResponse::UpdateMessage(
                 CreateInteractionResponseMessage::new()
                     .content("Deleted!")
@@ -343,7 +347,7 @@ async fn handle_cancel(
 ) -> Result<(), Error> {
     interaction
         .create_response(
-            ctx,
+            ctx.http(),
             CreateInteractionResponse::UpdateMessage(
                 CreateInteractionResponseMessage::new()
                     .content("Aborted.")

src/commands/snippets.rs

@@ -163,15 +163,15 @@ pub async fn edit_embed(
                     embedb = embedb.title(title);
                 }
             } else if let Some(t) = &embed.title {
-                embedb = embedb.title(t);
+                embedb = embedb.title(t.as_str());
             }
 
             if let Some(description) = description {
                 if description != "_" {
                     embedb = embedb.description(description);
                 }
             } else if let Some(d) = &embed.description {
-                embedb = embedb.description(d);
+                embedb = embedb.description(d.as_str());
             }
 
             if let Some(color) = color {
@@ -200,7 +200,7 @@ pub async fn edit_embed(
                     embedb = embedb.url(url);
                 }
             } else if let Some(u) = &embed.url {
-                embedb = embedb.url(u);
+                embedb = embedb.url(u.as_str());
             }
 
             if let Some(image) = image {
@@ -293,7 +293,9 @@ pub async fn add_repo(
     }
 
     {
-        let mut rwlock_guard = { ctx.data().state.write().unwrap() };
+        let data = ctx.data();
+        let mut rwlock_guard = data.state.write().unwrap();
+
         let details = RepositoryDetails {
             owner: owner.clone(),
             name: repository.clone(),
@@ -302,6 +304,7 @@ pub async fn add_repo(
         rwlock_guard
             .issue_prefixes
             .insert(key.clone().to_lowercase(), details);
+
         println!(
             "Successfully added repository {} for **{}/{}**",
             key.to_lowercase(),

src/commands/utils.rs

@@ -1,36 +1,50 @@
+use futures::future::join_all;
 use regex::{Match, Regex};
 use std::str::FromStr;
 use std::{path::Path, sync::OnceLock};
 
-use poise::serenity_prelude::{self as serenity, Colour, Context, CreateEmbed, Message};
+use poise::serenity_prelude::{self as serenity, Colour, CreateEmbed, Http, Message};
+use std::sync::Arc;
 
 use crate::formatting::trim_indent;
 
+use crate::FrameworkContext;
+
 // A shade of purple.
 const ACCENT_COLOUR: Colour = Colour::new(0x8957e5);
 
-pub async fn message(ctx: &Context, message: &Message) {
-    if let Some(embeds) = get_embeds(ctx, message).await {
-        let typing = message.channel_id.start_typing(&ctx.http);
+pub async fn message(framework: FrameworkContext<'_>, message: &Message) {
+    let http = &framework.serenity_context.http.clone();
 
-        let content = serenity::CreateMessage::default()
-            .embeds(embeds)
-            .reference_message(message);
-        let _ = message.channel_id.send_message(ctx, content).await;
+    let Some(file_refs) = get_file_refs(http.clone(), message) else {
+        return;
+    };
 
-        typing.stop();
-    }
+    // This is just cursed. I have no other way to explain this but its the only way I can figure
+    // out how to satisfy the lifetimes.
+    let embeds = join_all(file_refs.iter().map(FileReference::create_embed))
+        .await
+        .into_iter()
+        .flatten()
+        .collect::<Vec<_>>();
+
+    let typing = message.channel_id.start_typing(http.clone());
+
+    let content = serenity::CreateMessage::default()
+        .embeds(embeds)
+        .reference_message(message);
+    let _ = message.channel_id.send_message(http, content).await;
+
+    typing.stop();
 }
 
-async fn get_embeds(ctx: &Context, message: &Message) -> Option<Vec<CreateEmbed>> {
-    let typing = message.channel_id.start_typing(&ctx.http);
-    let mut embeds: Vec<CreateEmbed> = vec![];
+fn get_file_refs(http: Arc<Http>, message: &Message) -> Option<Vec<FileReference<'_>>> {
+    let typing = message.channel_id.start_typing(http);
+    let mut embeds = vec![];
 
     if let Some(refs) = FileReference::try_from_str(&message.content) {
         for file_ref in refs {
-            if let Some(embed) = file_ref.create_embed().await {
-                embeds.push(embed);
-            }
+            embeds.push(file_ref);
         }
     }