Merge branch 'develop' into feature/custom-runtime-modules

[akkoma] / lib / pleroma / application.ex

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index f47cb0ce97e4f495c2300b74712e640b65f24823..2ae052069da301d0032579b6a282f5bd7e40d5e9 100644 (file)
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -31,6 +31,7 @@ defmodule Pleroma.Application do
   # See http://elixir-lang.org/docs/stable/elixir/Application.html
   # for more information on OTP Applications
   def start(_type, _args) do
+    Pleroma.HTML.compile_scrubbers()
     Pleroma.Config.DeprecationWarnings.warn()
     setup_instrumenters()
     load_custom_modules()
@@ -171,8 +172,6 @@ defmodule Pleroma.Application do
 
   defp oauth_cleanup_child(_), do: []
 
-  defp chat_child(:test, _), do: []
-
   defp chat_child(_env, true) do
     [Pleroma.Web.ChatChannel.ChatChannelState]
   end