From 00b722430fd808d92ba18c99a1af21e9f622c2fb Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Mon, 31 Jul 2017 13:27:38 +0200 Subject: [PATCH] Revert "Close br tags." This reverts commit 2eba8e74ccf2de0ad65b213bb166917c32db9d68. --- 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 7f305c863..2c3507dfb 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], "
\n") + Enum.join([text | attachment_text], "
\n") end def format_input(text, mentions) do HtmlSanitizeEx.strip_tags(text) |> Formatter.linkify - |> String.replace("\n", "
\n") + |> String.replace("\n", "
\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 4903b52c5..bbb261eff 100644 --- 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"]) == "Hello again, @shp.
\nThis is on another line. #2hu #epic #phantasmagoric
\nimage.jpg" + 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", "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..62aa7843b 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 @@ defmodule Pleroma.Web.TwitterAPI.UtilsTest do res = Utils.add_attachments("", [attachment]) - assert res == "
\ni\"m a boy.png" + assert res == "
\ni\"m a boy.png" end end