From cc25f78970a4694087968d3d4ffde80b9cef81f1 Mon Sep 17 00:00:00 2001 From: Agatha Date: Thu, 9 Apr 2020 21:40:00 +0300 Subject: [PATCH] Add empty args handling for urbandict lookup, bump version --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/main.rs | 39 +++++++++++++++++++++------------------ 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 584f4a1..6fe4bb8 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "rustcord" -version = "0.3.2" +version = "0.3.4" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "owoify 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index fd45afa..5a172c2 100755 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rustcord" -version = "0.3.2" +version = "0.3.4" authors = ["Agatha <@protonmail.com>"] edition = "2018" diff --git a/src/main.rs b/src/main.rs index 9d7db2d..06791e2 100755 --- a/src/main.rs +++ b/src/main.rs @@ -542,24 +542,27 @@ fn compare_bot(ctx: &mut Context, message: &Message, mut args: Args) -> CommandR fn what(ctx: &mut Context, message: &Message, args: Args) -> CommandResult { let text: String = args.rest().trim().to_string(); let defs = &urbandict::get_definitions(&text); - match defs { - Err(_e) => { - let _ = message.channel_id.say(&ctx.http, "Invalid query >w<"); - } - Ok(v) => { - if !v.is_empty() { - let def = &v[0]; - let _ = message.channel_id.send_message(&ctx.http, |m| { - m.embed(|e| { - e.title(format!("Author: {}", def.author)).field( - "Definition: ", - def.definition.replace(|c| c == '[' || c == ']', ""), - false, - ) - }) - }); - } else { - println!("No resuwults"); + if !args.is_empty() { + match defs { + Err(_e) => { + let _ = message.channel_id.say(&ctx.http, "Invalid query >w<"); + } + Ok(v) => { + if !v.is_empty() { + let def = &v[0]; + let _ = message.channel_id.send_message(&ctx.http, |m| { + m.embed(|e| { + e.title(format!("Query: {}, Author: {}", text, def.author)) + .field( + "Definition: ", + def.definition.replace(|c| c == '[' || c == ']', ""), + false, + ) + }) + }); + } else { + let _ = message.channel_id.say(&ctx.http, "No results!"); + } } } }