Merge pull request #2115 from jdonszelmann/case-insensitive-zulip

make matching case-insensitive on zulip

Author: Urgau

Cargo.lock

@@ -44,7 +44,7 @@ ignore = "0.4.18"
 postgres-types = { version = "0.2.4", features = ["derive"] }
 cron = { version = "0.15.0" }
 bytes = "1.1.0"
-clap = { version = "4", features = ["derive"] }
+clap = { version = "4", features = ["derive", "string"] }
 hmac = "0.12.1"
 subtle = "2.6.1"
 sha2 = "0.10.9"

Cargo.toml

@@ -175,11 +175,25 @@ pub struct PingGoalsArgs {
 
 /// Helper function to parse CLI arguments without any colored help or error output.
 pub fn parse_cli<'a, T: Parser, I: Iterator<Item = &'a str>>(input: I) -> anyhow::Result<T> {
+    fn allow_title_case(sub: clap::Command) -> clap::Command {
+        let name = sub.get_name();
+        let alias = name
+            .chars()
+            .enumerate()
+            .map(|(i, c)| if i == 0 { c.to_ascii_uppercase() } else { c })
+            .collect::<String>();
+        sub.alias(alias)
+            // Recursively allow title-case subcommands
+            .mut_subcommands(allow_title_case)
+    }
+
     // Add a fake first argument, which is expected by clap
     let input = std::iter::once("triagebot").chain(input);
 
     let matches = T::command()
         .color(ColorChoice::Never)
+        // Allow title-case subcommands
+        .mut_subcommands(allow_title_case)
         .try_get_matches_from(input)?;
     let value = T::from_arg_matches(&matches)?;
     Ok(value)
@@ -234,6 +248,11 @@ mod tests {
         assert_eq!(parse_chat(&["whoami"]), ChatCommand::Whoami);
     }
 
+    #[test]
+    fn whoami_uppercased_command() {
+        assert_eq!(parse_chat(&["Whoami"]), ChatCommand::Whoami);
+    }
+
     #[test]
     fn lookup_command() {
         assert_eq!(
@@ -259,6 +278,14 @@ mod tests {
         );
     }
 
+    #[test]
+    fn work_uppercased_command() {
+        assert_eq!(
+            parse_chat(&["Work", "Show"]),
+            ChatCommand::Work(WorkqueueCmd::Show)
+        );
+    }
+
     #[test]
     fn end_meeting_command() {
         assert_eq!(parse_stream(&["end-meeting"]), StreamCommand::EndMeeting);