From 3063e3b44088009269cae1bbe49fc5f5e3423939 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Mon, 31 Jul 2017 13:27:19 +0200 Subject: Revert "Remove newlines completely so mastodon doesn't bug out." This reverts commit 0ca3ab7b59edaec255aa3710fce8a9daa236b44d. --- lib/pleroma/web/twitter_api/utils.ex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') 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 "#{Path.basename(href)}" _ -> "" end) - Enum.join([text | attachment_text], "
") + Enum.join([text | attachment_text], "
\n") end def format_input(text, mentions) do HtmlSanitizeEx.strip_tags(text) |> Formatter.linkify - |> String.replace("\n", "
") + |> String.replace("\n", "
\n") |> add_user_links(mentions) end -- cgit v1.2.3