diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-24 18:37:58 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-24 18:37:58 +0400 |
| commit | c56c0a3d23929f166f4d95e5c6e96bbf0df8a35e (patch) | |
| tree | 6b6fffe4faeebbf7e103d16a427f6f68774b44d5 /config | |
| parent | 364eecc49f137ae3c7798ad240983591e27b134c (diff) | |
| parent | 2430b9bf90d6fde71885f5f0f8be767526be6208 (diff) | |
| download | pleroma-c56c0a3d23929f166f4d95e5c6e96bbf0df8a35e.tar.gz | |
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/description.exs | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 2517fed59..7ace09b87 100644 --- a/config/config.exs +++ b/config/config.exs @@ -336,7 +336,8 @@ config :pleroma, :mrf_simple, reject: [], accept: [], avatar_removal: [], - banner_removal: [] + banner_removal: [], + reject_deletes: [] config :pleroma, :mrf_keyword, reject: [], diff --git a/config/description.exs b/config/description.exs index ef5022c2a..21623197d 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1317,13 +1317,13 @@ config :pleroma, :config_description, [ %{ key: :reject, type: {:list, :string}, - description: "List of instances to reject any activities from", + description: "List of instances to reject activities from (except deletes)", suggestions: ["example.com", "*.example.com"] }, %{ key: :accept, type: {:list, :string}, - description: "List of instances to accept any activities from", + description: "List of instances to only accept activities from (except deletes)", suggestions: ["example.com", "*.example.com"] }, %{ @@ -1343,6 +1343,12 @@ config :pleroma, :config_description, [ type: {:list, :string}, description: "List of instances to strip banners from", suggestions: ["example.com", "*.example.com"] + }, + %{ + key: :reject_deletes, + type: {:list, :string}, + description: "List of instances to reject deletions from", + suggestions: ["example.com", "*.example.com"] } ] }, |