Remove newlines completely so mastodon doesn't bug out.

diff --git a/lib/pleroma/web/twitter_api/utils.ex b/lib/pleroma/web/twitter_api/utils.ex
index f02c8ad6da2b83977c3e0e8ed4808872f518f28a..67ba5ec5cb82003f3c6a3f543565cb18c8c23914 100644 (file)
--- 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 />\n")
+    Enum.join([text | attachment_text], "<br />")
   end
 
   def format_input(text, mentions) do
     HtmlSanitizeEx.strip_tags(text)
     |> Formatter.linkify
-    |> String.replace("\n", "<br />\n")
+    |> String.replace("\n", "<br />")
     |> add_user_links(mentions)
   end
 

diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 1dd8ba2e6b222de08968d8b983a7bac023f1ae31..cd05da508b17bc377f9922c1a94f3535a19cde57 100644 (file)
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -33,7 +33,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
 
     { :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input)
 
-    assert get_in(activity.data, ["object", "content"]) == "<p>Hello again, <a href='shp'>@shp</a>.<br />\nThis is on another line. #2hu #epic #phantasmagoric<br />\n<a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a></p>"
+    assert get_in(activity.data, ["object", "content"]) == "<p>Hello again, <a href='shp'>@shp</a>.<br />This is on another line. #2hu #epic #phantasmagoric<br /><a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a></p>"
     assert get_in(activity.data, ["object", "type"]) == "Note"
     assert get_in(activity.data, ["object", "actor"]) == user.ap_id
     assert get_in(activity.data, ["actor"]) == user.ap_id

diff --git a/test/web/twitter_api/twitter_api_utils_test.exs b/test/web/twitter_api/twitter_api_utils_test.exs
index 3ed61e173fee59d87c739a5739b18cc59abeccba..20de31c3963bbb892c0f5315d5df21f742acf42c 100644 (file)
--- a/test/web/twitter_api/twitter_api_utils_test.exs
+++ b/test/web/twitter_api/twitter_api_utils_test.exs
@@ -9,6 +9,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilsTest do
 
     res = Utils.add_attachments("", [attachment])
 
-    assert res == "<br />\n<a href=\"http://heise.de/i%22m%20a%20boy.png\" class='attachment'>i\"m a boy.png</a>"
+    assert res == "<br /><a href=\"http://heise.de/i%22m%20a%20boy.png\" class='attachment'>i\"m a boy.png</a>"
   end
 end