From 1027d1f6963b495a5abc67b05447619ce7d429db Mon Sep 17 00:00:00 2001 From: lain Date: Sun, 13 May 2018 12:07:11 +0200 Subject: [PATCH] Remove 'unlisted' handling for now. It's just too slow (over 1 second on small systems, haven't looked at the queries in detail yet). We'll need some other way to handle it. --- lib/pleroma/web/activity_pub/activity_pub.ex | 3 ++- test/web/activity_pub/activity_pub_test.exs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index 491ad3705..4bd56d123 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -233,7 +233,8 @@ def fetch_public_activities(opts \\ %{}) do q = fetch_activities_query(["https://www.w3.org/ns/activitystreams#Public"], opts) q - |> restrict_unlisted() + # Too slow + # |> restrict_unlisted() |> Repo.all() |> Enum.reverse() end diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs index a39ba9adb..c4b59f5c7 100644 --- a/test/web/activity_pub/activity_pub_test.exs +++ b/test/web/activity_pub/activity_pub_test.exs @@ -171,6 +171,7 @@ test "doesn't return blocked activities" do end describe "public fetch activities" do + @tag :skip test "doesn't retrieve unlisted activities" do user = insert(:user) {:ok, unlisted_activity} = CommonAPI.post(user, %{"status" => "yeah", "visibility" => "unlisted"})