Merge branch 'feature/expire-mutes' into 'develop'
authorlain <lain@soykaf.club>
Thu, 5 Nov 2020 12:44:16 +0000 (12:44 +0000)
committerlain <lain@soykaf.club>
Thu, 5 Nov 2020 12:44:16 +0000 (12:44 +0000)
Expiring mutes for users and activities

Closes #1817

See merge request pleroma/pleroma!2971

1  2 
config/config.exs

diff --combined config/config.exs
index ed7bda9ee5e9716d75980199827c143ba7ef5590,c77529e8707e9e7afe3c19a11ce588dea75fac16..0b8a75aad2dcb0c18d552c7f6bf6f239c033f655
@@@ -562,7 -562,8 +562,8 @@@ config :pleroma, Oban
      background: 5,
      remote_fetcher: 2,
      attachments_cleanup: 5,
-     new_users_digest: 1
+     new_users_digest: 1,
+     mute_expire: 5
    ],
    plugins: [Oban.Plugins.Pruner],
    crontab: [
@@@ -820,7 -821,7 +821,7 @@@ config :pleroma, :restrict_unauthentica
  config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false
  
  config :pleroma, :mrf,
 -  policies: Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy,
 +  policies: [Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy, Pleroma.Web.ActivityPub.MRF.TagPolicy],
    transparency: true,
    transparency_exclusions: []