projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
websocket_handler.ex
diff --git
a/lib/pleroma/web/mastodon_api/websocket_handler.ex
b/lib/pleroma/web/mastodon_api/websocket_handler.ex
index 0d1faffbd57f1ad78433205796ae31578f419d50..b978167b6288f95b3e8b042fb0b9625c2429e37f 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/websocket_handler.ex
+++ b/
lib/pleroma/web/mastodon_api/websocket_handler.ex
@@
-49,9
+49,7
@@
defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
def websocket_init(state) do
Logger.debug(
def websocket_init(state) do
Logger.debug(
- "#{__MODULE__} accepted websocket connection for user #{
- (state.user || %{id: "anonymous"}).id
- }, topic #{state.topic}"
+ "#{__MODULE__} accepted websocket connection for user #{(state.user || %{id: "anonymous"}).id}, topic #{state.topic}"
)
Streamer.add_socket(state.topic, state.user)
)
Streamer.add_socket(state.topic, state.user)
@@
-106,9
+104,7
@@
defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
def terminate(reason, _req, state) do
Logger.debug(
def terminate(reason, _req, state) do
Logger.debug(
- "#{__MODULE__} terminating websocket connection for user #{
- (state.user || %{id: "anonymous"}).id
- }, topic #{state.topic || "?"}: #{inspect(reason)}"
+ "#{__MODULE__} terminating websocket connection for user #{(state.user || %{id: "anonymous"}).id}, topic #{state.topic || "?"}: #{inspect(reason)}"
)
Streamer.remove_socket(state.topic)
)
Streamer.remove_socket(state.topic)