diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-06-15 15:24:55 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-06-15 15:24:55 +0300 |
| commit | 579763126f52b21733e84594f36b86e270b3005d (patch) | |
| tree | 2b183b4b4ac4be2a4b64da87adc7ed56b7222f39 /config/description.exs | |
| parent | efdfc85c2d8e5118c1aa18e4f04026ec90cd11d2 (diff) | |
| parent | 448e93ce2c1eab9eb91118b90f661c31056e4781 (diff) | |
| download | pleroma-579763126f52b21733e84594f36b86e270b3005d.tar.gz | |
Merge branch 'develop' into issue/1855
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/config/description.exs b/config/description.exs index 857293794..31dbe4bc5 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1473,6 +1473,21 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, + key: :mrf_activity_expiration, + label: "MRF Activity Expiration Policy", + type: :group, + description: "Adds expiration to all local Create Note activities", + children: [ + %{ + key: :days, + type: :integer, + description: "Default global expiration time for all local Create activities (in days)", + suggestions: [90, 365] + } + ] + }, + %{ + group: :pleroma, key: :mrf_subchain, label: "MRF subchain", type: :group, @@ -1608,14 +1623,12 @@ config :pleroma, :config_description, [ # %{ # group: :pleroma, # key: :mrf_user_allowlist, - # type: :group, + # type: :map, # description: # "The keys in this section are the domain names that the policy should apply to." <> # " Each key should be assigned a list of users that should be allowed through by their ActivityPub ID", - # children: [ - # ["example.org": ["https://example.org/users/admin"]], # suggestions: [ - # ["example.org": ["https://example.org/users/admin"]] + # %{"example.org" => ["https://example.org/users/admin"]} # ] # ] # }, |