diff options
| author | lain <lain@soykaf.club> | 2020-06-12 14:14:09 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-12 14:14:09 +0000 |
| commit | e557265a037caa0fd4ab35c811d19ad07a5f53fa (patch) | |
| tree | 346a974d5256defa38df4f5853addafd8d756650 /config | |
| parent | 6d902916dd513fa2d60e37488a60fa8b152c73fa (diff) | |
| parent | 4655407451c8dd05b6024f607e598359047efce2 (diff) | |
| download | pleroma-e557265a037caa0fd4ab35c811d19ad07a5f53fa.tar.gz pleroma-e557265a037caa0fd4ab35c811d19ad07a5f53fa.zip | |
Merge branch 'global-status-expiration' into 'develop'
Global status expiration
See merge request pleroma/pleroma!2208
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 9508ae077..7a70164f3 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 807c945e0..add1601e2 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, |