diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-07-31 13:27:19 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-07-31 13:27:19 +0200 |
| commit | 3063e3b44088009269cae1bbe49fc5f5e3423939 (patch) | |
| tree | e8713f9e641414cc3033a0f572b00172bdd0f66f | |
| parent | 0ca3ab7b59edaec255aa3710fce8a9daa236b44d (diff) | |
| download | pleroma-3063e3b44088009269cae1bbe49fc5f5e3423939.tar.gz | |
Revert "Remove newlines completely so mastodon doesn't bug out."
This reverts commit 0ca3ab7b59edaec255aa3710fce8a9daa236b44d.
| -rw-r--r-- | lib/pleroma/web/twitter_api/utils.ex | 4 | ||||
| -rw-r--r-- | test/web/twitter_api/twitter_api_test.exs | 2 | ||||
| -rw-r--r-- | 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 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 diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index cd05da508..1dd8ba2e6 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"]) == "<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", "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", "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 20de31c39..3ed61e173 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 == "<br /><a href=\"http://heise.de/i%22m%20a%20boy.png\" class='attachment'>i\"m a boy.png</a>" + assert res == "<br />\n<a href=\"http://heise.de/i%22m%20a%20boy.png\" class='attachment'>i\"m a boy.png</a>" end end |