X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=config%2Fconfig.exs;h=66d394655657869f8f8346fdb4a070eb506e5d6a;hb=3af7db9fd7bbd3e5396c43b66f0b55b24ddd69d8;hp=07565c557b96803ed19434bdb61234e6b84f6d22;hpb=fa2e62078caeae415fcff7a1cc0503defd05c2de;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 07565c557..66d394655 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -41,7 +41,7 @@
 #
 # This configuration file is loaded before any dependency and
 # is restricted to this project.
-use Mix.Config
+import Config
 
 # General application configuration
 config :pleroma, ecto_repos: [Pleroma.Repo]
@@ -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,
@@ -454,9 +453,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
 
@@ -556,6 +557,7 @@ config :pleroma, Oban,
     mailer: 10,
     transmogrifier: 20,
     scheduled_activities: 10,
+    poll_notifications: 10,
     background: 5,
     remote_fetcher: 2,
     attachments_cleanup: 1,