move import, fix return

Author: geoffg-sentry

src/sentry/api/serializers/models/organization.py

@@ -89,6 +89,7 @@
 from sentry.users.models.user import User
 from sentry.users.services.user.model import RpcUser
 from sentry.users.services.user.service import user_service
+from sentry.utils.display_name_filter import is_spam_display_name
 
 if TYPE_CHECKING:
     from sentry.api.serializers.models.project import OrganizationProjectResponse
@@ -176,11 +177,10 @@ def validate_name(self, value: str) -> str:
                 "Organization name cannot contain URL schemes (e.g. http:// or https://)."
             )
 
-        from sentry.utils.display_name_filter import check_spam_display_name
-
-        spam_error = check_spam_display_name(value)
-        if spam_error:
-            raise serializers.ValidationError(spam_error)
+        if is_spam_display_name(value):
+            raise serializers.ValidationError(
+                "This name contains disallowed content. Please choose a different name."
+            )
 
         return value
 

src/sentry/sentry_apps/api/parsers/sentry_app.py

@@ -11,6 +11,7 @@
 from sentry.sentry_apps.api.parsers.schema import validate_ui_element_schema
 from sentry.sentry_apps.models.sentry_app import REQUIRED_EVENT_PERMISSIONS, UUID_CHARS_IN_SLUG
 from sentry.sentry_apps.utils.webhooks import VALID_EVENT_RESOURCES
+from sentry.utils.display_name_filter import is_spam_display_name
 
 
 @extend_schema_field(build_typed_list(OpenApiTypes.STR))
@@ -165,11 +166,10 @@ def validate_name(self, value):
         if len(value) > max_length:
             raise ValidationError("Cannot exceed %d characters" % max_length)
 
-        from sentry.utils.display_name_filter import check_spam_display_name
-
-        spam_error = check_spam_display_name(value)
-        if spam_error:
-            raise ValidationError(spam_error)
+        if is_spam_display_name(value):
+            raise ValidationError(
+                "This name contains disallowed content. Please choose a different name."
+            )
 
         return value
 

src/sentry/utils/display_name_filter.py

@@ -87,10 +87,8 @@ 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."""
+def is_spam_display_name(name: str) -> bool:
+    """Return True if the name matches 2+ spam signal categories."""
     lowered = name.lower()
     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
+    return matched >= 2

tests/sentry/utils/test_display_name_filter.py

@@ -1,81 +1,69 @@
-from sentry.utils.display_name_filter import check_spam_display_name
+from sentry.utils.display_name_filter import is_spam_display_name
 
 
-class TestCheckSpamDisplayName:
+class TestIsSpamDisplayName:
     def test_clean_name_passes(self) -> None:
-        assert check_spam_display_name("My Company Inc.") is None
+        assert not is_spam_display_name("My Company Inc.")
 
     def test_single_currency_signal_passes(self) -> None:
-        assert check_spam_display_name("BTC Analytics") is None
+        assert not is_spam_display_name("BTC Analytics")
 
     def test_single_cta_verb_passes(self) -> None:
-        assert check_spam_display_name("Click Studios") is None
+        assert not is_spam_display_name("Click Studios")
 
     def test_single_cta_urgency_passes(self) -> None:
-        assert check_spam_display_name("Do It Now Labs") is None
+        assert not is_spam_display_name("Do It Now Labs")
 
     def test_cta_verb_plus_urgency_alone_passes(self) -> None:
-        assert check_spam_display_name("Click Here Studios") is None
+        assert not is_spam_display_name("Click Here Studios")
 
     def test_single_shorturl_signal_passes(self) -> None:
-        assert check_spam_display_name("bit.ly/promo team") is None
+        assert not is_spam_display_name("bit.ly/promo team")
 
     def test_currency_plus_cta_rejected(self) -> None:
-        assert check_spam_display_name("Free BTC - Click Here") is not None
+        assert is_spam_display_name("Free BTC - Click Here")
 
     def test_currency_plus_shorturl_rejected(self) -> None:
-        assert check_spam_display_name("Earn $100 via 2g.tel/promo") is not None
+        assert is_spam_display_name("Earn $100 via 2g.tel/promo")
 
     def test_shorturl_without_slash_not_matched(self) -> None:
-        assert check_spam_display_name("support.com Solutions") is None
+        assert not is_spam_display_name("support.com Solutions")
 
     def test_cta_plus_shorturl_rejected(self) -> None:
-        assert check_spam_display_name("Click Here: bit.ly/free") is not None
+        assert is_spam_display_name("Click Here: bit.ly/free")
 
     def test_bare_shorturl_domain_without_path_passes(self) -> None:
-        assert check_spam_display_name("Free BTC bit.ly") is None
+        assert not is_spam_display_name("Free BTC bit.ly")
 
     def test_all_three_categories_rejected(self) -> None:
-        result = check_spam_display_name("Win $50 ETH bit.ly/offer Claim Now")
-        assert result is not None
+        assert is_spam_display_name("Win $50 ETH bit.ly/offer Claim Now")
 
     def test_case_insensitive(self) -> None:
-        result = check_spam_display_name("FREE BTC - CLICK HERE")
-        assert result is not None
+        assert is_spam_display_name("FREE BTC - CLICK HERE")
 
     def test_currency_emoji_detected(self) -> None:
-        result = check_spam_display_name(
-            "\U0001f4b2Compensation Btc: 2g.tel/x Click Your Pay Link."
-        )
-        assert result is not None
+        assert is_spam_display_name("\U0001f4b2Compensation Btc: 2g.tel/x Click Your Pay Link.")
 
     def test_single_currency_emoji_passes(self) -> None:
-        assert check_spam_display_name("My \U0001f4b0 Company") is None
+        assert not is_spam_display_name("My \U0001f4b0 Company")
 
     def test_cta_novel_combo_rejected(self) -> None:
-        result = check_spam_display_name("Withdraw Now - Free BTC")
-        assert result is not None
+        assert is_spam_display_name("Withdraw Now - Free BTC")
 
     def test_substring_sol_in_solutions_not_matched(self) -> None:
-        assert check_spam_display_name("Impactful Solutions") is None
+        assert not is_spam_display_name("Impactful Solutions")
 
     def test_substring_eth_in_method_not_matched(self) -> None:
-        assert check_spam_display_name("Method Analytics") is None
+        assert not is_spam_display_name("Method Analytics")
 
     def test_substring_act_in_contact_not_matched(self) -> None:
-        assert check_spam_display_name("Contact Knowledge Solutions") is None
+        assert not is_spam_display_name("Contact Knowledge Solutions")
 
     def test_substring_now_in_knowledge_not_matched(self) -> None:
-        assert check_spam_display_name("Knowledge Now Platform") is None
+        assert not is_spam_display_name("Knowledge Now Platform")
 
     def test_substring_here_in_where_not_matched(self) -> None:
-        assert check_spam_display_name("Where We Shine") is None
+        assert not is_spam_display_name("Where We Shine")
 
     def test_empty_string_passes(self) -> None:
-        assert check_spam_display_name("") is None
-
-    def test_error_message_format(self) -> None:
-        result = check_spam_display_name("Free BTC - Click Here")
-        assert result is not None
-        assert "disallowed content" in result
-        assert "Please choose a different name" in result
+        assert not is_spam_display_name("")