X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=b50c910b12b985ed1c8f6311fc6b8a25c6f8c550;hb=ce4560c2a1c194f7640accf1205e91bf40779043;hp=d333c618ecb28c6b7604ac9bbe86c80c87859417;hpb=a833a2d76bf5bc9597c8f39f7883963493f90d14;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index d333c618e..b50c910b1 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -190,7 +190,6 @@ config :pleroma, :instance,
   instance_thumbnail: "/instance/thumbnail.jpeg",
   limit: 5_000,
   description_limit: 5_000,
-  chat_limit: 5_000,
   remote_limit: 100_000,
   upload_limit: 16_000_000,
   avatar_upload_limit: 2_000_000,
@@ -457,9 +456,11 @@ config :pleroma, :media_preview_proxy,
   image_quality: 85,
   min_content_length: 100 * 1024
 
-config :pleroma, :chat, enabled: true
+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