X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=b50c910b12b985ed1c8f6311fc6b8a25c6f8c550;hb=79e993cae5caac33ec2ebf63819e939e3352caf8;hp=8c8ed52249c97b26ca216deb6f0743144bdf12a6;hpb=ff00b354fa5067c898e860e275748dd757cb04cd;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 8c8ed5224..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,
-  shout_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, :shoutbox, 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