projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'unify-mastodon-oauth' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
mastodon_socket.ex
diff --git
a/lib/pleroma/web/mastodon_api/mastodon_socket.ex
b/lib/pleroma/web/mastodon_api/mastodon_socket.ex
index 17429390677b13328e74327622cb06210cbfd8f0..bc628ba566fb6a858d3c458a07fb9e711d7e4427 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/mastodon_socket.ex
+++ b/
lib/pleroma/web/mastodon_api/mastodon_socket.ex
@@
-23,16
+23,18
@@
defmodule Pleroma.Web.MastodonAPI.MastodonSocket do
"public:local:media",
"user",
"direct",
"public:local:media",
"user",
"direct",
- "list"
+ "list",
+ "hashtag"
] <- params["stream"] do
topic = if stream == "list", do: "list:#{params["list"]}", else: stream
] <- params["stream"] do
topic = if stream == "list", do: "list:#{params["list"]}", else: stream
+ socket_stream = if stream == "hashtag", do: "hashtag:#{params["tag"]}", else: stream
socket =
socket
|> assign(:topic, topic)
|> assign(:user, user)
socket =
socket
|> assign(:topic, topic)
|> assign(:user, user)
- Pleroma.Web.Streamer.add_socket(
params["stream"]
, socket)
+ Pleroma.Web.Streamer.add_socket(
socket_stream
, socket)
{:ok, socket}
else
_e -> :error
{:ok, socket}
else
_e -> :error