logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 7d34cec58d0a9fda1741e1c0c9c23b0895a2cc2e
parent a32784fe6d2237d01835db5d70fa27bc52bdbb0e
Author: Roger Braun <roger@rogerbraun.net>
Date:   Wed,  9 Aug 2017 16:55:18 +0200

escape attachment urls on creation.

Diffstat:

Mlib/pleroma/web/twitter_api/utils.ex2+-
Mtest/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 @@ -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 @@ -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