Merge branch 'develop' into refactor/discoverable_user_field

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

diff --git a/lib/pleroma/user/search.ex b/lib/pleroma/user/search.ex
index d747bfa525928b4ae0cf2d1628b0c0c627fc8bda..2dab672112b9636c1e62fda0beb630f37d162216 100644 (file)
--- a/lib/pleroma/user/search.ex
+++ b/lib/pleroma/user/search.ex
@@ -3,9 +3,10 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.User.Search do
+  alias Pleroma.EctoType.ActivityPub.ObjectValidators.Uri, as: UriType
   alias Pleroma.Pagination
   alias Pleroma.User
-  alias Pleroma.EctoType.ActivityPub.ObjectValidators.Uri, as: UriType
+
   import Ecto.Query
 
   @limit 20
@@ -53,8 +54,9 @@ defmodule Pleroma.User.Search do
 
   defp maybe_add_uri_match(list, query) do
     with {:ok, query} <- UriType.cast(query),
-         %User{} = user <- Pleroma.Repo.get_by(User, uri: query) do
-      [user.id | list]
+         q = from(u in User, where: u.uri == ^query, select: u.id),
+         users = Pleroma.Repo.all(q) do
+      users ++ list
     else
       _ -> list
     end
@@ -162,7 +164,7 @@ defmodule Pleroma.User.Search do
   end
 
   defp filter_discoverable_users(query) do
-    from(q in query, where: q.discoverable == true)
+    from(q in query, where: q.is_discoverable == true)
   end
 
   defp filter_internal_users(query) do