projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into cycles-reverse-proxy
[akkoma]
/
lib
/
pleroma
/
web
/
shout_channel.ex
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
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
send(self(), :after_join)
{:ok, socket}
end