diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-05-22 05:22:07 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-05-22 05:22:07 +0000 |
| commit | a57e7f3503c485de64c4e001529a6e06a1a35b25 (patch) | |
| tree | 002c88269701a94dbc181fa39524a5476e550494 /lib/pleroma/web/common_api | |
| parent | e0d1a942a6e561a889615f6387ce3c340dadfa21 (diff) | |
| parent | eb5f4285651c923aa3d776a2bc317c2a902031cc (diff) | |
| download | pleroma-a57e7f3503c485de64c4e001529a6e06a1a35b25.tar.gz | |
Merge branch '1113-op-mentioning' into 'develop'
CommonAPI: Change public->private implicit addressing.
Closes #1113
See merge request pleroma/pleroma!2563
Diffstat (limited to 'lib/pleroma/web/common_api')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index e8deee223..b9fa21648 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -102,7 +102,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do end def get_to_and_cc(_user, mentioned_users, inReplyTo, "direct", _) do - if inReplyTo do + # If the OP is a DM already, add the implicit actor. + if inReplyTo && Visibility.is_direct?(inReplyTo) do {Enum.uniq([inReplyTo.data["actor"] | mentioned_users]), []} else {mentioned_users, []} |