diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-09 09:37:59 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-09 09:37:59 +0000 |
| commit | 6384d7803520f633a66d1cb9f76e3540863f92fb (patch) | |
| tree | 93754d8c8a01c556c0fabca6ac3acdea3d4f02d3 /config | |
| parent | c45b3bde949bbbd6b8d6de30022c1d1e5b99dc44 (diff) | |
| parent | ad09bdb3764e529d1f0682b5395f34bc4849bd22 (diff) | |
| download | pleroma-6384d7803520f633a66d1cb9f76e3540863f92fb.tar.gz | |
Merge branch 'simple_policy_reasons_for_instance_specific_policies' into 'develop'
Simple policy reasons for instance specific policies
See merge request pleroma/pleroma!3314
Diffstat (limited to 'config')
| -rw-r--r-- | config/description.exs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/config/description.exs b/config/description.exs index 934a62a62..c72231faa 100644 --- a/config/description.exs +++ b/config/description.exs @@ -687,12 +687,14 @@ config :pleroma, :config_description, [ }, %{ key: :quarantined_instances, - type: {:list, :string}, + type: {:list, :tuple}, + key_placeholder: "instance", + value_placeholder: "reason", description: - "List of ActivityPub instances where private (DMs, followers-only) activities will not be sent", + "List of ActivityPub instances where private (DMs, followers-only) activities will not be sent and the reason for doing so", suggestions: [ - "quarantined.com", - "*.quarantined.com" + {"quarantined.com", "Reason"}, + {"*.quarantined.com", "Reason"} ] }, %{ |