Skip to content
Snippets Groups Projects
Commit 3063e3b4 authored by lain's avatar lain
Browse files

Revert "Remove newlines completely so mastodon doesn't bug out."

This reverts commit 0ca3ab7b.
parent 0ca3ab7b
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment