diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-05-19 14:27:59 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-05-19 14:27:59 -0500 |
| commit | 0461794375ebd22a91548f20d736da624e38c06a (patch) | |
| tree | 2d579f1d08c264c32d4692ceaf0468158211b775 /config/config.exs | |
| parent | e3173a279dad89dfce6eae89368ad3ba180c0490 (diff) | |
| parent | 8e9f032f25251d910b59c55226d10a305bad3cba (diff) | |
| download | pleroma-0461794375ebd22a91548f20d736da624e38c06a.tar.gz pleroma-0461794375ebd22a91548f20d736da624e38c06a.zip | |
Merge remote-tracking branch 'pleroma/develop' into plug-runtime-dev
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, |