aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-07-31 13:27:19 +0200
committerRoger Braun <roger@rogerbraun.net>2017-07-31 13:27:19 +0200
commit3063e3b44088009269cae1bbe49fc5f5e3423939 (patch)
treee8713f9e641414cc3033a0f572b00172bdd0f66f /lib
parent0ca3ab7b59edaec255aa3710fce8a9daa236b44d (diff)
downloadpleroma-3063e3b44088009269cae1bbe49fc5f5e3423939.tar.gz
Revert "Remove newlines completely so mastodon doesn't bug out."
This reverts commit 0ca3ab7b59edaec255aa3710fce8a9daa236b44d.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/twitter_api/utils.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/utils.ex b/lib/pleroma/web/twitter_api/utils.ex
index 67ba5ec5c..f02c8ad6d 100644
--- a/lib/pleroma/web/twitter_api/utils.ex
+++ b/lib/pleroma/web/twitter_api/utils.ex
@@ -15,13 +15,13 @@ defmodule Pleroma.Web.TwitterAPI.Utils do
"<a href=\"#{URI.encode(href)}\" class='attachment'>#{Path.basename(href)}</a>"
_ -> ""
end)
- Enum.join([text | attachment_text], "<br />")
+ Enum.join([text | attachment_text], "<br />\n")
end
def format_input(text, mentions) do
HtmlSanitizeEx.strip_tags(text)
|> Formatter.linkify
- |> String.replace("\n", "<br />")
+ |> String.replace("\n", "<br />\n")
|> add_user_links(mentions)
end