projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'get_announce_visibility-name' 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 ac28f300b645625a3ac639ae6a41f7b90ef6f29f..08841a3e8ca52faf749a51f4cc08761807bfbe4f 100644
(file)
--- a/
lib/pleroma/web/chat_channel.ex
+++ b/
lib/pleroma/web/chat_channel.ex
@@
-1,11
+1,11
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ChatChannel do
use Phoenix.Channel
# SPDX-License-Identifier: AGPL-3.0-only
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)
@@
-22,7
+22,7
@@
defmodule Pleroma.Web.ChatChannel do
if String.length(text) > 0 do
author = User.get_cached_by_nickname(user_name)
if String.length(text) > 0 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("
show
.json", user: author)
message = ChatChannelState.add_message(%{text: text, author: author})
broadcast!(socket, "new_msg", message)
message = ChatChannelState.add_message(%{text: text, author: author})
broadcast!(socket, "new_msg", message)
@@
-33,9
+33,11
@@
defmodule Pleroma.Web.ChatChannel do
end
defmodule Pleroma.Web.ChatChannel.ChatChannelState do
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
@@
-48,7
+50,7
@@
defmodule Pleroma.Web.ChatChannel.ChatChannelState do
end)
end
end)
end
- def messages
()
do
+ def messages do
Agent.get(__MODULE__, fn state -> state[:messages] |> Enum.reverse() end)
end
end
Agent.get(__MODULE__, fn state -> state[:messages] |> Enum.reverse() end)
end
end