moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove newlines completely so mastodon doesn't bug out.

This commit is contained in:
Roger Braun 2017-07-31 13:06:31 +02:00
parent c81d0b6f89
commit 0ca3ab7b59
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/twitter_api/utils.ex
View File

@ -15,13 +15,13 @@ def add_attachments(text, attachments) do
"<a href=\"#{URI.encode(href)}\" class='attachment'>#{Path.basename(href)}</a>" "<a href=\"#{URI.encode(href)}\" class='attachment'>#{Path.basename(href)}</a>"
_ -> "" _ -> ""
end) end)
Enum.join([text | attachment_text], "<br />\n") Enum.join([text | attachment_text], "<br />")
end end
def format_input(text, mentions) do def format_input(text, mentions) do
HtmlSanitizeEx.strip_tags(text) HtmlSanitizeEx.strip_tags(text)
|> Formatter.linkify |> Formatter.linkify
|> String.replace("\n", "<br />\n") |> String.replace("\n", "<br />")
|> add_user_links(mentions) |> add_user_links(mentions)
end end

2
test/web/twitter_api/twitter_api_test.exs
View File

@ -33,7 +33,7 @@ test "create a status" do
{ :ok, activity = %Activity{} } = TwitterAPI.create_status(user, input) { :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", "type"]) == "Note"
assert get_in(activity.data, ["object", "actor"]) == user.ap_id assert get_in(activity.data, ["object", "actor"]) == user.ap_id
assert get_in(activity.data, ["actor"]) == user.ap_id assert get_in(activity.data, ["actor"]) == user.ap_id

2
test/web/twitter_api/twitter_api_utils_test.exs
View File

@ -9,6 +9,6 @@ test "it adds attachment links to a given text and attachment set" do
res = Utils.add_attachments("", [attachment]) 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
end end