From 0ca3ab7b59edaec255aa3710fce8a9daa236b44d Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Mon, 31 Jul 2017 13:06:31 +0200 Subject: [PATCH] Remove newlines completely so mastodon doesn't bug out. --- lib/pleroma/web/twitter_api/utils.ex | 4 ++-- test/web/twitter_api/twitter_api_test.exs | 2 +- test/web/twitter_api/twitter_api_utils_test.exs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/pleroma/web/twitter_api/utils.ex b/lib/pleroma/web/twitter_api/utils.ex index f02c8ad6d..67ba5ec5c 100644 --- a/lib/pleroma/web/twitter_api/utils.ex +++ b/lib/pleroma/web/twitter_api/utils.ex @@ -15,13 +15,13 @@ def add_attachments(text, attachments) do "#{Path.basename(href)}" _ -> "" end) - Enum.join([text | attachment_text], "
\n") + Enum.join([text | attachment_text], "
") end def format_input(text, mentions) do HtmlSanitizeEx.strip_tags(text) |> Formatter.linkify - |> String.replace("\n", "
\n") + |> String.replace("\n", "
") |> 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 1dd8ba2e6..cd05da508 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -33,7 +33,7 @@ test "create a status" do { :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input) - assert get_in(activity.data, ["object", "content"]) == "

Hello again, @shp.
\nThis is on another line. #2hu #epic #phantasmagoric
\nimage.jpg

" + assert get_in(activity.data, ["object", "content"]) == "

Hello again, @shp.
This is on another line. #2hu #epic #phantasmagoric
image.jpg

" 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 3ed61e173..20de31c39 100644 --- a/test/web/twitter_api/twitter_api_utils_test.exs +++ b/test/web/twitter_api/twitter_api_utils_test.exs @@ -9,6 +9,6 @@ test "it adds attachment links to a given text and attachment set" do res = Utils.add_attachments("", [attachment]) - assert res == "
\ni\"m a boy.png" + assert res == "
i\"m a boy.png" end end