hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into issue/2099

Browse source
This commit is contained in:
Maksim Pechnikov 2020-09-17 08:41:35 +03:00
commit b867f9d7ae
248 changed files with 3368 additions and 8382 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/user/search.ex
View file

@ -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_friends_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)