diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-05 08:28:20 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-05 08:28:20 +0000 |
| commit | e4babb1c9ff4c28ff08888736cc330a48b19b396 (patch) | |
| tree | 3599c305e129871247fb97cf3923b8b96159856c /lib/pleroma/web/common_api/common_api.ex | |
| parent | 5188add534a1532ef323a0fec3503f8e96dfe762 (diff) | |
| parent | 18c35d84fd732a6d55c9d3174fcbb837e098ea0a (diff) | |
| download | pleroma-e4babb1c9ff4c28ff08888736cc330a48b19b396.tar.gz | |
Merge branch 'explicit-addressing' into 'develop'
Explicit addressing
See merge request pleroma/pleroma!1239
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 ad3c03c55..2b3ae3de5 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -204,8 +204,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), context <- make_context(in_reply_to), cw <- data["spoiler_text"] || "", sensitive <- data["sensitive"] || Enum.member?(tags, {"#nsfw", "nsfw"}), |