Detect and try to stream incoming "direct" messages
This commit is contained in:
parent
ffe028cd73
commit
c60a5405db
2 changed files with 11 additions and 6 deletions
|
@ -42,13 +42,18 @@ def insert(map, local \\ true) when is_map(map) do
|
|||
def stream_out(activity) do
|
||||
if activity.data["type"] in ["Create", "Announce"] do
|
||||
Pleroma.Web.Streamer.stream("user", activity)
|
||||
direct? = activity.data["object"]["visibility"] == "direct"
|
||||
|
||||
if Enum.member?(activity.data["to"], "https://www.w3.org/ns/activitystreams#Public") do
|
||||
Pleroma.Web.Streamer.stream("public", activity)
|
||||
cond do
|
||||
direct? ->
|
||||
Pleroma.Web.Streamer.stream("direct", activity)
|
||||
|
||||
if activity.local do
|
||||
Pleroma.Web.Streamer.stream("public:local", activity)
|
||||
end
|
||||
Enum.member?(activity.data["to"], "https://www.w3.org/ns/activitystreams#Public") ->
|
||||
Pleroma.Web.Streamer.stream("public", activity)
|
||||
|
||||
if activity.local do
|
||||
Pleroma.Web.Streamer.stream("public:local", activity)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -15,7 +15,7 @@ def connect(params, socket) do
|
|||
with token when not is_nil(token) <- params["access_token"],
|
||||
%Token{user_id: user_id} <- Repo.get_by(Token, token: token),
|
||||
%User{} = user <- Repo.get(User, user_id),
|
||||
stream when stream in ["public", "public:local", "user"] <- params["stream"] do
|
||||
stream when stream in ["public", "public:local", "user", "direct"] <- params["stream"] do
|
||||
socket =
|
||||
socket
|
||||
|> assign(:topic, params["stream"])
|
||||
|
|
Loading…
Reference in a new issue