From e1ac2777f3d466f6ee3a067bade404eb0e74d2a6 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 1 Nov 2021 21:27:06 +0100 Subject: [PATCH] Normalize server from group actor too as specified in tests --- src/utils.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utils.rs b/src/utils.rs index e095a07..efbceec 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -19,8 +19,8 @@ impl LogError for Result { } } -pub(crate) fn acct_to_server(acct: &str) -> Option<&str> { - acct.trim_start_matches('@').split('@').nth(1) +pub(crate) fn acct_to_server(acct: &str) -> Option { + acct.trim_start_matches('@').split('@').nth(1).map(|s| s.to_lowercase()) } pub(crate) fn normalize_acct(acct: &str, group: &str) -> Result { @@ -45,8 +45,8 @@ mod test { #[test] fn test_acct_to_server() { - assert_eq!(Some("novak"), acct_to_server("pepa@novak")); - assert_eq!(Some("banana.co.uk"), acct_to_server("@pepa@banana.co.uk")); + assert_eq!(Some("novak".to_string()), acct_to_server("pepa@novak")); + assert_eq!(Some("banana.co.uk".to_string()), acct_to_server("@pepa@banana.co.uk")); assert_eq!(None, acct_to_server("probably_local")); }