diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-22 20:18:12 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-22 20:18:12 +0400 |
| commit | 6c26feed01b2e836e7ebdefe9683ddb03cb57757 (patch) | |
| tree | 4b143a6708d405e5fc6ebf69910c9ae18066502b /lib/pleroma/user.ex | |
| parent | 11433cd38d9761ddf3fdb94f8c39526910b975c1 (diff) | |
| parent | 28f8fcf8b034223209ec451d0c2c836124ec93f4 (diff) | |
| download | pleroma-6c26feed01b2e836e7ebdefe9683ddb03cb57757.tar.gz | |
Merge branch 'develop' into openapi/account
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 4 |
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 |