Keep original Shoutbox channel name as chat:public

There is no sane / high level workaround for merging users who join shout:public and chat:public.

diff --git a/lib/pleroma/web/channels/user_socket.ex b/lib/pleroma/web/channels/user_socket.ex
index 130809bb79ce293114b0ca774f3d6e0d96e26d7c..043206835221d71ab63509fa530ba8679a56db64 100644 (file)
--- a/lib/pleroma/web/channels/user_socket.ex
+++ b/lib/pleroma/web/channels/user_socket.ex
@@ -8,7 +8,7 @@ defmodule Pleroma.Web.UserSocket do
 
   ## Channels
   # channel "room:*", Pleroma.Web.RoomChannel
-  channel("shout:*", Pleroma.Web.ShoutChannel)
+  channel("chat:*", Pleroma.Web.ShoutChannel)
 
   # Socket params are passed from the client and can
   # be used to verify and authenticate a user. After

diff --git a/lib/pleroma/web/shout_channel.ex b/lib/pleroma/web/shout_channel.ex
index 70d9cc1e193594da2530d205924473baa7ff7def..17caecb1ad5e7f1f310e676f8a0d6152c12ffa93 100644 (file)
--- a/lib/pleroma/web/shout_channel.ex
+++ b/lib/pleroma/web/shout_channel.ex
@@ -9,10 +9,7 @@ defmodule Pleroma.Web.ShoutChannel do
   alias Pleroma.Web.MastodonAPI.AccountView
   alias Pleroma.Web.ShoutChannel.ShoutChannelState
 
-  # Backwards compatibility
-  def join("chat:public", message, socket), do: join("shout:public", message, socket)
-
-  def join("shout:public", _message, socket) do
+  def join("chat:public", _message, socket) do
     send(self(), :after_join)
     {:ok, socket}
   end