diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-12 18:25:29 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-12 18:25:29 +0400 |
| commit | 697cf920249b4f67bcc49aa923374d5fdc20809b (patch) | |
| tree | ee8630240ae99d32279c6a66aea0a51e2b3f406c /config | |
| parent | 2419776e192316cefbdbe607306c9b92ec558319 (diff) | |
| parent | e557265a037caa0fd4ab35c811d19ad07a5f53fa (diff) | |
| download | pleroma-697cf920249b4f67bcc49aa923374d5fdc20809b.tar.gz pleroma-697cf920249b4f67bcc49aa923374d5fdc20809b.zip | |
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | config/description.exs | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index cafa40820..6a7bb9e06 100644 --- a/config/config.exs +++ b/config/config.exs @@ -371,6 +371,8 @@ config :pleroma, :mrf_keyword, config :pleroma, :mrf_subchain, match_actor: %{} +config :pleroma, :mrf_activity_expiration, days: 365 + config :pleroma, :mrf_vocabulary, accept: [], reject: [] diff --git a/config/description.exs b/config/description.exs index b993959d7..3f69dac8a 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, |