norm/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compatibility with phoenix_pubsub 2.0.0

Browse source
This commit is contained in:
Mark Felder 2020-10-07 13:28:39 -05:00
parent 70880d54f8
commit 8156940a49
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/application.ex
View file

@ -202,7 +202,10 @@ defp dont_run_in_test(_) do
end end
defp chat_child(true) do defp chat_child(true) do
[Pleroma.Web.ChatChannel.ChatChannelState] [
Pleroma.Web.ChatChannel.ChatChannelState,
{Phoenix.PubSub, [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2]}
]
end end
defp chat_child(_), do: [] defp chat_child(_), do: []

2
lib/pleroma/web/web.ex
View file

@ -177,7 +177,7 @@ def router do
def channel do def channel do
quote do quote do
# credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse
use Phoenix.Channel import Phoenix.Channel
import Pleroma.Web.Gettext import Pleroma.Web.Gettext
end end
end end

2
test/support/channel_case.ex
View file

@ -22,7 +22,7 @@ defmodule Pleroma.Web.ChannelCase do
using do using do
quote do quote do
# Import conveniences for testing with channels # Import conveniences for testing with channels
use Phoenix.ChannelTest import Phoenix.ChannelTest
use Pleroma.Tests.Helpers use Pleroma.Tests.Helpers
# The default endpoint for testing # The default endpoint for testing