From: lain <lain@soykaf.club>
Date: Tue, 2 Jun 2020 12:28:01 +0000 (+0200)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=904295d53b82fcfd7dfefd4c970815b36f06faf0;p=akkoma

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
---

904295d53b82fcfd7dfefd4c970815b36f06faf0
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
index 5858eb473,a38f9a3c8..568db2348
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@@ -1037,18 -1030,17 +1037,29 @@@ defmodule Pleroma.Web.ActivityPub.Activ
      end
    end
  
 +  defp exclude_chat_messages(query, %{"include_chat_messages" => true}), do: query
 +
 +  defp exclude_chat_messages(query, _) do
 +    if has_named_binding?(query, :object) do
 +      from([activity, object: o] in query,
 +        where: fragment("not(?->>'type' = ?)", o.data, "ChatMessage")
 +      )
 +    else
 +      query
 +    end
 +  end
 +
+   defp exclude_invisible_actors(query, %{"invisible_actors" => true}), do: query
+ 
+   defp exclude_invisible_actors(query, _opts) do
+     invisible_ap_ids =
+       User.Query.build(%{invisible: true, select: [:ap_id]})
+       |> Repo.all()
+       |> Enum.map(fn %{ap_id: ap_id} -> ap_id end)
+ 
+     from([activity] in query, where: activity.actor not in ^invisible_ap_ids)
+   end
+ 
    defp exclude_id(query, %{"exclude_id" => id}) when is_binary(id) do
      from(activity in query, where: activity.id != ^id)
    end
@@@ -1154,7 -1146,7 +1165,8 @@@
      |> restrict_instance(opts)
      |> Activity.restrict_deactivated_users()
      |> exclude_poll_votes(opts)
 +    |> exclude_chat_messages(opts)
+     |> exclude_invisible_actors(opts)
      |> exclude_visibility(opts)
    end