From c3ac9424d2affe87df82c14dc243f507fa639343 Mon Sep 17 00:00:00 2001
From: Egor <egor@kislitsyn.com>
Date: Tue, 26 Feb 2019 23:32:26 +0000
Subject: AutoLinker

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 6119aaea1..7e4ac1100 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -344,6 +344,16 @@ config :pleroma, Pleroma.Jobs,
   federator_outgoing: [max_jobs: 50],
   mailer: [max_jobs: 10]
 
+config :auto_linker,
+  opts: [
+    scheme: true,
+    extra: true,
+    class: false,
+    strip_prefix: false,
+    new_window: false,
+    rel: false
+  ]
+
 # 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"
-- 
cgit v1.2.3


From 9aec00d71101b848aab6b61ad6c5335284fb339b Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Thu, 28 Feb 2019 15:43:38 +0000
Subject: config: update config for cowboy 2 endpoints

---
 config/config.exs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 7e4ac1100..374b4d86b 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -93,10 +93,10 @@ config :pleroma, Pleroma.Web.Endpoint,
     dispatch: [
       {:_,
        [
-         {"/api/v1/streaming", Elixir.Pleroma.Web.MastodonAPI.WebsocketHandler, []},
-         {"/socket/websocket", Phoenix.Endpoint.CowboyWebSocket,
+         {"/api/v1/streaming", 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, []}}
+         {:_, Phoenix.Endpoint.Cowboy2Handler, {Pleroma.Web.Endpoint, []}}
        ]}
     ]
   ],
-- 
cgit v1.2.3


From 6b2a1ad1c84b7ef350b0d0be76d6b2e03c633260 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Thu, 28 Feb 2019 16:58:00 +0000
Subject: config: fix chat endpoint path

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 374b4d86b..a620e7451 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -94,8 +94,9 @@ config :pleroma, Pleroma.Web.Endpoint,
       {:_,
        [
          {"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []},
-         {"/socket/websocket", Phoenix.Endpoint.CowboyWebsocket,
-          {nil, {Pleroma.Web.Endpoint, Pleroma.Web.UserSocket, websocket_config}}},
+         {"/websocket", Phoenix.Endpoint.CowboyWebSocket,
+          {Phoenix.Transports.WebSocket,
+           {Pleroma.Web.Endpoint, Pleroma.Web.UserSocket, websocket_config}}},
          {:_, Phoenix.Endpoint.Cowboy2Handler, {Pleroma.Web.Endpoint, []}}
        ]}
     ]
-- 
cgit v1.2.3