moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop' 

CommonAPI post: kill \r with fire

See merge request pleroma/pleroma!120
This commit is contained in:
lambda 2018-04-19 07:41:09 +00:00
parent b586ead6b8 ee6f15529d
commit e4da81d662
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/pleroma/web/common_api/utils.ex
View File

@ -61,6 +61,7 @@ def to_for_user_and_mentions(user, mentions, inReplyTo, "direct") do
def make_content_html(status, mentions, attachments, tags, no_attachment_links \\ false) do def make_content_html(status, mentions, attachments, tags, no_attachment_links \\ false) do
status status
|> String.replace("\r", "")
|> format_input(mentions, tags) |> format_input(mentions, tags)
|> maybe_add_attachments(attachments, no_attachment_links) |> maybe_add_attachments(attachments, no_attachment_links)
end end