Don't return activities from blocked users.
This commit is contained in:
parent
632da6c927
commit
a47727adde
2 changed files with 27 additions and 0 deletions
|
@ -163,6 +163,13 @@ defp restrict_recent(query, _) 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 @@ def fetch_activities(recipients, opts \\ %{}) do
|
|||
|> restrict_type(opts)
|
||||
|> restrict_favorited_by(opts)
|
||||
|> restrict_recent(opts)
|
||||
|> restrict_blocked(opts)
|
||||
|> Repo.all
|
||||
|> Enum.reverse
|
||||
end
|
||||
|
|
|
@ -80,6 +80,25 @@ test "retrieves activities that have a given context" do
|
|||
end
|
||||
end
|
||||
|
||||
test "doesn't return blocked activities" do
|
||||
activity_one = insert(:note_activity)
|
||||
activity_two = insert(:note_activity)
|
||||
user = insert(:user)
|
||||
{:ok, user} = User.block(user, %{ap_id: activity_one.data["actor"]})
|
||||
|
||||
activities = ActivityPub.fetch_activities([], %{"blocking_user" => user})
|
||||
|
||||
assert Enum.member?(activities, activity_two)
|
||||
refute Enum.member?(activities, activity_one)
|
||||
|
||||
{:ok, user} = User.unblock(user, %{ap_id: activity_one.data["actor"]})
|
||||
|
||||
activities = ActivityPub.fetch_activities([], %{"blocking_user" => user})
|
||||
|
||||
assert Enum.member?(activities, activity_two)
|
||||
assert Enum.member?(activities, activity_one)
|
||||
end
|
||||
|
||||
describe "public fetch activities" do
|
||||
test "retrieves public activities" do
|
||||
%{public: public} = ActivityBuilder.public_and_non_public
|
||||
|
|
Loading…
Reference in a new issue