various code fixes

- Fixes missing . in regex for repos
- fix list-repos sending 2 messages
- fix missing url (and url parsing) in embed command
- fix embed command sending 2 responses in certain errors.
- lazily match everywhere due to autocomplete limitations
- remove redundant 25+ snippet warning

Author: jamesbt365

src/commands/snippets.rs

@@ -112,7 +112,7 @@ pub async fn edit_snippet(
     #[description = "The snippet's title"] title: Option<String>,
     #[description = "The snippet's content"] content: Option<String>,
 ) -> Result<(), Error> {
-    match get_snippet(&ctx, &id).await {
+    match get_snippet_lazy(&ctx, &id).await {
         Some(mut snippet) => {
             if let Some(title) = title {
                 snippet.title = title;
@@ -143,16 +143,14 @@ pub async fn edit_snippet(
 }
 
 /// Removes a snippet
-///
-/// Must use the full formatted snippet name (id: title)
 #[poise::command(rename = "remove-snippet", slash_command, guild_only)]
 pub async fn remove_snippet(
     ctx: Context<'_>,
     #[autocomplete = "autocomplete_snippet"]
     #[description = "The snippet's id"]
     id: String,
 ) -> Result<(), Error> {
-    match get_snippet(&ctx, &id).await {
+    match get_snippet_lazy(&ctx, &id).await {
         Some(snippet) => {
             rm_snippet(&ctx, &snippet).await;
             let title = &"Snippet successfully removed";
@@ -247,7 +245,7 @@ impl Embeddable for Snippet {
 }
 
 // Exact matches the snippet id and name.
-async fn get_snippet(ctx: &Context<'_>, id: &str) -> Option<Snippet> {
+async fn _get_snippet(ctx: &Context<'_>, id: &str) -> Option<Snippet> {
     let data = ctx.data();
     let rwlock_guard = data.state.read().unwrap();
 

src/commands/utils.rs

@@ -50,32 +50,41 @@ pub async fn embed(
         || thumbnail.is_some()
         || footer.is_some();
 
-    let url_invalid = url.is_some() && title.is_none();
-
     if !at_least_one_property_set {
         respond_err(
             &ctx,
             "Failed to respond with embed",
             "Please provide at least one title, description, image, footer or thumbnail",
         )
         .await;
-        ctx.say("You must provide at least one title, description, image or thumbnail.")
-            .await?;
         return Ok(());
     }
+    let mut embed = CreateEmbed::default();
 
-    if url_invalid {
-        respond_err(
-            &ctx,
-            "Failed to respond with embed",
-            "To set a url, you must set a title",
-        )
-        .await;
-        return Ok(());
+    if let Some(url) = url {
+        match url.parse::<reqwest::Url>() {
+            Ok(_) => {
+                if title.is_some() {
+                    embed = embed.url(url)
+                } else {
+                    respond_err(
+                        &ctx,
+                        "Failed to respond with embed",
+                        "To set a url, you must set a title.",
+                    )
+                    .await;
+                    return Ok(());
+                }
+            }
+            Err(e) => {
+                let title = "Invalid url provided";
+                let content = &format!("The url '{}' is not a valid url: {}", url, e);
+                respond_err(&ctx, title, content).await;
+                return Ok(());
+            }
+        }
     }
 
-    let mut embed = CreateEmbed::default();
-
     if let Some(title) = title {
         embed = embed.title(title);
     }
@@ -264,7 +273,7 @@ pub async fn add_repo(
     #[description = "The respository name."] repository: String,
 ) -> Result<(), Error> {
     let key_regex = Regex::new(r"[a-z+]+$").unwrap();
-    let repo_details_regex = Regex::new(r"^([a-zA-Z0-9-_]+)*$").unwrap();
+    let repo_details_regex = Regex::new(r"^([a-zA-Z0-9-_.]+)*$").unwrap();
     if !key_regex.is_match(&key) {
         respond_err(
             &ctx,
@@ -381,22 +390,6 @@ pub async fn list_repos(ctx: Context<'_>) -> Result<(), Error> {
 
     super::paginate_lists(ctx, &pages, "Repositories").await?;
 
-    let mut embed = CreateEmbed::default()
-        .title("Issue tokens")
-        .color(Colour::TEAL);
-
-    // fields are limited to 25 max, we can't display more than 25 snippets in the snippets command
-    // due to a discord limitation.
-    for token in tokens {
-        embed = embed.field(
-            format!("**{}**", token.0),
-            format!("{}/{}", token.1.owner, token.1.name),
-            false,
-        );
-    }
-
-    ctx.send(poise::CreateReply::default().embed(embed)).await?;
-
     Ok(())
 }