make linter happy

stable
FloatingGhost 3 years ago
parent 429407ba0a
commit 0fab887eee

@ -362,8 +362,7 @@ defmodule Pleroma.Activity do
end end
def restrict_deactivated_users(query) do def restrict_deactivated_users(query) do
deactivated_users_query = deactivated_users_query = from(u in User.Query.build(%{deactivated: true}), select: u.ap_id)
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)) from(activity in query, where: activity.actor not in subquery(deactivated_users_query))
end end

@ -783,14 +783,13 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
{:ok, activity_one} = CommonAPI.post(deactivated, %{status: "hey!"}) {:ok, activity_one} = CommonAPI.post(deactivated, %{status: "hey!"})
{:ok, activity_two} = CommonAPI.post(active, %{status: "yay!"}) {:ok, activity_two} = CommonAPI.post(active, %{status: "yay!"})
{:ok, _updated_user} = User.set_activation(deactivated, false) {:ok, _updated_user} = User.set_activation(deactivated, false)
activities = ActivityPub.fetch_activities([], %{}) activities = ActivityPub.fetch_activities([], %{})
refute Enum.member?(activities, activity_one) refute Enum.member?(activities, activity_one)
assert Enum.member?(activities, activity_two) assert Enum.member?(activities, activity_two)
end end
test "always see your own posts even when they address people you block" do test "always see your own posts even when they address people you block" do
user = insert(:user) user = insert(:user)
blockee = insert(:user) blockee = insert(:user)

Loading…
Cancel
Save