Commit fb118b29 authored by eal's avatar eal

Don't insert newlines to generated HTML.

MastoFE doesn't like them.
parent 66e78c3e
......@@ -54,14 +54,14 @@ def add_attachments(text, attachments) do
"<a href=\"#{href}\" class='attachment'>#{shortname(name)}</a>"
_ -> ""
end)
Enum.join([text | attachment_text], "<br>\n")
Enum.join([text | attachment_text], "<br>")
end
def format_input(text, mentions, tags) do
Phoenix.HTML.html_escape(text)
|> elem(1)
|> Formatter.linkify
|> String.replace("\n", "<br>\n")
|> String.replace("\n", "<br>")
|> add_user_links(mentions)
# |> add_tag_links(tags)
end
......
......@@ -11,6 +11,6 @@ test "it adds attachment links to a given text and attachment set" do
res = Utils.add_attachments("", [attachment])
assert res == "<br>\n<a href=\"#{name}\" class='attachment'>Sakura Mana – Turned on by a Se…</a>"
assert res == "<br><a href=\"#{name}\" class='attachment'>Sakura Mana – Turned on by a Se…</a>"
end
end
......@@ -34,7 +34,7 @@ test "create a status" do
{ :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input)
assert get_in(activity.data, ["object", "content"]) == "Hello again, <a href='shp'>@shp</a>.&lt;script&gt;&lt;/script&gt;<br>\nThis is on another line. #2hu #epic #phantasmagoric<br>\n<a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a>"
assert get_in(activity.data, ["object", "content"]) == "Hello again, <a href='shp'>@shp</a>.&lt;script&gt;&lt;/script&gt;<br>This is on another line. #2hu #epic #phantasmagoric<br><a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a>"
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment