diff options
| author | Marcin Mikołajczak <git@mkljczk.pl> | 2023-11-08 20:46:57 +0100 |
|---|---|---|
| committer | Marcin Mikołajczak <git@mkljczk.pl> | 2023-11-08 20:46:57 +0100 |
| commit | 1e9333a9aa5f15dd9cbea826ee42561e4a9d12c3 (patch) | |
| tree | 923fa49e845b97b99c65855de3113b444253e10c /config/config.exs | |
| parent | c6cedbb8106a16527e48ac8ae03907e1d66c5a1b (diff) | |
| parent | a51f3937eef0c6add91234863d5f936c59830d88 (diff) | |
| download | pleroma-1e9333a9aa5f15dd9cbea826ee42561e4a9d12c3.tar.gz pleroma-1e9333a9aa5f15dd9cbea826ee42561e4a9d12c3.zip | |
Merge remote-tracking branch 'origin/develop' into instance-v2
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index ebcbf8b49..ad3a98f46 100644 --- a/config/config.exs +++ b/config/config.exs @@ -434,6 +434,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: [], @@ -588,7 +590,6 @@ config :pleroma, Oban, background: 5, remote_fetcher: 2, attachments_cleanup: 1, - new_users_digest: 1, mute_expire: 5 ], plugins: [Oban.Plugins.Pruner], @@ -858,7 +859,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: [] |