Move InvalidUrl error into Command

NotNorom · Sep 17, 2023 · f91c3f6 · f91c3f6
1 parent 6616a2d
commit f91c3f6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/commands/banner.rs b/src/commands/banner.rs
@@ -41,7 +41,7 @@ pub async fn start(
     }
 
     // album url
-    let album_url = album.parse::<Url>()?;
+    let album_url = album.parse::<Url>().map_err(CommandErr::InvalidUrl)?;
     let album = Album::try_from(&album_url)?;
 
     let user_data = ctx.data();
@@ -147,7 +147,7 @@ pub async fn start_for_guild(
     }
 
     // album url
-    let album_url = album.parse::<Url>()?;
+    let album_url = album.parse::<Url>().map_err(CommandErr::InvalidUrl)?;
     let album = Album::try_from(&album_url)?;
 
     let user_data = ctx.data();

diff --git a/src/error.rs b/src/error.rs
@@ -2,6 +2,7 @@ use std::fmt::{Debug, Display};
 
 use poise::serenity_prelude::User;
 use thiserror::Error;
+use url::ParseError;
 
 use crate::{
     album_provider::ProviderError,
@@ -20,9 +21,6 @@ pub enum Error {
     #[error(transparent)]
     Redis(#[from] fred::error::RedisError),
 
-    #[error(transparent)]
-    InvalidUrl(#[from] url::ParseError),
-
     #[error(transparent)]
     Command(#[from] Command),
 
@@ -57,6 +55,8 @@ pub enum Command {
     GuildHasNoBannerSet,
     #[error("Server doesn't have the required boost level")]
     GuildHasNoBannerFeature,
+    #[error("Album is not a valid URL")]
+    InvalidUrl(ParseError),
 }
 
 #[derive(Debug, thiserror::Error)]