diff --git a/src/discord/admin.rs b/src/discord/admin.rs index 1764c27..570c497 100644 --- a/src/discord/admin.rs +++ b/src/discord/admin.rs @@ -8,7 +8,6 @@ use serenity::model::channel::Message; pub struct ADMIN; #[command] -#[owners_only] #[only_in(guilds)] async fn reload(ctx: &Context, msg: &Message, _args: Args) -> CommandResult { let mut data = ctx.data.write().await; diff --git a/src/discord/emoji_race.rs b/src/discord/emoji_race.rs index 53f2b7e..401df31 100644 --- a/src/discord/emoji_race.rs +++ b/src/discord/emoji_race.rs @@ -345,9 +345,23 @@ async fn bet(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult { msg.reply(&ctx.http, "Race not in progress").await?; } - let racer = args.parse::()?; + let racer = match args.parse::() { + Ok(emoji) => emoji, + Err(e) => { + msg.reply(&ctx.http, format!("Invalid emoji: {}", e)) + .await?; + return Ok(()); + } + }; args.advance(); - let amount = args.parse::()?; + let amount = match args.parse::() { + Ok(amount) => amount, + Err(err) => { + msg.reply(&ctx.http, format!("Invalid bet amount: {}", err)) + .await?; + return Ok(()); + } + }; let send = race_msg_channel.send.lock().await; diff --git a/src/discord/fren_coin.rs b/src/discord/fren_coin.rs index 5cf50c2..f806f33 100644 --- a/src/discord/fren_coin.rs +++ b/src/discord/fren_coin.rs @@ -60,7 +60,14 @@ async fn gift(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult { args.advance(); - let amount = args.parse::()?; + let amount = match args.parse::() { + Ok(amount) => amount, + Err(err) => { + msg.reply(&ctx.http, format!("Invalid coin amount: {}", err)) + .await?; + return Ok(()); + } + }; let mut data = ctx.data.write().await; let global_data = data.get_mut::().unwrap(); diff --git a/src/discord/motivate.rs b/src/discord/motivate.rs index 1247e82..842ecbe 100644 --- a/src/discord/motivate.rs +++ b/src/discord/motivate.rs @@ -83,7 +83,7 @@ async fn motivation(ctx: &Context, msg: &Message, _args: Args) -> CommandResult let mut text_color_wand = PixelWand::new(); text_color_wand.set_color("white")?; text_wand.set_fill_color(&text_color_wand); - text_wand.set_font_size(0.07*(wand.get_image_width() as f64)); + text_wand.set_font_size(0.07 * (wand.get_image_width() as f64)); text_wand.set_text_alignment(magick_rust::bindings::AlignType_CenterAlign); wand.annotate_image(&text_wand, text_pos_x, text_pos_y, 0.0, &motivation)?; wand.write_image_blob("png")?