Merge branch 'fix-chat' into 'develop'

Add handler for Phoenix-style socket.

See merge request pleroma/pleroma!619

diff --combined config/config.exs
index d743406dc898c5b4b02e24197adc26b4e23190a5,7fad1138f4902ad286bc5f0a553e00d1f1cb88e2..11ee220e737b2054f04f733059164fdee6558e41
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -54,6 -54,17 +54,17 @@@ config :pleroma, :uri_schemes
      "xmpp"
    ]
  
+ websocket_config = [
+   path: "/websocket",
+   serializer: [
+     {Phoenix.Socket.V1.JSONSerializer, "~> 1.0.0"},
+     {Phoenix.Socket.V2.JSONSerializer, "~> 2.0.0"}
+   ],
+   timeout: 60_000,
+   transport_log: false,
+   compress: false
+ ]
+ 
  # Configures the endpoint
  config :pleroma, Pleroma.Web.Endpoint,
    url: [host: "localhost"],
@@@ -62,6 -73,8 +73,8 @@@
        {:_,
         [
           {"/api/v1/streaming", Elixir.Pleroma.Web.MastodonAPI.WebsocketHandler, []},
+          {"/socket/websocket", Phoenix.Endpoint.CowboyWebSocket,
+           {nil, {Pleroma.Web.Endpoint, Pleroma.Web.UserSocket, websocket_config}}},
           {:_, Plug.Adapters.Cowboy.Handler, {Pleroma.Web.Endpoint, []}}
         ]}
      ]
@@@ -249,18 -262,9 +262,18 @@@ config :pleroma, Pleroma.User
      "auth",
      "proxy",
      "dev",
 -    "internal"
 +    "internal",
 +    "media"
    ]
  
 +config :pleroma, Pleroma.Web.Federator, max_jobs: 50
 +
 +config :pleroma, Pleroma.Web.Federator.RetryQueue,
 +  enabled: false,
 +  max_jobs: 20,
 +  initial_timeout: 30,
 +  max_retries: 5
 +
  # 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"