diff options
author | lain <lain@soykaf.club> | 2020-08-03 12:50:29 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-08-03 12:50:29 +0000 |
commit | 66ebd88634d2093fc6c4f9f90d5e32a4f2638696 (patch) | |
tree | c462e11beef4449b3ada71291823b5bf579be523 /config | |
parent | 5876d5123ceb29e658d0ccbcb6ec8fef98340a55 (diff) | |
parent | 0309514656b92771dc5078cc1ec6d343e42399b0 (diff) | |
download | pleroma-66ebd88634d2093fc6c4f9f90d5e32a4f2638696.tar.gz |
Merge branch 'config/default_ok_oldage' into 'develop'
config: :mrf, :policies default to ObjectAgePolicy
Closes #2000
See merge request pleroma/pleroma!2814
Diffstat (limited to 'config')
-rw-r--r-- | config/config.exs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index d31208c25..ef92d4cb3 100644 --- a/config/config.exs +++ b/config/config.exs @@ -392,8 +392,9 @@ config :pleroma, :mrf_vocabulary, accept: [], reject: [] +# threshold of 7 days config :pleroma, :mrf_object_age, - threshold: 172_800, + threshold: 604_800, actions: [:delist, :strip_followers] config :pleroma, :rich_media, @@ -719,7 +720,7 @@ config :pleroma, :restrict_unauthenticated, config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false config :pleroma, :mrf, - policies: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, + policies: Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy, transparency: true, transparency_exclusions: [] |