diff options
| author | Alex S <alex.strizhakov@gmail.com> | 2019-04-06 20:34:00 +0700 |
|---|---|---|
| committer | Alex S <alex.strizhakov@gmail.com> | 2019-04-06 20:34:00 +0700 |
| commit | 7410aee886fbb38615bb595b8b7be0722761a0a4 (patch) | |
| tree | 26372ac184398430a0a18f3285dba2b543632fb0 /lib/pleroma/web/common_api/common_api.ex | |
| parent | fa8483cb808ef4b8b907d7ec0eeb882f3f47d927 (diff) | |
| parent | 3c5daa0235aaf47eeeda557fd677e3604cb7d701 (diff) | |
| download | pleroma-7410aee886fbb38615bb595b8b7be0722761a0a4.tar.gz | |
Merge develop to 770-add-emoji-tags
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index f910eb1f9..74babdf14 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -172,13 +172,16 @@ defmodule Pleroma.Web.CommonAPI do end) ) do res = - ActivityPub.create(%{ - to: to, - actor: user, - context: context, - object: object, - additional: %{"cc" => cc, "directMessage" => visibility == "direct"} - }) + ActivityPub.create( + %{ + to: to, + actor: user, + context: context, + object: object, + additional: %{"cc" => cc, "directMessage" => visibility == "direct"} + }, + Pleroma.Web.ControllerHelper.truthy_param?(data["preview"]) || false + ) res end |