aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-05-19 14:32:27 +0000
committerrinpatch <rinpatch@sdf.org>2020-06-08 01:32:35 +0300
commitada9d15eeecd820947ca6bcc4b3f65c8f874c99c (patch)
tree91d604c125a5132938c966a309ef02e6fe04155e /lib/pleroma/user.ex
parenteabf9317b554117b02bdcfe19c6371a44223ef2b (diff)
downloadpleroma-ada9d15eeecd820947ca6bcc4b3f65c8f874c99c.tar.gz
Merge branch 'recipients-query-speedup' into 'develop'
Greatly speed up recipients query See merge request pleroma/pleroma!2558
Diffstat (limited to 'lib/pleroma/user.ex')
-rw-r--r--lib/pleroma/user.ex8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 3e8f19e30..fbfdc68e8 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -1199,8 +1199,12 @@ defmodule Pleroma.User do
end
@spec get_recipients_from_activity(Activity.t()) :: [User.t()]
- def get_recipients_from_activity(%Activity{recipients: to}) do
- User.Query.build(%{recipients_from_activity: to, local: true, deactivated: false})
+ def get_recipients_from_activity(%Activity{recipients: to, actor: actor}) do
+ to = [actor | to]
+
+ query = User.Query.build(%{recipients_from_activity: to, local: true, deactivated: false})
+
+ query
|> Repo.all()
end