commit: db46913dcc01e6d5a274f7c82eef44c304d52244
parent cd8bdbc761d950587a189bded2dcb02f6247f16d
Author: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Mon, 6 Dec 2021 11:50:51 +0000
make linter happy
Diffstat:
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/lib/pleroma/activity.ex b/lib/pleroma/activity.ex
@@ -362,8 +362,7 @@ defmodule Pleroma.Activity do
end
def restrict_deactivated_users(query) do
- deactivated_users_query =
- from(u in User.Query.build(%{deactivated: true}), select: u.ap_id)
+ deactivated_users_query = from(u in User.Query.build(%{deactivated: true}), select: u.ap_id)
from(activity in query, where: activity.actor not in subquery(deactivated_users_query))
end
diff --git a/test/pleroma/web/activity_pub/activity_pub_test.exs b/test/pleroma/web/activity_pub/activity_pub_test.exs
@@ -783,14 +783,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
{:ok, activity_one} = CommonAPI.post(deactivated, %{status: "hey!"})
{:ok, activity_two} = CommonAPI.post(active, %{status: "yay!"})
{:ok, _updated_user} = User.set_activation(deactivated, false)
-
+
activities = ActivityPub.fetch_activities([], %{})
-
+
refute Enum.member?(activities, activity_one)
assert Enum.member?(activities, activity_two)
end
-
test "always see your own posts even when they address people you block" do
user = insert(:user)
blockee = insert(:user)