diff options
author | kaniini <nenolod@gmail.com> | 2019-03-22 00:50:24 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-03-22 00:50:24 +0000 |
commit | 1c3d3d0c2b6ebb4948df0b4ec085bcc4a564a126 (patch) | |
tree | da2492e2a4d7e1202e82bff3fbe4d89ddd8b85c5 /lib/pleroma/web/common_api/common_api.ex | |
parent | b548181b52c4397d5034cfd95b2ef7e05c9c9c22 (diff) | |
parent | bf27190f7f0942a05de518f2085a299eb011614c (diff) | |
download | pleroma-1c3d3d0c2b6ebb4948df0b4ec085bcc4a564a126.tar.gz |
Merge branch 'safe-mentions' into 'develop'
Add safe dm mode option.
See merge request pleroma/pleroma!958
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
-rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index b5f79c3bf..50d60aade 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -142,7 +142,8 @@ defmodule Pleroma.Web.CommonAPI do make_content_html( status, attachments, - data + data, + visibility ), {to, cc} <- to_for_user_and_mentions(user, mentions, in_reply_to, visibility), context <- make_context(in_reply_to), |