diff options
| author | lain <lain@soykaf.club> | 2020-08-04 15:10:36 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-04 15:10:36 +0200 |
| commit | 532d6f94aea5d4f53e846b8b77296f80a9ae68a0 (patch) | |
| tree | 1cecd20cbb2071b7076ce6748dc747e33613de63 /config/config.exs | |
| parent | e26f2c913529748423384d467472f3ad06248ea4 (diff) | |
| parent | 28584bb2241c600fc6150fdae49b1eea6bd420e0 (diff) | |
| download | pleroma-532d6f94aea5d4f53e846b8b77296f80a9ae68a0.tar.gz pleroma-532d6f94aea5d4f53e846b8b77296f80a9ae68a0.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/config/config.exs b/config/config.exs index 82be82747..317aa0f04 100644 --- a/config/config.exs +++ b/config/config.exs @@ -172,7 +172,7 @@ config :mime, :types, %{ "application/ld+json" => ["activity+json"] } -config :tesla, adapter: Tesla.Adapter.Gun +config :tesla, adapter: Tesla.Adapter.Hackney # Configures http settings, upstream proxy etc. config :pleroma, :http, @@ -252,7 +252,8 @@ config :pleroma, :instance, number: 5, length: 16 ] - ] + ], + show_reactions: true config :pleroma, :welcome, direct_message: [ @@ -260,6 +261,11 @@ config :pleroma, :welcome, sender_nickname: nil, message: nil ], + chat_message: [ + enabled: false, + sender_nickname: nil, + message: nil + ], email: [ enabled: false, sender: nil, @@ -373,6 +379,7 @@ config :pleroma, :mrf_simple, federated_timeline_removal: [], report_removal: [], reject: [], + followers_only: [], accept: [], avatar_removal: [], banner_removal: [], @@ -391,8 +398,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, @@ -508,7 +516,8 @@ config :pleroma, Pleroma.User, "user_exists", "users", "web" - ] + ], + email_blacklist: [] config :pleroma, Oban, repo: Pleroma.Repo, @@ -761,7 +770,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: [] |