pleroma

commit: 8156940a49df17c00c05bfe60223b165f9dc034b
parent 70880d54f85a96d07b6c72adfbf3f1a7c50f95a2
Author: Mark Felder <feld@FreeBSD.org>
Date:   Wed,  7 Oct 2020 13:28:39 -0500

Compatibility with phoenix_pubsub 2.0.0

Diffstat:
M
lib/pleroma/application.ex
5
++++-
M
lib/pleroma/web/web.ex
2
+-
M
test/support/channel_case.ex
2
+-

3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
@@ -202,7 +202,10 @@ defmodule Pleroma.Application do
   end
 
   defp chat_child(true) do
-    [Pleroma.Web.ChatChannel.ChatChannelState]
+    [
+      Pleroma.Web.ChatChannel.ChatChannelState,
+      {Phoenix.PubSub, [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2]}
+    ]
   end
 
   defp chat_child(_), do: []
diff --git a/lib/pleroma/web/web.ex b/lib/pleroma/web/web.ex
@@ -177,7 +177,7 @@ defmodule Pleroma.Web do
   def channel do
     quote do
       # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
-      use Phoenix.Channel
+      import Phoenix.Channel
       import Pleroma.Web.Gettext
     end
   end
diff --git a/test/support/channel_case.ex b/test/support/channel_case.ex
@@ -22,7 +22,7 @@ defmodule Pleroma.Web.ChannelCase do
   using do
     quote do
       # Import conveniences for testing with channels
-      use Phoenix.ChannelTest
+      import Phoenix.ChannelTest
       use Pleroma.Tests.Helpers
 
       # The default endpoint for testing