logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: fbbc5fc91970b2dccb2888e343cad42de8a157bb
parent: 658036881d132e22cb033dff1ac2bdbd74e802a1
Author: kaniini <nenolod@gmail.com>
Date:   Mon, 29 Oct 2018 15:28:29 +0000

Merge branch 'bugfix/mediaproxy-leaks' into 'develop'

twitter/mastodon api: always use mediaproxy URLs in attachments

Closes #329

See merge request pleroma/pleroma!400

Diffstat:

Mlib/pleroma/web/mastodon_api/views/status_view.ex6+++---
Mlib/pleroma/web/twitter_api/twitter_api.ex3++-
2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -166,7 +166,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do def render("attachment.json", %{attachment: attachment}) do [attachment_url | _] = attachment["url"] media_type = attachment_url["mediaType"] || attachment_url["mimeType"] || "image" - href = attachment_url["href"] + href = attachment_url["href"] |> MediaProxy.url() type = cond do @@ -180,9 +180,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do %{ id: to_string(attachment["id"] || hash_id), - url: MediaProxy.url(href), + url: href, remote_url: href, - preview_url: MediaProxy.url(href), + preview_url: href, text_url: href, type: type, description: attachment["name"] diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -3,6 +3,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.TwitterAPI.UserView alias Pleroma.Web.{OStatus, CommonAPI} + alias Pleroma.Web.MediaProxy import Ecto.Query @instance Application.get_env(:pleroma, :instance) @@ -97,7 +98,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do {:ok, object} = ActivityPub.upload(file) url = List.first(object.data["url"]) - href = url["href"] + href = url["href"] |> MediaProxy.url() type = url["mediaType"] case format do