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.
This commit is contained in:
parent
2743c66693
commit
0be7eada92
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue