From 77b5154c825e2ff5996f170c03657eaadcef4680 Mon Sep 17 00:00:00 2001
From: href <href@random.sh>
Date: Mon, 17 Dec 2018 14:39:59 +0100
Subject: Cowboy handler for Mastodon WebSocket

---
 config/config.exs | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 1777a54c0..df6ea09ae 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -50,6 +50,15 @@ config :pleroma, :uri_schemes,
 # Configures the endpoint
 config :pleroma, Pleroma.Web.Endpoint,
   url: [host: "localhost"],
+  http: [
+    dispatch: [
+      {:_,
+       [
+         {"/api/v1/streaming", Elixir.Pleroma.Web.MastodonAPI.WebsocketHandler, []},
+         {:_, Plug.Adapters.Cowboy.Handler, {Pleroma.Web.Endpoint, []}}
+       ]}
+    ]
+  ],
   protocol: "https",
   secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
   signing_salt: "CqaoopA2",
-- 
cgit v1.2.3


From b12a90491156f1b31defd7aa1b322a86867dbf2b Mon Sep 17 00:00:00 2001
From: href <href@random.sh>
Date: Mon, 17 Dec 2018 17:09:06 +0100
Subject: Integration tests for mastodon websocket

---
 config/test.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index 5c6acfead..8f4a2dc17 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -4,7 +4,8 @@ use Mix.Config
 # you can enable the server option below.
 config :pleroma, Pleroma.Web.Endpoint,
   http: [port: 4001],
-  server: false
+  url: [port: 4001],
+  server: true
 
 # Print only warnings and errors during test
 config :logger, level: :warn
-- 
cgit v1.2.3