diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-05 17:53:15 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-05 17:53:15 +0700 |
| commit | cfa5572d28a5a7b58d73106c32420b14ffd9fd2a (patch) | |
| tree | d093f206f5ea5b792b22b0e59b31b76ac64c1bc6 /lib/pleroma/web/common_api/common_api.ex | |
| parent | 6ba9055b51a454baaf063943e72a39006f7e5fad (diff) | |
| parent | e4babb1c9ff4c28ff08888736cc330a48b19b396 (diff) | |
| download | pleroma-cfa5572d28a5a7b58d73106c32420b14ffd9fd2a.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 536058666..25b5fedb8 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -209,8 +209,10 @@ defmodule Pleroma.Web.CommonAPI do data, visibility ), + mentioned_users <- for({_, mentioned_user} <- mentions, do: mentioned_user.ap_id), + addressed_users <- get_addressed_users(mentioned_users, data["to"]), {poll, poll_emoji} <- make_poll_data(data), - {to, cc} <- to_for_user_and_mentions(user, mentions, in_reply_to, visibility), + {to, cc} <- get_to_and_cc(user, addressed_users, in_reply_to, visibility), bcc <- bcc_for_list(user, visibility), context <- make_context(in_reply_to), cw <- data["spoiler_text"] || "", |