diff options
author | kaniini <nenolod@gmail.com> | 2019-01-25 05:00:47 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-01-25 05:00:47 +0000 |
commit | c9b418e5477229017b3750c55cf3ea3d03b7e609 (patch) | |
tree | d1b458bea76ff3ec296897de405f9e3c8578f897 /lib/pleroma/web/common_api/common_api.ex | |
parent | 44693fbf6e5c5ec5622207e263688e3af7d1a83a (diff) | |
parent | 4df71cd88b2725f1838c2899b3078a74dbb0c33f (diff) | |
download | pleroma-c9b418e5477229017b3750c55cf3ea3d03b7e609.tar.gz |
Merge branch 'develop' into 'oembed_provider'
# Conflicts:
# lib/pleroma/activity.ex
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
-rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 504670439..7084da6de 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -143,7 +143,7 @@ defmodule Pleroma.Web.CommonAPI do actor: user, context: context, object: object, - additional: %{"cc" => cc} + additional: %{"cc" => cc, "directMessage" => visibility == "direct"} }) res |