Replace doule match with more readable code

1 files changed, 25 insertions, 20 deletions

diff --git a/src/main.rs b/src/main.rs
index 8ac2edd..455da50 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -53,32 +53,37 @@ mod commands {
             .ok_or_else(|| Box::new(super::BotError::MissingGuild).into())
     }
 
+    async fn create_channel_no_cache<'n, 'd>(
+        ctx: &Context,
+        guild: &Guild,
+        desc: ChannelDescriptor<'n, 'd>,
+    ) -> Result<GuildChannel, CommandError> {
+        Ok(guild
+            .create_channel(ctx, |c| {
+                let c = c.name(desc.name).topic(desc.description).kind(desc.kind);
+                if let Some(parent) = desc.parent {
+                    c.category(parent)
+                } else {
+                    c
+                }
+            })
+            .await?)
+    }
+
     async fn create_channel<'n, 'd>(
         ctx: &Context,
         guild: &Guild,
         desc: ChannelDescriptor<'n, 'd>,
     ) -> Result<GuildChannel, CommandError> {
         let channel = guild.channel_id_from_name(&ctx.cache, desc.name).await;
-        Ok(
-            match match channel {
-                Some(channel) => ctx.cache.guild_channel(channel).await,
-                None => None,
-            } {
-                Some(channel) => channel,
-                None => {
-                    guild
-                        .create_channel(ctx, |c| {
-                            let c = c.name(desc.name).topic(desc.description).kind(desc.kind);
-                            if let Some(parent) = desc.parent {
-                                c.category(parent)
-                            } else {
-                                c
-                            }
-                        })
-                        .await?
-                }
-            },
-        )
+        let optional_channel = match channel {
+            Some(channel) => ctx.cache.guild_channel(channel).await,
+            None => None,
+        };
+        match optional_channel {
+            Some(channel) => Ok(channel),
+            None => create_channel_no_cache(ctx, guild, desc).await,
+        }
     }
 
     #[command]