pleroma

commit: 0be7eada92d862277c3bf349ca5a3079ebacb700
parent 2743c6669311ecb9a985a959dfd28b7aeed8783a
Author: Mark Felder <feld@feld.me>
Date:   Tue,  1 Jun 2021 14:34:13 -0500

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.

Diffstat:
M
lib/pleroma/web/channels/user_socket.ex
2
+-
M
lib/pleroma/web/shout_channel.ex
5
+----

2 files changed, 2 insertions(+), 5 deletions(-)
diff --git 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
@@ -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