nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Do some basic escaping.

Browse source
This commit is contained in:
Roger Braun 2017-06-14 14:46:18 +02:00
parent 1af9c77736
commit 83c657afa5
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/twitter_api/utils.ex
View file

@ -11,7 +11,7 @@ def attachments_from_ids(ids) do
def add_attachments(text, attachments) do def add_attachments(text, attachments) do
attachment_text = Enum.map(attachments, fn attachment_text = Enum.map(attachments, fn
(%{"url" => [%{"href" => href} | _]}) -> (%{"url" => [%{"href" => href} | _]}) ->
"<a href='#{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>\n")

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

@ -34,7 +34,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"]) == "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>" assert get_in(activity.data, ["object", "content"]) == "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>"
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

14
test/web/twitter_api/twitter_api_utils_test.exs Normal file
View file

@ -0,0 +1,14 @@
defmodule Pleroma.Web.TwitterAPI.UtilsTest do
alias Pleroma.Web.TwitterAPI.Utils
use Pleroma.DataCase
test "it adds attachment links to a given text and attachment set" do
attachment = %{
"url" => [%{"href" => "http://heise.de/i\"m a boy.png"}]
}
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>"
end
end