Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 8d1e17b42bd44d58accaf52e24b9f742e67fcbfd..dc9ae59aeb9e9eb1c8a9502973bfb364ca164830 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -222,6 +222,9 @@ config :pleroma, :instance,
     "text/markdown",
     "text/bbcode"
   ],
+  mrf_transparency: true,
+  mrf_transparency_exclusions: [],
+  staff_transparency: [],
   autofollowed_nicknames: [],
   autofollowing_nicknames: [],
   max_pinned_statuses: 1,
@@ -409,6 +412,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: [],