Rename stop_forum_spam to enable_stop_forum_spam

rafalp · Jun 6, 2019 · b85a5c5 · b85a5c5
1 parent 61aebc0
commit b85a5c5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/misago/conf/admin/forms/captcha.py b/misago/conf/admin/forms/captcha.py
@@ -13,7 +13,7 @@ class ChangeCaptchaSettingsForm(ChangeSettingsForm):
         "qa_question",
         "qa_help_text",
         "qa_answers",
-        "stop_forum_spam",
+        "enable_stop_forum_spam",
         "stop_forum_spam_confidence",
     ]
 
@@ -48,7 +48,7 @@ class ChangeCaptchaSettingsForm(ChangeSettingsForm):
         required=False,
     )
 
-    stop_forum_spam = YesNoSwitch(
+    enable_stop_forum_spam = YesNoSwitch(
         label=_("Validate new registrations against SFS database"),
         help_text=_(
             "Turning this option on will result in Misago validating new user's e-mail "

diff --git a/misago/conf/admin/forms/users.py b/misago/conf/admin/forms/users.py
@@ -140,9 +140,7 @@ class ChangeUsersSettingsForm(ChangeSettingsForm):
         label=_("Maximum number of ranked users"), min_value=2
     )
 
-    allow_data_downloads = YesNoSwitch(
-        label=_("Allow users to download their data"),
-    )
+    allow_data_downloads = YesNoSwitch(label=_("Allow users to download their data"))
     data_downloads_expiration = forms.IntegerField(
         label=_("Data downloads expiration time (in hours)"),
         help_text=_(

diff --git a/misago/conf/migrations/0004_create_settings.py b/misago/conf/migrations/0004_create_settings.py
@@ -91,7 +91,7 @@
     },
     {"setting": "username_length_min", "python_type": "int", "dry_value": 3},
     {"setting": "username_length_max", "python_type": "int", "dry_value": 14},
-    {"setting": "stop_forum_spam", "python_type": "bool", "dry_value": False},
+    {"setting": "enable_stop_forum_spam", "python_type": "bool", "dry_value": False},
     {"setting": "stop_forum_spam_confidence", "python_type": "int", "dry_value": 80},
     {"setting": "users_per_page", "python_type": "int", "dry_value": 12},
     {"setting": "users_per_page_orphans", "python_type": "int", "dry_value": 4},

diff --git a/misago/templates/misago/admin/conf/captcha_settings.html b/misago/templates/misago/admin/conf/captcha_settings.html
@@ -34,7 +34,7 @@
   <fieldset>
     <legend>{% trans "Stop Forum Spam" %}</legend>
 
-    {% form_row form.stop_forum_spam %}
+    {% form_row form.enable_stop_forum_spam %}
     {% form_row form.stop_forum_spam_confidence %}
 
   </fieldset>

diff --git a/misago/users/tests/test_stop_forum_spam_validator.py b/misago/users/tests/test_stop_forum_spam_validator.py
@@ -30,41 +30,41 @@ def api_mock(mocker):
     )
 
 
-@override_dynamic_settings(stop_forum_spam=False)
+@override_dynamic_settings(enable_stop_forum_spam=False)
 def test_api_is_not_called_if_sfs_is_disabled(api_mock, request_mock):
     validate_with_sfs(request_mock, cleaned_data, None)
     api_mock.get.assert_not_called()
 
 
-@override_dynamic_settings(stop_forum_spam=True)
+@override_dynamic_settings(enable_stop_forum_spam=True)
 def test_api_is_not_called_if_email_is_not_available(api_mock, request_mock):
     validate_with_sfs(request_mock, {}, None)
     api_mock.get.assert_not_called()
 
 
-@override_dynamic_settings(stop_forum_spam=True, stop_forum_spam_confidence=90)
+@override_dynamic_settings(enable_stop_forum_spam=True, stop_forum_spam_confidence=90)
 def test_api_is_called_if_sfs_is_enabled_and_email_is_provided(api_mock, request_mock):
     validate_with_sfs(request_mock, cleaned_data, None)
     api_mock.get.assert_called_once()
 
 
-@override_dynamic_settings(stop_forum_spam=True, stop_forum_spam_confidence=50)
+@override_dynamic_settings(enable_stop_forum_spam=True, stop_forum_spam_confidence=50)
 def test_validator_raises_error_if_ip_score_is_greater_than_confidence(
     api_mock, request_mock
 ):
     with pytest.raises(ValidationError):
         validate_with_sfs(request_mock, cleaned_data, None)
 
 
-@override_dynamic_settings(stop_forum_spam=True, stop_forum_spam_confidence=52)
+@override_dynamic_settings(enable_stop_forum_spam=True, stop_forum_spam_confidence=52)
 def test_validator_raises_error_if_email_score_is_greater_than_confidence(
     api_mock, request_mock
 ):
     with pytest.raises(ValidationError):
         validate_with_sfs(request_mock, cleaned_data, None)
 
 
-@override_dynamic_settings(stop_forum_spam=True)
+@override_dynamic_settings(enable_stop_forum_spam=True)
 def test_validator_handles_api_error(mocker, request_mock):
     failing_api_mock = mocker.patch(
         "misago.users.validators.requests",
@@ -75,7 +75,7 @@ def test_validator_handles_api_error(mocker, request_mock):
     failing_api_mock.get.assert_called_once()
 
 
-@override_dynamic_settings(stop_forum_spam=True)
+@override_dynamic_settings(enable_stop_forum_spam=True)
 def test_validator_logs_api_error(mocker, request_mock):
     failing_api_mock = mocker.patch(
         "misago.users.validators.requests",
@@ -88,7 +88,7 @@ def test_validator_logs_api_error(mocker, request_mock):
     logger_mock.exception.assert_called_once()
 
 
-@override_dynamic_settings(stop_forum_spam=True)
+@override_dynamic_settings(enable_stop_forum_spam=True)
 def test_validator_handles_malformed_api_response(mocker, request_mock):
     failing_api_mock = mocker.patch(
         "misago.users.validators.requests", get=Mock(return_value=Mock(content="{}"))

diff --git a/misago/users/validators.py b/misago/users/validators.py
@@ -111,7 +111,7 @@ def validate_username_length(settings, value):
 
 
 def validate_with_sfs(request, cleaned_data, add_error):
-    if request.settings.stop_forum_spam and cleaned_data.get("email"):
+    if request.settings.enable_stop_forum_spam and cleaned_data.get("email"):
         try:
             _real_validate_with_sfs(
                 request.user_ip,