aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-08-09 16:55:18 +0200
committerRoger Braun <roger@rogerbraun.net>2017-08-09 16:55:18 +0200
commit7d34cec58d0a9fda1741e1c0c9c23b0895a2cc2e (patch)
treeb12730ebbaaaf751f2cfef5ef06058fb840c8c57
parenta32784fe6d2237d01835db5d70fa27bc52bdbb0e (diff)
downloadpleroma-7d34cec58d0a9fda1741e1c0c9c23b0895a2cc2e.tar.gz
escape attachment urls on creation.
-rw-r--r--lib/pleroma/web/twitter_api/utils.ex2
-rw-r--r--test/web/twitter_api/twitter_api_utils_test.exs2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/utils.ex b/lib/pleroma/web/twitter_api/utils.ex
index 2c3507dfb..cd7e04ca1 100644
--- a/lib/pleroma/web/twitter_api/utils.ex
+++ b/lib/pleroma/web/twitter_api/utils.ex
@@ -12,7 +12,7 @@ defmodule Pleroma.Web.TwitterAPI.Utils do
def add_attachments(text, attachments) do
attachment_text = Enum.map(attachments, fn
(%{"url" => [%{"href" => href} | _]}) ->
- "<a href=\"#{URI.encode(href)}\" class='attachment'>#{Path.basename(href)}</a>"
+ "<a href=\"#{href}\" class='attachment'>#{Path.basename(href)}</a>"
_ -> ""
end)
Enum.join([text | attachment_text], "<br>\n")
diff --git a/test/web/twitter_api/twitter_api_utils_test.exs b/test/web/twitter_api/twitter_api_utils_test.exs
index 62aa7843b..49818afed 100644
--- 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>\n<a href=\"http://heise.de/i\"m a boy.png\" class='attachment'>i\"m a boy.png</a>"
end
end