X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=e7d1014bb6f5300c17b6dd34e82b0e2f364f8605;hb=a61207cf8f218b34998ab8eec0db6b7f59b3ba8d;hp=6b513a2fedc8f05b8a4d9fa5d5135f9e174ba375;hpb=f191021f527623df23bead2978a0d4bfa1ce5bc1;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 6b513a2fe..e7d1014bb 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -221,8 +221,6 @@ config :pleroma, :instance,
     "text/markdown",
     "text/bbcode"
   ],
-  mrf_transparency: true,
-  mrf_transparency_exclusions: [],
   staff_transparency: [],
   autofollowed_nicknames: [],
   autofollowing_nicknames: [],
@@ -324,9 +322,6 @@ config :pleroma, :frontend_configurations,
     subjectLineBehavior: "email",
     theme: "pleroma-dark",
     webPushNotifications: false
-  },
-  masto_fe: %{
-    showInstanceSpecificPanel: true
   }
 
 config :pleroma, :assets,
@@ -355,6 +350,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,
@@ -463,7 +459,7 @@ config :pleroma, :shout,
   enabled: true,
   limit: 5_000
 
-config :phoenix, :format_encoders, json: Jason
+config :phoenix, :format_encoders, json: Jason, "activity+json": Jason
 
 config :phoenix, :json_library, Jason
 
@@ -563,6 +559,7 @@ config :pleroma, Oban,
     mailer: 10,
     transmogrifier: 20,
     scheduled_activities: 10,
+    poll_notifications: 10,
     background: 5,
     remote_fetcher: 2,
     attachments_cleanup: 1,