summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-05-13 12:07:11 +0200
committerlain <lain@soykaf.club>2018-05-13 12:07:11 +0200
commit1027d1f6963b495a5abc67b05447619ce7d429db (patch)
treef0db443918ca300057ab15af7c0d7275851b224c
parenta5c9dd0a2aa792ed075c6ff83b1de262a1529026 (diff)
downloadpleroma-1027d1f6963b495a5abc67b05447619ce7d429db.tar.gz
pleroma-1027d1f6963b495a5abc67b05447619ce7d429db.zip
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.
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex3
-rw-r--r--test/web/activity_pub/activity_pub_test.exs1
2 files changed, 3 insertions, 1 deletions
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 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub 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 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest 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"})