squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Keep original Shoutbox channel name as chat:public

Browse Source 
There is no sane / high level workaround for merging users who join shout:public and chat:public.
This commit is contained in:
Mark Felder 2021-06-01 14:34:13 -05:00
parent 2743c66693
commit 0be7eada92
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/channels/user_socket.ex
View File

@ -8,7 +8,7 @@ defmodule Pleroma.Web.UserSocket do
## Channels ## Channels
# channel "room:*", Pleroma.Web.RoomChannel # channel "room:*", Pleroma.Web.RoomChannel
channel("shout:*", Pleroma.Web.ShoutChannel) channel("chat:*", Pleroma.Web.ShoutChannel)
# Socket params are passed from the client and can # Socket params are passed from the client and can
# be used to verify and authenticate a user. After # be used to verify and authenticate a user. After

5
lib/pleroma/web/shout_channel.ex
View File

@ -9,10 +9,7 @@ defmodule Pleroma.Web.ShoutChannel do
alias Pleroma.Web.MastodonAPI.AccountView alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.ShoutChannel.ShoutChannelState alias Pleroma.Web.ShoutChannel.ShoutChannelState
# Backwards compatibility def join("chat:public", _message, socket) do
def join("chat:public", message, socket), do: join("shout:public", message, socket)
def join("shout:public", _message, socket) do
send(self(), :after_join) send(self(), :after_join)
{:ok, socket} {:ok, socket}
end end