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 moderators
[akkoma]
/
lib
/
pleroma
/
web
/
channels
/
user_socket.ex
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
## Channels
# channel "room:*", Pleroma.Web.RoomChannel
- channel("
shou
t:*", Pleroma.Web.ShoutChannel)
+ channel("
cha
t:*", Pleroma.Web.ShoutChannel)
# Socket params are passed from the client and can
# be used to verify and authenticate a user. After
# Socket params are passed from the client and can
# be used to verify and authenticate a user. After