Merge remote-tracking branch 'upstream/develop' into block-behavior

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index d53663d360154a9c2b94c4b841ef1fad1e76cf3f..0853a5946f9749d5231242f08e74a84e63d1d24e 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -363,6 +363,7 @@ config :pleroma, :manifest,
 config :pleroma, :activitypub,
   unfollow_blocked: true,
   outgoing_blocks: true,
+  blockers_visible: true,
   follow_handshake_timeout: 500,
   note_replies_output_limit: 5,
   sign_object_fetches: true,
@@ -677,7 +678,7 @@ config :pleroma, :rate_limit,
 
 config :pleroma, Pleroma.Workers.PurgeExpiredActivity, enabled: true, min_lifetime: 600
 
-config :pleroma, Pleroma.Plugs.RemoteIp,
+config :pleroma, Pleroma.Web.Plugs.RemoteIp,
   enabled: true,
   headers: ["x-forwarded-for"],
   proxies: [],