stefan230/akkoma
1
0
Fork 0
forked from YokaiRick/akkoma
Code Pull requests Activity

Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2019-01-10 16:07:32 +01:00
parent d8f446f438
commit 4ad0ad14ed
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -430,30 +430,15 @@ defp restrict_tag(query, %{"tag" => tag, "tag_reject" => tag_reject})
when is_list(tag) and tag_reject != [] do
from(
activity in query,
where:
fragment(
"? && ARRAY(SELECT jsonb_array_elements_text((? #> '{\"object\",\"tag\"}')))",
^tag,
activity.data
),
where:
fragment(
"(not ? && ARRAY(SELECT jsonb_array_elements_text((? #> '{\"object\",\"tag\"}'))))",
^tag_reject,
activity.data
)
where: fragment("(? #> '{\"object\",\"tag\"}') \\?| ?", activity.data, ^tag),
where: fragment("(not (? #> '{\"object\",\"tag\"}') \\?| ?)", activity.data, ^tag_reject)
)
end
defp restrict_tag(query, %{"tag" => tag}) when is_list(tag) do
from(
activity in query,
where:
fragment(
"? && ARRAY(SELECT jsonb_array_elements_text((? #> '{\"object\",\"tag\"}')))",
^tag,
activity.data
)
where: fragment("(? #> '{\"object\",\"tag\"}') \\?| ?", activity.data, ^tag)
)
end

21
test/web/activity_pub/activity_pub_test.exs
View file

@ -64,6 +64,27 @@ test "it returns a user" do
assert user.info.ap_enabled
assert user.follower_address == "http://mastodon.example.org/users/admin/followers"
end
test "it fetches the appropriate tag-restricted posts" do
user = insert(:user)
{:ok, status_one} = CommonAPI.post(user, %{"status" => ". #test"})
{:ok, status_two} = CommonAPI.post(user, %{"status" => ". #essais"})
{:ok, status_three} = CommonAPI.post(user, %{"status" => ". #test #reject"})
fetch_one = ActivityPub.fetch_activities([], %{"tag" => "test"})
fetch_two = ActivityPub.fetch_activities([], %{"tag" => ["test", "essais"]})
fetch_three =
ActivityPub.fetch_activities([], %{
"tag" => ["test", "essais"],
"tag_reject" => ["reject"]
})
assert fetch_one == [status_one, status_three]
assert fetch_two == [status_one, status_two, status_three]
assert fetch_three == [status_one, status_two]
end
end
describe "insertion" do