Merge branch 'develop' into issue/1411

[akkoma] / lib / pleroma / user / search.ex

diff --git a/lib/pleroma/user/search.ex b/lib/pleroma/user/search.ex
index b1bb9d4da0aa65ad14c14a1fe131f88380ecdc19..6b55df483b76944ba6276f25033ea30f76841628 100644 (file)
--- a/lib/pleroma/user/search.ex
+++ b/lib/pleroma/user/search.ex
@@ -103,9 +103,13 @@ defmodule Pleroma.User.Search do
     from(q in query, where: q.invisible == false)
   end
 
-  defp filter_blocked_user(query, %User{blocks: blocks})
-       when length(blocks) > 0 do
-    from(q in query, where: not (q.ap_id in ^blocks))
+  defp filter_blocked_user(query, %User{} = blocker) do
+    query
+    |> join(:left, [u], b in Pleroma.UserRelationship,
+      as: :blocks,
+      on: b.relationship_type == ^:block and b.source_id == ^blocker.id and u.id == b.target_id
+    )
+    |> where([blocks: b], is_nil(b.target_id))
   end
 
   defp filter_blocked_user(query, _), do: query