X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=config%2Fconfig.exs;h=dc9ae59aeb9e9eb1c8a9502973bfb364ca164830;hb=50a644a2215a144e54a9f9d2a5216bec4e717405;hp=66aee3264a0fa0a305a6748ceba77d1b846d1369;hpb=e6a14e1cd10a52450eaf3d1ba258eac4042d82a9;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 66aee3264..dc9ae59ae 100644
--- 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,
@@ -391,6 +394,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 +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: [],
@@ -654,6 +664,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,