diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-10-07 13:28:39 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-10-07 13:28:39 -0500 |
| commit | 8156940a49df17c00c05bfe60223b165f9dc034b (patch) | |
| tree | b415604986f4def1e911c42b28235b75597738f3 /lib | |
| parent | 70880d54f85a96d07b6c72adfbf3f1a7c50f95a2 (diff) | |
| download | pleroma-8156940a49df17c00c05bfe60223b165f9dc034b.tar.gz pleroma-8156940a49df17c00c05bfe60223b165f9dc034b.zip | |
Compatibility with phoenix_pubsub 2.0.0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/application.ex | 5 | ||||
| -rw-r--r-- | lib/pleroma/web/web.ex | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 02dd39939..fe94b56f4 100644 --- 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 index 4f9281851..c319d223c 100644 --- 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 |