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

[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.

Browse source
This commit is contained in:
Ivan Tashkinov 2019-11-18 20:38:56 +03:00
commit aad6576130
15 changed files with 239 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -100,11 +100,11 @@ defmodule Pleroma.User.Search do
defp filter_blocked_user(query, %User{} = blocker) do
query
|> join(:left, [u], b in Pleroma.UserBlock,
|> join(:left, [u], b in Pleroma.UserRelationship,
as: :blocks,
on: b.blocker_id == ^blocker.id and u.id == b.blockee_id
on: b.relationship_type == ^:block and b.source_id == ^blocker.id and u.id == b.target_id
)
|> where([blocks: b], is_nil(b.blockee_id))
|> where([blocks: b], is_nil(b.target_id))
end
defp filter_blocked_user(query, _), do: query