diff options
author | rinpatch <rinpatch@sdf.org> | 2020-09-08 17:21:12 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-09-08 17:21:12 +0000 |
commit | 425324aae3d4534bc045466a1cc15653ddfa27d2 (patch) | |
tree | 2d785eb4396e2dc79bb6b0bed5d766b393479dd5 /lib/pleroma/user | |
parent | 73dd5bdb7dcdf804bdbabcf632671d4de5042ebc (diff) | |
parent | 073f5490ece616fd9602382c1be1347457cbbe79 (diff) | |
download | pleroma-2.1.1.tar.gz |
Merge branch 'release/2.1.1' into 'stable'v2.1.1
2.1.1 release
See merge request pleroma/secteam/pleroma!13
Diffstat (limited to 'lib/pleroma/user')
-rw-r--r-- | lib/pleroma/user/search.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/user/search.ex b/lib/pleroma/user/search.ex index d4fd31069..7babd47ea 100644 --- a/lib/pleroma/user/search.ex +++ b/lib/pleroma/user/search.ex @@ -115,8 +115,8 @@ defmodule Pleroma.User.Search do ) end - defp base_query(_user, false), do: User - defp base_query(user, true), do: User.get_followers_query(user) + defp base_query(%User{} = user, true), do: User.get_friends_query(user) + defp base_query(_user, _following), do: User defp filter_invisible_users(query) do from(q in query, where: q.invisible == false) |