diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-30 13:37:46 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-30 13:37:46 +0000 |
| commit | 2566467782e410aa910de9b55aece8c4ffd74ad1 (patch) | |
| tree | effec95502007d8ad37165a9749938c9795d7073 /lib | |
| parent | 7f83b35a9dea7181b57d9b975742233813fa3a8b (diff) | |
| parent | 1ae39441e6d516f8f1a0dd3ed47de9d8427477c5 (diff) | |
| download | pleroma-2566467782e410aa910de9b55aece8c4ffd74ad1.tar.gz pleroma-2566467782e410aa910de9b55aece8c4ffd74ad1.zip | |
Merge branch '2201-i-hate-this' into 'develop'
User search: Once again, change uri handling.
Closes #2201
See merge request pleroma/pleroma!3048
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user/search.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/user/search.ex b/lib/pleroma/user/search.ex index 03f2c552f..35a828008 100644 --- a/lib/pleroma/user/search.ex +++ b/lib/pleroma/user/search.ex @@ -54,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 |