Clean up define command

src/commands/define.rs

@@ -1,5 +1,5 @@
 use serenity::{
-    framework::standard::{macros::command, Args, CommandResult},
+    framework::standard::{macros::command, Args, CommandError, CommandResult},
     model::channel::Message,
     prelude::*,
 };
@@ -8,16 +8,18 @@ use serenity::{
 #[command]
 #[aliases("what's this")]
 async fn define(ctx: &Context, message: &Message, args: Args) -> CommandResult {
-    let text: String = args.rest().trim().to_string();
+    if args.is_empty() {
-    let defs = &urbandict::get_definitions(&text);
+        return Err("No arguments!".into());
-    if !args.is_empty() {
-        match defs {
-            Err(_e) => {
-                return Err("Invalid query >w<".into());
     }
-            Ok(v) => {
+
-                if !v.is_empty() {
+    let text: String = args.rest().trim().to_string();
-                    let def = &v[0];
+    let defs =
+        urbandict::get_definitions(&text).map_err(|_| CommandError::from("Invalid query >w<"))?;
+
+    let def = defs
+        .first()
+        .ok_or_else(|| CommandError::from("No results!"))?;
+
     let _ = message
         .channel_id
         .send_message(&ctx.http, |m| {
@@ -32,12 +34,6 @@ async fn define(ctx: &Context, message: &Message, args: Args) -> CommandResult {
             })
         })
         .await;
-                } else {
-                    return Err("No results!".into());
-                }
-            }
-        }
-    }
 
     Ok(())
 }