aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-11-01 12:06:44 +0000
committerkaniini <ariadne@dereferenced.org>2019-11-01 12:06:44 +0000
commit1a602150769ea33b8da302437f6722bc6d8c5cb3 (patch)
treef2f26413829a48dfdfc6bd49784a3d8c75b794ca /lib
parente14cae25aa42fba21bd573ffd45ec1176da7da83 (diff)
parentd1ae51b02a8f367a5dec6d427391e274caeac468 (diff)
downloadpleroma-1a602150769ea33b8da302437f6722bc6d8c5cb3.tar.gz
Merge branch 'fix-recipients-from-activity' into 'develop'
Fix duplicate recipients from activity See merge request pleroma/pleroma!1921
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/user/query.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/user/query.ex b/lib/pleroma/user/query.ex
index 2eda454bc..364bc1c89 100644
--- a/lib/pleroma/user/query.ex
+++ b/lib/pleroma/user/query.ex
@@ -175,6 +175,7 @@ defmodule Pleroma.User.Query do
[u, following: f, relationships: r],
u.ap_id in ^to or (f.follower_address in ^to and r.state == "accept")
)
+ |> distinct(true)
end
defp compose_query({:order_by, key}, query) do