diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-17 21:09:15 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-17 21:09:15 +0200 |
| commit | 7e2b6da57f7689757a50fa261c480445b1846703 (patch) | |
| tree | 1c9ecca76fcf3ce743c372314188361e429ed1f1 /config | |
| parent | fccd25cf5397f8c2ee2df98e0cc46be3c2b1ea5d (diff) | |
Add setting to disable the anti-spam (#11296)
* Add environment variable to disable the anti-spam * Move antispam setting to admin settings * Fix typo * antispam → spam_check
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 4 | ||||
| -rw-r--r-- | config/settings.yml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 89251ad40..4e252945f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -250,6 +250,7 @@ en: feature_profile_directory: Profile directory feature_registrations: Registrations feature_relay: Federation relay + feature_spam_check: Anti-spam feature_timeline_preview: Timeline preview features: Features hidden_service: Federation with hidden services @@ -449,6 +450,9 @@ en: desc_html: You can write your own privacy policy, terms of service or other legalese. You can use HTML tags title: Custom terms of service site_title: Server name + spam_check_enabled: + desc_html: Mastodon can auto-silence and auto-report accounts based on measures such as detecting accounts who send repeated unsolicited messages. There may be false positives. + title: Anti-spam thumbnail: desc_html: Used for previews via OpenGraph and API. 1200x630px recommended title: Server thumbnail diff --git a/config/settings.yml b/config/settings.yml index 75cb2dc85..ad2970bb7 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -61,6 +61,7 @@ defaults: &defaults activity_api_enabled: true peers_api_enabled: true show_known_fediverse_at_about_page: true + spam_check_enabled: true development: <<: *defaults |