|
|
|
@ -1247,6 +1247,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
defp exclude_invisible_actors(query, %{type: "Flag"}), do: query
|
|
|
|
|
defp exclude_invisible_actors(query, %{invisible_actors: true}), do: query
|
|
|
|
|
|
|
|
|
|
defp exclude_invisible_actors(query, _opts) do
|
|
|
|
@ -1385,7 +1386,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|
|
|
|
|> restrict_instance(opts)
|
|
|
|
|
|> restrict_announce_object_actor(opts)
|
|
|
|
|
|> restrict_filtered(opts)
|
|
|
|
|
|> Activity.restrict_deactivated_users()
|
|
|
|
|
|> maybe_restrict_deactivated_users(opts)
|
|
|
|
|
|> exclude_poll_votes(opts)
|
|
|
|
|
|> exclude_invisible_actors(opts)
|
|
|
|
|
|> exclude_visibility(opts)
|
|
|
|
@ -1813,4 +1814,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|
|
|
|
|> restrict_visibility(%{visibility: "direct"})
|
|
|
|
|
|> order_by([activity], asc: activity.id)
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
defp maybe_restrict_deactivated_users(activity, %{type: "Flag"}), do: activity
|
|
|
|
|
|
|
|
|
|
defp maybe_restrict_deactivated_users(activity, _opts),
|
|
|
|
|
do: Activity.restrict_deactivated_users(activity)
|
|
|
|
|
end
|
|
|
|
|