commit: 5719f69ae338bce2419a6ea572f34a68fda5d23c
parent: a2d7e0f4d49975a853080b65516c1dbd3143de93
Author: Roger Braun <rbraun@Bobble.local>
Date: Thu, 16 Nov 2017 13:48:58 +0100
MastodonAPI: Stream fixes.
Diffstat:
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -24,6 +24,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
:ok <- maybe_federate(activity) do
if activity.data["type"] == "Create" and Enum.member?(activity.data["to"], "https://www.w3.org/ns/activitystreams#Public") do
Pleroma.Web.Streamer.stream("public", activity)
+ if local do
+ Pleroma.Web.Streamer.stream("public:local", activity)
+ end
end
{:ok, activity}
end
diff --git a/lib/pleroma/web/mastodon_api/mastodon_socket.ex b/lib/pleroma/web/mastodon_api/mastodon_socket.ex
@@ -1,17 +1,24 @@
defmodule Pleroma.Web.MastodonAPI.MastodonSocket do
use Phoenix.Socket
+ alias Pleroma.Web.OAuth.Token
+ alias Pleroma.{User, Repo}
+
transport :streaming, Phoenix.Transports.WebSocket.Raw,
timeout: :infinity # We never receive data.
def connect(params, socket) do
- if params["stream"] == "public" 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"] <- params["stream"] do
socket = socket
|> assign(:topic, params["stream"])
+ |> assign(:user, user)
Pleroma.Web.Streamer.add_socket(params["stream"], socket)
{:ok, socket}
else
- :error
+ _e -> :error
end
end
diff --git a/lib/pleroma/web/streamer.ex b/lib/pleroma/web/streamer.ex
@@ -43,7 +43,7 @@ defmodule Pleroma.Web.Streamer do
Enum.each(topics[topic] || [], fn (socket) ->
json = %{
event: "update",
- payload: Pleroma.Web.MastodonAPI.StatusView.render("status.json", activity: item) |> Poison.encode!
+ payload: Pleroma.Web.MastodonAPI.StatusView.render("status.json", activity: item, for: socket.assigns[:user]) |> Poison.encode!
} |> Poison.encode!
send socket.transport_pid, {:text, json}