diff options
| author | lain <lain@soykaf.club> | 2020-08-04 11:00:30 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-04 11:00:30 +0000 |
| commit | 28584bb2241c600fc6150fdae49b1eea6bd420e0 (patch) | |
| tree | 18f8334bdd3daffed7b033492539e3b867e8d15f /config | |
| parent | e3953923aca1706ab508bfda1ab892304b29c09a (diff) | |
| parent | 2f4289d455fbd2d949ac1e10d5ea2b9c78f15e82 (diff) | |
Merge branch 'email-blacklist' into 'develop'
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/description.exs | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index fa8051e40..933a899ab 100644 --- a/config/config.exs +++ b/config/config.exs @@ -516,7 +516,8 @@ config :pleroma, Pleroma.User, "user_exists", "users", "web" - ] + ], + email_blacklist: [] config :pleroma, Oban, repo: Pleroma.Repo, diff --git a/config/description.exs b/config/description.exs index ae2f6d23f..d823812fb 100644 --- a/config/description.exs +++ b/config/description.exs @@ -3056,6 +3056,7 @@ config :pleroma, :config_description, [ %{ key: :restricted_nicknames, type: {:list, :string}, + description: "List of nicknames users may not register with.", suggestions: [ ".well-known", "~", @@ -3088,6 +3089,12 @@ config :pleroma, :config_description, [ "users", "web" ] + }, + %{ + key: :email_blacklist, + type: {:list, :string}, + description: "List of email domains users may not register with.", + suggestions: ["mailinator.com", "maildrop.cc"] } ] }, |