diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-31 03:41:00 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-31 03:41:00 +0000 |
| commit | a26d5e6b2aba5010c699df659d63048957b347a5 (patch) | |
| tree | 0b7a68d223d2663c6aa64d8f3144dee1705e4e4f /lib/pleroma/web/common_api/common_api.ex | |
| parent | e838969495d2ca95406920ceef98d08f01d71192 (diff) | |
| parent | e7871ed05e9ebc8e2fe2f1afe966285e767c682f (diff) | |
| download | pleroma-a26d5e6b2aba5010c699df659d63048957b347a5.tar.gz | |
Merge branch 'feature/rich-text' into 'develop'
rich text support
See merge request pleroma/pleroma!309
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 125c57d05..2ab50c968 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -85,7 +85,14 @@ defmodule Pleroma.Web.CommonAPI do {to, cc} <- to_for_user_and_mentions(user, mentions, inReplyTo, visibility), tags <- Formatter.parse_tags(status, data), content_html <- - make_content_html(status, mentions, attachments, tags, data["no_attachment_links"]), + make_content_html( + status, + mentions, + attachments, + tags, + data["content_type"] || "text/plain", + data["no_attachment_links"] + ), context <- make_context(inReplyTo), cw <- data["spoiler_text"], object <- |