From 64002e92adcf08564d9b8e3fa2dcf7c07c72145a Mon Sep 17 00:00:00 2001 From: Ilja Date: Sat, 3 Oct 2020 12:08:09 +0200 Subject: config/description.exs: Update quarantine settings to tuples --- config/description.exs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/description.exs b/config/description.exs index 934a62a62..252aa63d8 100644 --- a/config/description.exs +++ b/config/description.exs @@ -687,12 +687,12 @@ config :pleroma, :config_description, [ }, %{ key: :quarantined_instances, - type: {:list, :string}, + type: {:list, :tuple}, 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"} ] }, %{ -- cgit v1.2.3 From f4028c908c56736b88caa5edb71f5aad21244de1 Mon Sep 17 00:00:00 2001 From: Ilja Date: Fri, 18 Dec 2020 14:29:38 +0100 Subject: Add key- and valuePlaceholders for quarantined_instances and mrf_simple * I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here * I also added comments to explain why we did the _info keys (backwards compatibility) --- config/description.exs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/description.exs b/config/description.exs index 252aa63d8..411029c27 100644 --- a/config/description.exs +++ b/config/description.exs @@ -688,6 +688,8 @@ config :pleroma, :config_description, [ %{ key: :quarantined_instances, type: {:list, :tuple}, + keyPlaceholder: "instance", + valuePlaceholder: "reason", description: "List of ActivityPub instances where private (DMs, followers-only) activities will not be sent and the reason for doing so", suggestions: [ -- cgit v1.2.3 From ee26f2c91b6335a086949334138877432944b208 Mon Sep 17 00:00:00 2001 From: Ilja Date: Sun, 17 Jan 2021 14:32:42 +0100 Subject: Quarantine placeholders * kePlaceholder and valuePlaceholder of quarantined_instances where in wrong case, should be snake_case * The mrf simple and transparency exclusion were already OK --- config/description.exs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/description.exs b/config/description.exs index 411029c27..c72231faa 100644 --- a/config/description.exs +++ b/config/description.exs @@ -688,8 +688,8 @@ config :pleroma, :config_description, [ %{ key: :quarantined_instances, type: {:list, :tuple}, - keyPlaceholder: "instance", - valuePlaceholder: "reason", + key_placeholder: "instance", + value_placeholder: "reason", description: "List of ActivityPub instances where private (DMs, followers-only) activities will not be sent and the reason for doing so", suggestions: [ -- cgit v1.2.3