projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'features/cleanup-incoming-actor' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
chat_channel.ex
diff --git
a/lib/pleroma/web/chat_channel.ex
b/lib/pleroma/web/chat_channel.ex
index ddc1d6f80ebb026f5c6da12ffd1baf68b466e76d..840414933463d2d74482ec48b29b62de0402cded 100644
(file)
--- a/
lib/pleroma/web/chat_channel.ex
+++ b/
lib/pleroma/web/chat_channel.ex
@@
-1,7
+1,11
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.ChatChannel do
use Phoenix.Channel
defmodule Pleroma.Web.ChatChannel do
use Phoenix.Channel
- alias Pleroma.Web.ChatChannel.ChatChannelState
alias Pleroma.User
alias Pleroma.User
+ alias Pleroma.Web.ChatChannel.ChatChannelState
def join("chat:public", _message, socket) do
send(self(), :after_join)
def join("chat:public", _message, socket) do
send(self(), :after_join)
@@
-9,27
+13,31
@@
defmodule Pleroma.Web.ChatChannel do
end
def handle_info(:after_join, socket) do
end
def handle_info(:after_join, socket) do
- push
socket, "messages", %{messages: ChatChannelState.messages()}
+ push
(socket, "messages", %{messages: ChatChannelState.messages()})
{:noreply, socket}
end
def handle_in("new_msg", %{"text" => text}, %{assigns: %{user_name: user_name}} = socket) do
text = String.trim(text)
{:noreply, socket}
end
def handle_in("new_msg", %{"text" => text}, %{assigns: %{user_name: user_name}} = socket) do
text = String.trim(text)
- if String.length(text) > 0 do
+
+ if String.length(text) in 1..Pleroma.Config.get([:instance, :chat_limit]) do
author = User.get_cached_by_nickname(user_name)
author = User.get_cached_by_nickname(user_name)
- author = Pleroma.Web.MastodonAPI.AccountView.render("
account
.json", user: author)
+ author = Pleroma.Web.MastodonAPI.AccountView.render("
show
.json", user: author)
message = ChatChannelState.add_message(%{text: text, author: author})
message = ChatChannelState.add_message(%{text: text, author: author})
- broadcast!
socket, "new_msg", message
+ broadcast!
(socket, "new_msg", message)
end
end
+
{:noreply, socket}
end
end
defmodule Pleroma.Web.ChatChannel.ChatChannelState do
{:noreply, socket}
end
end
defmodule Pleroma.Web.ChatChannel.ChatChannelState do
+ use Agent
+
@max_messages 20
@max_messages 20
- def start_link do
+ def start_link
(_)
do
Agent.start_link(fn -> %{max_id: 1, messages: []} end, name: __MODULE__)
end
Agent.start_link(fn -> %{max_id: 1, messages: []} end, name: __MODULE__)
end
@@
-42,7
+50,7
@@
defmodule Pleroma.Web.ChatChannel.ChatChannelState do
end)
end
end)
end
- def messages
()
do
- Agent.get(__MODULE__, fn state -> state[:messages] |> Enum.reverse end)
+ def messages do
+ Agent.get(__MODULE__, fn state -> state[:messages] |> Enum.reverse
()
end)
end
end
end
end