Merge branch 'develop' into issue/1383

diff --combined lib/pleroma/application.ex
index 0f7b40840e79ef22c7695251aefc5ff972a82390,5b844aa413d03ba124bdd3bb591a406459164aef..ab7f6d50215f2307641b2a23222b2b481af494ea
--- 1/lib/pleroma/application.ex
--- 2/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@@ -30,6 -30,7 +30,7 @@@ defmodule Pleroma.Application d
    # 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()
  
@@@ -37,9 -38,12 +38,9 @@@
      children =
        [
          Pleroma.Repo,
 -        Pleroma.Scheduler,
          Pleroma.Config.TransferTask,
          Pleroma.Emoji,
          Pleroma.Captcha,
 -        Pleroma.Daemons.ScheduledActivityDaemon,
 -        Pleroma.Daemons.ActivityExpirationDaemon,
          Pleroma.Plugs.RateLimiter.Supervisor
        ] ++
          cachex_children() ++
@@@ -50,6 -54,7 +51,6 @@@
            {Oban, Pleroma.Config.get(Oban)}
          ] ++
          task_children(@env) ++
 -        oauth_cleanup_child(oauth_cleanup_enabled?()) ++
          streamer_child(@env) ++
          chat_child(@env, chat_enabled?()) ++
          [
@@@ -129,12 -134,20 +130,12 @@@
  
    defp chat_enabled?, do: Pleroma.Config.get([:chat, :enabled])
  
 -  defp oauth_cleanup_enabled?,
 -    do: Pleroma.Config.get([:oauth2, :clean_expired_tokens], false)
 -
    defp streamer_child(:test), do: []
  
    defp streamer_child(_) do
      [Pleroma.Web.Streamer.supervisor()]
    end
  
 -  defp oauth_cleanup_child(true),
 -    do: [Pleroma.Web.OAuth.Token.CleanWorker]
 -
 -  defp oauth_cleanup_child(_), do: []
 -
    defp chat_child(_env, true) do
      [Pleroma.Web.ChatChannel.ChatChannelState]
    end