Merge branch 'bugfix/mastodon-streaming-blocks' into 'develop'

streamer: don't relay boosts of messages which would otherwise be blocked

Closes #204

See merge request pleroma/pleroma!215
This commit is contained in:
lambda 2018-06-14 07:12:21 +00:00
commit 408152e232
1 changed files with 30 additions and 15 deletions

View File

@ -1,7 +1,7 @@
defmodule Pleroma.Web.Streamer do defmodule Pleroma.Web.Streamer do
use GenServer use GenServer
require Logger require Logger
alias Pleroma.{User, Notification} alias Pleroma.{User, Notification, Activity, Object}
def init(args) do def init(args) do
{:ok, args} {:ok, args}
@ -138,6 +138,34 @@ def handle_cast(m, state) do
{:noreply, state} {:noreply, state}
end end
defp represent_update(%Activity{} = activity, %User{} = user) do
%{
event: "update",
payload:
Pleroma.Web.MastodonAPI.StatusView.render(
"status.json",
activity: activity,
for: user
)
|> Jason.encode!()
}
|> Jason.encode!()
end
def push_to_socket(topics, topic, %Activity{data: %{"type" => "Announce"}} = item) do
Enum.each(topics[topic] || [], fn socket ->
# Get the current user so we have up-to-date blocks etc.
user = User.get_cached_by_ap_id(socket.assigns[:user].ap_id)
blocks = user.info["blocks"] || []
parent = Object.get_by_ap_id(item.data["object"])
unless is_nil(parent) or item.actor in blocks or parent.data["actor"] in blocks do
send(socket.transport_pid, {:text, represent_update(item, user)})
end
end)
end
def push_to_socket(topics, topic, item) do def push_to_socket(topics, topic, item) do
Enum.each(topics[topic] || [], fn socket -> Enum.each(topics[topic] || [], fn socket ->
# Get the current user so we have up-to-date blocks etc. # Get the current user so we have up-to-date blocks etc.
@ -145,20 +173,7 @@ def push_to_socket(topics, topic, item) do
blocks = user.info["blocks"] || [] blocks = user.info["blocks"] || []
unless item.actor in blocks do unless item.actor in blocks do
json = send(socket.transport_pid, {:text, represent_update(item, user)})
%{
event: "update",
payload:
Pleroma.Web.MastodonAPI.StatusView.render(
"status.json",
activity: item,
for: user
)
|> Jason.encode!()
}
|> Jason.encode!()
send(socket.transport_pid, {:text, json})
end end
end) end)
end end