diff options
| author | Mark Felder <feld@feld.me> | 2023-11-07 16:05:04 -0500 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2023-11-07 16:05:04 -0500 |
| commit | a0e08c6ec21b724432ac77eb395a18e6f8e2a093 (patch) | |
| tree | 879947cf9b932c2c312b604d8768bc7e472234e1 /config/config.exs | |
| parent | 63ef1dcedca7fb315f611388e477d3847d1acaa1 (diff) | |
| parent | 11c520607fcb2bf5b8323d1b22b3123acf12efe1 (diff) | |
| download | pleroma-a0e08c6ec21b724432ac77eb395a18e6f8e2a093.tar.gz pleroma-a0e08c6ec21b724432ac77eb395a18e6f8e2a093.zip | |
Merge branch 'develop' into phoenix1.7
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index fb1903db9..fffa543f0 100644 --- a/config/config.exs +++ b/config/config.exs @@ -394,6 +394,12 @@ config :pleroma, :mrf_keyword, federated_timeline_removal: [], replace: [] +config :pleroma, :mrf_emoji, + remove_url: [], + remove_shortcode: [], + federated_timeline_removal_url: [], + federated_timeline_removal_shortcode: [] + config :pleroma, :mrf_hashtag, sensitive: ["nsfw"], reject: [], @@ -414,6 +420,8 @@ config :pleroma, :mrf_object_age, config :pleroma, :mrf_follow_bot, follower_nickname: nil +config :pleroma, :mrf_inline_quote, template: "<bdi>RT:</bdi> {url}" + config :pleroma, :rich_media, enabled: true, ignore_hosts: [], @@ -568,7 +576,6 @@ config :pleroma, Oban, background: 5, remote_fetcher: 2, attachments_cleanup: 1, - new_users_digest: 1, mute_expire: 5 ], plugins: [Oban.Plugins.Pruner], @@ -838,7 +845,11 @@ config :pleroma, :restrict_unauthenticated, config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false config :pleroma, :mrf, - policies: [Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy, Pleroma.Web.ActivityPub.MRF.TagPolicy], + policies: [ + Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy, + Pleroma.Web.ActivityPub.MRF.TagPolicy, + Pleroma.Web.ActivityPub.MRF.InlineQuotePolicy + ], transparency: true, transparency_exclusions: [] @@ -857,7 +868,9 @@ config :pleroma, Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.PleromaAuthent config :pleroma, Pleroma.User.Backup, purge_after_days: 30, limit_days: 7, - dir: nil + dir: nil, + process_wait_time: 30_000, + process_chunk_size: 100 config :pleroma, ConcurrentLimiter, [ {Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]}, |