diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-03 14:43:28 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-03 14:43:28 -0500 |
| commit | c186b059a77bf6cece831887948e23ee95222a1a (patch) | |
| tree | 3a3a052f8c76b99e44ea5eb25d6b6bd659af23dc /config/config.exs | |
| parent | c80b1aaf514dec6b538a9833d48df027708b6b4d (diff) | |
| parent | 377f84f3678f9c2541fbd4a200cd93c5ab0dea24 (diff) | |
| download | pleroma-c186b059a77bf6cece831887948e23ee95222a1a.tar.gz pleroma-c186b059a77bf6cece831887948e23ee95222a1a.zip | |
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 66aee3264..4381068ac 100644 --- a/config/config.exs +++ b/config/config.exs @@ -391,6 +391,11 @@ config :pleroma, :mrf_keyword, federated_timeline_removal: [], replace: [] +config :pleroma, :mrf_hashtag, + sensitive: ["nsfw"], + reject: [], + federated_timeline_removal: [] + config :pleroma, :mrf_subchain, match_actor: %{} config :pleroma, :mrf_activity_expiration, days: 365 @@ -404,6 +409,8 @@ config :pleroma, :mrf_object_age, threshold: 604_800, actions: [:delist, :strip_followers] +config :pleroma, :mrf_follow_bot, follower_nickname: nil + config :pleroma, :rich_media, enabled: true, ignore_hosts: [], @@ -654,6 +661,10 @@ config :pleroma, :oauth2, config :pleroma, :database, rum_enabled: false +config :pleroma, :features, improved_hashtag_timeline: :auto + +config :pleroma, :populate_hashtags_table, fault_rate_allowance: 0.01 + config :pleroma, :env, Mix.env() config :http_signatures, |