hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't return activities from blocked users.

Browse source
This commit is contained in:
Roger Braun 2017-11-02 22:37:26 +01:00
commit a47727adde
2 changed files with 27 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -163,6 +163,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
where: activity.id > ^since
end
defp restrict_blocked(query, %{"blocking_user" => user}) do
blocks = user.info["blocks"] || []
from activity in query,
where: fragment("not (?->>'actor' = ANY(?))", activity.data, ^blocks)
end
defp restrict_blocked(query, _), do: query
def fetch_activities(recipients, opts \\ %{}) do
base_query = from activity in Activity,
limit: 20,
@ -178,6 +185,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|> restrict_type(opts)
|> restrict_favorited_by(opts)
|> restrict_recent(opts)
|> restrict_blocked(opts)
|> Repo.all
|> Enum.reverse
end