aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@pm.me>2020-04-23 02:03:02 +0300
committerRoman Chvanikov <chvanikoff@pm.me>2020-04-23 02:03:02 +0300
commit416a37fcefbd38d01a46b15e6af039b99a22ee0b (patch)
tree3c3c4506ad41fb227411facc37e1581ab29d8f25 /lib/pleroma/user.ex
parent8b522b3b3fead67e6d1c017b79758c12e3b133af (diff)
parent850377a7b8d380088d8717d82b09a2976bbdd739 (diff)
downloadpleroma-416a37fcefbd38d01a46b15e6af039b99a22ee0b.tar.gz
Merge branch 'develop' into refactor/fe-bundles
Diffstat (limited to 'lib/pleroma/user.ex')
-rw-r--r--lib/pleroma/user.ex4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index bef4679cb..477237756 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -1180,7 +1180,9 @@ defmodule Pleroma.User do
end
@spec get_recipients_from_activity(Activity.t()) :: [User.t()]
- def get_recipients_from_activity(%Activity{recipients: to}) do
+ def get_recipients_from_activity(%Activity{recipients: to, actor: actor}) do
+ to = [actor | to]
+
User.Query.build(%{recipients_from_activity: to, local: true, deactivated: false})
|> Repo.all()
end