Revert "Merge branch 'streamer-refactoring' into 'develop'"

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 6fb4a09695524cdf1e522e01f05c30fdc5ccc390..ab6e00c9841674b4e7bfb5c4fcb0cbd173bb1cba 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -54,7 +54,7 @@ config :pleroma, Pleroma.Repo,
 scheduled_jobs =
   with digest_config <- Application.get_env(:pleroma, :email_notifications)[:digest],
        true <- digest_config[:active] do
-    [{digest_config[:schedule], {Pleroma.DigestEmailWorker, :perform, []}}]
+    [{digest_config[:schedule], {Pleroma.Daemons.DigestEmailDaemon, :perform, []}}]
   else
     _ -> []
   end
@@ -391,6 +391,8 @@ config :pleroma, :chat, enabled: true
 
 config :phoenix, :format_encoders, json: Jason
 
+config :phoenix, :json_library, Jason
+
 config :pleroma, :gopher,
   enabled: false,
   ip: {0, 0, 0, 0},
@@ -583,6 +585,10 @@ config :pleroma, :rate_limit, nil
 
 config :pleroma, Pleroma.ActivityExpiration, enabled: true
 
+config :pleroma, :web_cache_ttl,
+  activity_pub: nil,
+  activity_pub_question: 30_000
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"