projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'streamer-refactoring' 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 dbd3542eadcc57929addcbbad7f682fa95d34d2d..3c26eb4069b2a2fb7bad3986d680ee0ffe21fd01 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/websocket_handler.ex
+++ b/
lib/pleroma/web/mastodon_api/websocket_handler.ex
@@
-8,6
+8,7
@@
defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web.OAuth.Token
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web.OAuth.Token
+ alias Pleroma.Web.Streamer
@behaviour :cowboy_websocket
@behaviour :cowboy_websocket
@@
-24,7
+25,7
@@
defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
]
@anonymous_streams ["public", "public:local", "hashtag"]
]
@anonymous_streams ["public", "public:local", "hashtag"]
- # Handled by periodic keepalive in Pleroma.Web.Streamer.
+ # Handled by periodic keepalive in Pleroma.Web.Streamer.
Ping.
@timeout :infinity
def init(%{qs: qs} = req, state) do
@timeout :infinity
def init(%{qs: qs} = req, state) do
@@
-65,7
+66,7
@@
defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
}, topic #{state.topic}"
)
}, topic #{state.topic}"
)
-
Pleroma.Web.
Streamer.add_socket(state.topic, streamer_socket(state))
+ Streamer.add_socket(state.topic, streamer_socket(state))
{:ok, state}
end
{:ok, state}
end
@@
-80,7
+81,7
@@
defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
}, topic #{state.topic || "?"}: #{inspect(reason)}"
)
}, topic #{state.topic || "?"}: #{inspect(reason)}"
)
-
Pleroma.Web.
Streamer.remove_socket(state.topic, streamer_socket(state))
+ Streamer.remove_socket(state.topic, streamer_socket(state))
:ok
end
:ok
end