Allow failed requests to be re-submitted

p0rtL6 · Mar 18, 2024 · 7db0f6a · 7db0f6a
1 parent 7727025
commit 7db0f6a
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "blackcube-rs"
-version = "0.2.4"
+version = "0.2.5"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/src/main.rs b/src/main.rs
@@ -30,7 +30,7 @@ use serenity::{
     prelude::GatewayIntents,
 };
 
-use crate::{responses::delete_user_request, structs::HttpClient};
+use crate::{responses::send_ephemeral_interaction_followup_reply, structs::HttpClient};
 struct Handler;
 
 #[async_trait]
@@ -117,29 +117,57 @@ impl EventHandler for Handler {
 
                         match embed {
                             Some(embed) => {
-                                let delete_result = delete_user_request(&ctx, embed).await;
+                                let embed = embed.clone();
 
-                                match delete_result {
-                                    Ok(()) => {}
-                                    Err(err) => {
-                                        println!("error deleting user request: {}", err);
+                                let thumbnail;
+
+                                match &embed.thumbnail {
+                                    Some(embed_thumbnail) => {
+                                        thumbnail = Some(embed_thumbnail.url.as_str());
+                                    }
+                                    None => {
+                                        thumbnail = None;
+                                    }
+                                }
+
+                                let url;
+
+                                match &embed.url {
+                                    Some(embed_url) => {
+                                        url = Some(embed_url.as_str());
+                                    }
+                                    None => {
+                                        url = None;
                                     }
                                 }
+
+                                let result = edit_request(
+                                    &ctx,
+                                    &mut component_interaction.message,
+                                    "Request Pending",
+                                    thumbnail,
+                                    url,
+                                    true,
+                                )
+                                .await;
+                                if result.is_err() {
+                                    println!("{:?}", result);
+                                }
                             }
                             None => {}
                         }
 
-                        let result = edit_request(
+                        let result = send_ephemeral_interaction_followup_reply(
                             &ctx,
-                            &mut component_interaction.message,
-                            "Failed",
-                            None,
-                            None,
-                            false,
+                            component_interaction,
+                            "Failed to accept request",
                         )
                         .await;
-                        if result.is_err() {
-                            println!("{:?}", result);
+                        match result {
+                            Ok(()) => {}
+                            Err(err) => {
+                                println!("{}", err);
+                            }
                         }
                     }
                 });

diff --git a/src/responses.rs b/src/responses.rs
@@ -1,9 +1,10 @@
 use anyhow::Context as AnyhowContext;
 use serenity::{
-    all::{ButtonStyle, Embed, InteractionResponseFlags, MessageId, UserId},
+    all::{ButtonStyle, Embed, InteractionResponseFlags, MessageFlags, MessageId, UserId},
     builder::{
         CreateActionRow, CreateButton, CreateEmbed, CreateInteractionResponse,
-        CreateInteractionResponseMessage, CreateMessage, EditMessage,
+        CreateInteractionResponseFollowup, CreateInteractionResponseMessage, CreateMessage,
+        EditMessage,
     },
     client::Context,
     model::{application::ComponentInteraction, channel::Message},
@@ -88,6 +89,23 @@ pub async fn send_ephemeral_interaction_reply(
     Ok(())
 }
 
+pub async fn send_ephemeral_interaction_followup_reply(
+    ctx: &Context,
+    component_interaction: ComponentInteraction,
+    message: &str,
+) -> anyhow::Result<()> {
+    component_interaction
+        .create_followup(
+            &ctx.http,
+            CreateInteractionResponseFollowup::new()
+                .content(message)
+                .flags(MessageFlags::EPHEMERAL),
+        )
+        .await
+        .context("could not create ephemeral response")?;
+    Ok(())
+}
+
 pub async fn send_command_reply(
     msg: Message,
     ctx: Context,