projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MastoAPI: Fix always-sensitive bugs.
[akkoma]
/
lib
/
pleroma
/
web
/
chat_channel.ex
diff --git
a/lib/pleroma/web/chat_channel.ex
b/lib/pleroma/web/chat_channel.ex
index c2277d73dd2da2933a9924d5a963be82ca95d16a..268bef17d2f17f51ead73e60991246f8ab2e518b 100644
(file)
--- a/
lib/pleroma/web/chat_channel.ex
+++ b/
lib/pleroma/web/chat_channel.ex
@@
-1,6
+1,7
@@
defmodule Pleroma.Web.ChatChannel do
use Phoenix.Channel
alias Pleroma.Web.ChatChannel.ChatChannelState
defmodule Pleroma.Web.ChatChannel do
use Phoenix.Channel
alias Pleroma.Web.ChatChannel.ChatChannelState
+ alias Pleroma.User
def join("chat:public", _message, socket) do
send(self(), :after_join)
def join("chat:public", _message, socket) do
send(self(), :after_join)
@@
-12,10
+13,10
@@
defmodule Pleroma.Web.ChatChannel do
{:noreply, socket}
end
{:noreply, socket}
end
- def handle_in("new_msg", %{"text" => text}, socket) do
- author =
socket.assigns[:user]
+ def handle_in("new_msg", %{"text" => text},
%{assigns: %{user_name: user_name}} =
socket) do
+ author =
User.get_cached_by_nickname(user_name)
author = Pleroma.Web.MastodonAPI.AccountView.render("account.json", user: author)
author = Pleroma.Web.MastodonAPI.AccountView.render("account.json", user: author)
- message= ChatChannelState.add_message(%{text: text, author: author})
+ message
= ChatChannelState.add_message(%{text: text, author: author})
broadcast! socket, "new_msg", message
{:noreply, socket}
broadcast! socket, "new_msg", message
{:noreply, socket}