simplify error messaging

Author: geoffg-sentry

src/sentry/utils/display_name_filter.py

@@ -90,8 +90,7 @@ def _has_cta(lowered: str) -> bool:
 def check_spam_display_name(name: str) -> str | None:
     """Return an error string if the name matches 2+ spam categories, else None."""
     lowered = name.lower()
-    matched_labels: list[str] = [label for label, check in _CATEGORIES if check(lowered)]
-    if len(matched_labels) >= 2:
-        joined = " and ".join(matched_labels)
-        return f"This name contains disallowed content ({joined}). Please choose a different name."
+    matched = sum(1 for _, check in _CATEGORIES if check(lowered))
+    if matched >= 2:
+        return "This name contains disallowed content. Please choose a different name."
     return None

tests/sentry/utils/test_display_name_filter.py

@@ -21,25 +21,16 @@ def test_single_shorturl_signal_passes(self) -> None:
         assert check_spam_display_name("bit.ly/promo team") is None
 
     def test_currency_plus_cta_rejected(self) -> None:
-        result = check_spam_display_name("Free BTC - Click Here")
-        assert result is not None
-        assert "cryptocurrency terminology" in result
-        assert "call-to-action phrases" in result
+        assert check_spam_display_name("Free BTC - Click Here") is not None
 
     def test_currency_plus_shorturl_rejected(self) -> None:
-        result = check_spam_display_name("Earn $100 via 2g.tel/promo")
-        assert result is not None
-        assert "cryptocurrency terminology" in result
-        assert "URL shortener domains" in result
+        assert check_spam_display_name("Earn $100 via 2g.tel/promo") is not None
 
     def test_shorturl_without_slash_not_matched(self) -> None:
         assert check_spam_display_name("support.com Solutions") is None
 
     def test_cta_plus_shorturl_rejected(self) -> None:
-        result = check_spam_display_name("Click Here: bit.ly/free")
-        assert result is not None
-        assert "call-to-action phrases" in result
-        assert "URL shortener domains" in result
+        assert check_spam_display_name("Click Here: bit.ly/free") is not None
 
     def test_bare_shorturl_domain_without_path_passes(self) -> None:
         assert check_spam_display_name("Free BTC bit.ly") is None