logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 0ca3ab7b59edaec255aa3710fce8a9daa236b44d
parent: c81d0b6f898c36ebcad5371caeebc0f789cb7a67
Author: Roger Braun <roger@rogerbraun.net>
Date:   Mon, 31 Jul 2017 13:06:31 +0200

Remove newlines completely so mastodon doesn't bug out.

Diffstat:

Mlib/pleroma/web/twitter_api/utils.ex4++--
Mtest/web/twitter_api/twitter_api_test.exs2+-
Mtest/web/twitter_api/twitter_api_utils_test.exs2+-
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 @@ -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 @@ -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 @@ -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