Merge branch 'master' into perf

Author: jamesbt365

src/commands/snippets.rs

@@ -292,7 +292,10 @@ async fn remove_snippet_confirm(ctx: &Context<'_>, snippet: &Snippet) -> Result<
     ]);
 
     let builder: poise::CreateReply = poise::CreateReply::default()
-        .content(format!("Are you sure you want to delete snippet `{}`?", snippet.id))
+        .content(format!(
+            "Are you sure you want to delete snippet `{}`?",
+            snippet.id
+        ))
         .ephemeral(true)
         .embed(snippet_embed)
         .components(vec![components]);
@@ -319,22 +322,22 @@ async fn handle_delete(
     snippet: &Snippet,
     interaction: serenity::ComponentInteraction,
 ) -> Result<(), Error> {
-
     rm_snippet(ctx, snippet).await;
     interaction
         .create_response(
             ctx,
             CreateInteractionResponse::UpdateMessage(
-                CreateInteractionResponseMessage::new().content("Deleted!")
+                CreateInteractionResponseMessage::new()
+                    .content("Deleted!")
                     .embeds(vec![])
                     .components(vec![]),
             ),
         )
         .await?;
 
-        let title = format!("{} removed a snippet", ctx.author().tag());
-        let content = &&format!("Removed snippet `{}`", snippet.format_output());
-        respond_ok(ctx, &title, content).await;
+    let title = format!("{} removed a snippet", ctx.author().tag());
+    let content = &&format!("Removed snippet `{}`", snippet.format_output());
+    respond_ok(ctx, &title, content).await;
 
     Ok(())
 }

src/events/issue.rs

@@ -49,65 +49,63 @@ pub async fn message(data: &Data, ctx: &Context, message: &Message) {
             .timeout(Duration::from_secs(60))
             .await
         {
-            // Safe to unwap member because this only runs in guilds.
-            // The only way this could go wrong if cache isn't ready? (fresh bot restart)
             let has_perms = press.member.as_ref().map_or(false, |member| {
                 member.permissions.map_or(false, |member_perms| {
                     member_perms.contains(Permissions::MANAGE_MESSAGES)
                 })
             });
 
-            if press.data.custom_id == remove_id
-                && (press.user.id == message.author.id || has_perms)
-            {
-                let _ = press
-                    .create_response(ctx, CreateInteractionResponse::Acknowledge)
+            if press.data.custom_id == remove_id {
+                if press.user.id == message.author.id || has_perms {
+                    let _ = press
+                        .create_response(ctx, CreateInteractionResponse::Acknowledge)
+                        .await;
+                    if let Ok(ref msg) = msg_result {
+                        let _ = msg.delete(ctx).await;
+                    }
+                    msg_deleted = true;
+                } else {
+                    interaction_err(
+                        ctx,
+                        &press,
+                        "Unable to use interaction because you are missing `MANAGE_MESSAGES`.",
+                    )
                     .await;
-                if let Ok(ref msg) = msg_result {
-                    let _ = msg.delete(ctx).await;
                 }
-                msg_deleted = true;
-            } else {
-                interaction_err(
-                    ctx,
-                    &press,
-                    "Unable to use interaction because you are missing `MANAGE_MESSAGES`.",
-                )
-                .await;
             }
 
-            if press.data.custom_id == hide_body_id
-                && (press.user.id == message.author.id || has_perms)
-            {
-                if !body_hid {
-                    let mut hid_body_embeds: Vec<CreateEmbed> = Vec::new();
-                    if let Ok(ref msg) = msg_result {
-                        for mut embed in msg.embeds.clone() {
-                            embed.description = None;
-                            let embed: CreateEmbed = embed.clone().into();
-                            hid_body_embeds.push(embed);
+            if press.data.custom_id == hide_body_id {
+                if press.user.id == message.author.id || has_perms {
+                    if !body_hid {
+                        let mut hid_body_embeds: Vec<CreateEmbed> = Vec::new();
+                        if let Ok(ref msg) = msg_result {
+                            for mut embed in msg.embeds.clone() {
+                                embed.description = None;
+                                let embed: CreateEmbed = embed.clone().into();
+                                hid_body_embeds.push(embed);
+                            }
                         }
-                    }
 
-                    let _ = press
-                        .create_response(
-                            ctx,
-                            serenity::CreateInteractionResponse::UpdateMessage(
-                                serenity::CreateInteractionResponseMessage::new()
-                                    .embeds(hid_body_embeds)
-                                    .components(vec![remove.clone()]),
-                            ),
-                        )
-                        .await;
+                        let _ = press
+                            .create_response(
+                                ctx,
+                                serenity::CreateInteractionResponse::UpdateMessage(
+                                    serenity::CreateInteractionResponseMessage::new()
+                                        .embeds(hid_body_embeds)
+                                        .components(vec![remove.clone()]),
+                                ),
+                            )
+                            .await;
+                    }
+                    body_hid = true;
+                } else {
+                    interaction_err(
+                        ctx,
+                        &press,
+                        "Unable to use interaction because you are missing `MANAGE_MESSAGES`.",
+                    )
+                    .await;
                 }
-                body_hid = true;
-            } else {
-                interaction_err(
-                    ctx,
-                    &press,
-                    "Unable to use interaction because you are missing `MANAGE_MESSAGES`.",
-                )
-                .await;
             }
         }
         // Triggers on timeout.