diff --git a/src/commands/gestion/set.rs b/src/commands/gestion/set.rs index 34cebc7..13a8eea 100644 --- a/src/commands/gestion/set.rs +++ b/src/commands/gestion/set.rs @@ -20,13 +20,13 @@ async fn set_picture(slashcmd: &Set, ctx: &Context, cmd: &CommandInteraction, db _ => return Err(anyhow::anyhow!("Expected a subcommand")), }; - let url = inner_options - .iter() - .find(|opt| opt.name == "link") - .ok_or_else(|| anyhow::anyhow!("Option 'link' not found"))? - .value - .as_str() - .ok_or_else(|| anyhow::anyhow!("Option 'link' is not a string"))?; + let url: &str = inner_options + .iter() + .find(|opt| opt.name == "link") + .ok_or_else(|| anyhow::anyhow!("Option 'link' not found"))? + .value + .as_str() + .ok_or_else(|| anyhow::anyhow!("Option 'link' is not a string"))?; let attachment: CreateAttachment = CreateAttachment::url(&ctx.http, &url) .await?; @@ -85,7 +85,7 @@ impl SlashCommand for Set { _database: &PgPool, _emoji: &EmojiConfig, ) -> Result<()> { - debug!("Set command called"); + debug!("{} command called", self.name()); if !is_owner(_database, &command.user.id.to_string()).await? { let message: CreateInteractionResponseMessage = CreateInteractionResponseMessage::new() .content(format!("{} | This command is only for the owner", _emoji.answer.no)) diff --git a/src/commands/moderation/clear.rs b/src/commands/moderation/clear.rs index 1fadbfd..b9ce744 100644 --- a/src/commands/moderation/clear.rs +++ b/src/commands/moderation/clear.rs @@ -50,7 +50,7 @@ impl SlashCommand for Clear { _database: &PgPool, _emoji: &EmojiConfig, ) -> Result<()> { - debug!("Clear command called"); + debug!("{} command called", self.name()); let amount: u8 = command.data.options.iter().find(|opt | opt.kind() == CommandOptionType::Integer) .unwrap().value.as_i64().expect("REASON") as u8; let message: CreateInteractionResponseMessage = CreateInteractionResponseMessage::new() diff --git a/src/utils/format.rs b/src/utils/format.rs new file mode 100644 index 0000000..00ac718 --- /dev/null +++ b/src/utils/format.rs @@ -0,0 +1,6 @@ +pub fn format_sanction_reason(module_name:&str, reason: Option<&str>, executor: &str) -> String { + match reason { + Some(s) => format!("[TTY {}] {} by {}", module_name, s, executor), + None => format!("[TTY {}] by {}", module_name, executor) + } +}