Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle nil cases.

Browse Source
This commit is contained in:
Roger Braun 2017-11-02 22:47:11 +01:00
parent 8ef58a266b
commit 867ac1e4f5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -164,8 +164,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
where: activity.id > ^since where: activity.id > ^since
end end
defp restrict_blocked(query, %{"blocking_user" => user}) do defp restrict_blocked(query, %{"blocking_user" => %User{info: info}}) do
blocks = user.info["blocks"] || [] blocks = info["blocks"] || []
from activity in query, from activity in query,
where: fragment("not (?->>'actor' = ANY(?))", activity.data, ^blocks) where: fragment("not (?->>'actor' = ANY(?))", activity.data, ^blocks)
end end

5
test/web/activity_pub/activity_pub_test.exs
View File

@ -100,6 +100,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
assert Enum.member?(activities, activity_two) assert Enum.member?(activities, activity_two)
assert Enum.member?(activities, activity_one) assert Enum.member?(activities, activity_one)
activities = ActivityPub.fetch_activities([], %{"blocking_user" => nil})
assert Enum.member?(activities, activity_two)
assert Enum.member?(activities, activity_one)
end end
describe "public fetch activities" do describe "public fetch activities" do