Merge pull request 'beeeeg refactor :3' (#1) from videogame-hacker/rustcord:patch/cleanup-match-statements into master

Reviewed-on: #1

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(())
 }

src/commands/lyrics.rs

@@ -1,7 +1,7 @@
 use percent_encoding::{percent_encode, NON_ALPHANUMERIC};
 use serde::Deserialize;
 use serenity::{
-    framework::standard::{macros::command, Args, CommandResult},
+    framework::standard::{macros::command, Args, CommandError, CommandResult},
     model::channel::Message,
     prelude::*,
 };
@@ -24,24 +24,19 @@ async fn lyrics(ctx: &Context, message: &Message, args: Args) -> CommandResult {
     // TODO: use https://orion.apiseeds.com/api/music/lyric/:artist/:track instead
     let mut url = String::from("https://mourits.xyz:2096/?q=");
     // check if input is not empty
-    let input = match args.rest().trim() {
+    let input = args.rest().trim();
-        "" => {
+    if input.is_empty() {
         return Err("Called without input!".into());
     }
-        v => v,
-    };
     // encode into url
     url += &s!(percent_encode(input.as_bytes(), NON_ALPHANUMERIC));
 
-    let request = match reqwest::get(&url).await {
+    let request = reqwest::get(&url).await?;
-        Ok(v) => v,
-        Err(e) => return Err(e.into()),
-    };
 
-    let resp: Response = match request.json().await {
+    let resp: Response = request
-        Ok(v) => v,
+        .json()
-        Err(_) => return Err("Could not find lyrics".into()),
+        .await
-    };
+        .map_err(|_| CommandError::from("Could not find lyrics"))?;
     let _ = message
         .channel_id
         .send_message(&ctx.http, |m| {

src/commands/pinned.rs

@@ -1,5 +1,5 @@
 use serenity::{
-    framework::standard::{macros::command, Args, CommandResult},
+    framework::standard::{macros::command, Args, CommandError, CommandResult},
     model::{channel::Message, id::ChannelId},
     prelude::*,
 };
@@ -19,12 +19,10 @@ async fn pinned(ctx: &Context, message: &Message, mut args: Args) -> CommandResu
         Ok(v) => v,
         Err(_) => message.channel_id,
     };
-    let pinned = match target_channel.pins(&ctx.http).await {
+    let pinned = target_channel
-        Ok(v) => v,
+        .pins(&ctx.http)
-        Err(e) => {
+        .await
-            return Err(format!("Could not get pinned messages! Error: {}", e).into());
+        .map_err(|e| CommandError::from(format!("Could not get pinned messages! Error: {}", e)))?;
-        }
-    };
     if pinned.is_empty() {
         return Err("No pinned messages found!".into());
     }

src/commands/spoile.rs

@@ -1,6 +1,6 @@
 use serenity::{
     builder::CreateMessage,
-    framework::standard::{macros::command, Args, CommandResult},
+    framework::standard::{macros::command, Args, CommandError, CommandResult},
     http::AttachmentType,
     model::channel::Message,
     prelude::*,
@@ -10,11 +10,11 @@ use serenity::{
 #[command]
 async fn spoiler(ctx: &Context, message: &Message, args: Args) -> CommandResult {
     // check if the message has any attachments
-    let attachments = match message.attachments.is_empty() {
+
-        true => {
+    let attachments = if message.attachments.is_empty() {
         return Err("No images were attached!".into());
-        }
+    } else {
-        false => &message.attachments,
+        &message.attachments
     };
 
     // get the author's nick in the server, otherwise default to global username later
@@ -42,10 +42,10 @@ async fn spoiler(ctx: &Context, message: &Message, args: Args) -> CommandResult
 
     for a in attachments {
         // download each attachment
-        let content = match a.download().await {
+        let content = a
-            Ok(content) => content,
+            .download()
-            Err(_) => return Err("Error downloading attachment".into()),
+            .await
-        };
+            .map_err(|_| CommandError::from("Error downloading attachment"))?;
 
         let content: &[u8] = content.as_slice();
 

src/main.rs

@@ -14,7 +14,8 @@ use serenity::{
     },
     framework::standard::{
         macros::{check, command, group, hook},
-        Args, CommandOptions, CommandResult, DispatchError, Reason, StandardFramework,
+        Args, CommandError, CommandOptions, CommandResult, DispatchError, Reason,
+        StandardFramework,
     },
     model::{
         channel::{Message, ReactionType},
@@ -91,9 +92,7 @@ async fn dispatch_error(ctx: &Context, msg: &Message, error: DispatchError) {
 #[hook]
 async fn after(ctx: &Context, msg: &Message, command_name: &str, command_result: CommandResult) {
     // prints error in chat
-    match command_result {
+    if let Err(why) = command_result {
-        Ok(()) => (),
-        Err(why) => {
         let _ = msg
             .channel_id
             .send_message(&ctx.http, |m| {
@@ -116,7 +115,6 @@ async fn after(ctx: &Context, msg: &Message, command_name: &str, command_result:
         );
     }
 }
-}
 
 #[group]
 #[commands(
@@ -209,23 +207,21 @@ async fn ping(ctx: &Context, message: &Message) -> CommandResult {
     // I have no idea if this works but its 5æm and I need to sleep help
     let data = ctx.data.read().await;
 
-    let shard_manager = match data.get::<ShardManagerContainer>() {
+    let shard_manager = data
-        Some(v) => v,
+        .get::<ShardManagerContainer>()
-        None => return Err("There was a problem getting the shard manager!".into()),
+        .ok_or_else(|| CommandError::from("There was a problem getting the shard manager!"))?;
-    };
 
     let manager = shard_manager.lock().await;
     let runners = manager.runners.lock().await;
 
-    let runner = match runners.get(&ShardId(ctx.shard_id)) {
+    let runner = runners
-        Some(v) => v,
+        .get(&ShardId(ctx.shard_id))
-        None => return Err("No shard found!".into()),
+        .ok_or_else(|| CommandError::from("No shard found!"))?;
-    };
 
-    let ping = match runner.latency {
+    let ping = runner
-        Some(v) => v.as_millis(),
+        .latency
-        None => return Err("Could not get latency!".into()),
+        .ok_or_else(|| CommandError::from("Could not get latency!"))?
-    };
+        .as_millis();
 
     let _ = message
         .channel_id
@@ -347,14 +343,12 @@ async fn bottom_rng(ctx: &Context, message: &Message, mut args: Args) -> Command
 
     // get N last messages, otherwise 10
     let num = args.single::<u64>().unwrap_or(10);
-    let messages = message
+    let mut messages = message
         .channel_id
         .messages(&ctx.http, |get| get.before(message.id).limit(num))
-        .await;
+        .await
-    if let Err(e) = messages {
+        .map_err(|e| CommandError::from(format!("Error: {}", e)))?;
-        return Err(format!("Error: {}", e).into());
+
-    } else {
-        let mut messages = messages?;
     // remove all messages by other users
     messages.retain(|v| v.author != message.mentions[0]);
     let mut input = String::new();
@@ -372,7 +366,6 @@ async fn bottom_rng(ctx: &Context, message: &Message, mut args: Args) -> Command
             })
         })
         .await;
-    }
 
     Ok(())
 }
@@ -392,7 +385,7 @@ async fn headpat(ctx: &Context, message: &Message, args: Args) -> CommandResult
         _ => message.mentions[0].name.as_str(),
     };
 
-    if let Err(e) = message
+    message
         .channel_id
         .send_message(&ctx.http, |m| {
             m.embed(|e| {
@@ -403,10 +396,7 @@ async fn headpat(ctx: &Context, message: &Message, args: Args) -> CommandResult
                 .description("[Source](https://www.pinterest.com/pin/377809856242075277/)")
             })
         })
-        .await
+        .await?;
-    {
-        let _ = message.channel_id.say(&ctx.http, format!("{:?}", e)).await;
-    };
 
     Ok(())
 }
@@ -533,20 +523,18 @@ async fn pfp(ctx: &Context, message: &Message) -> CommandResult {
 async fn owo(ctx: &Context, message: &Message, args: Args) -> CommandResult {
     use owoify::OwOifiable;
 
-    let lastmsg = match message
+    let messages = message
         .channel_id
         .messages(&ctx.http, |get| get.before(message.id).limit(1))
         .await
-    {
+        .map_err(|_| CommandError::from("Could not get last message!"))?;
-        Ok(v) => v,
-        Err(_) => return Err("Could not get last message!".into()),
-    };
 
-    let lastmsg = &lastmsg[0].content;
+    let lastmsg = &messages[0].content;
 
-    let input: String = match args.is_empty() {
+    let input: String = if args.is_empty() {
-        true => s!(lastmsg),
+        s!(lastmsg)
-        false => args.rest().trim().to_string(),
+    } else {
+        args.rest().trim().to_string()
     };
     let _ = message.channel_id.say(&ctx.http, input.owoify()).await;
 
@@ -558,23 +546,17 @@ async fn owo(ctx: &Context, message: &Message, args: Args) -> CommandResult {
 #[only_in(guilds)]
 #[aliases("description", "topic")]
 async fn desc(ctx: &Context, message: &Message) -> CommandResult {
-    let channel = match message.channel(&ctx).await {
+    let channel = message
-        Some(ch) => ch,
+        .channel(&ctx)
-        None => {
+        .await
-            return Err("Could not get channel!".into());
+        .ok_or_else(|| CommandError::from("Could not get channel!"))?;
-        }
+    let channel = channel
-    };
+        .guild()
-    let channel = match channel.guild() {
+        .ok_or_else(|| CommandError::from("Could not get guild channel!"))?;
-        Some(g) => g,
-        None => {
-            return Err("Could not get guild channel!".into());
-        }
-    };
 
-    let topic = if channel.topic.clone().unwrap() != "" {
+    let topic = match channel.topic.as_deref() {
-        channel.topic.clone().unwrap()
+        Some("") | None => String::from("No channel topic found"),
-    } else {
+        Some(topic) => topic.to_string(),
-        String::from("No channel topic found")
     };
 
     let _ = message