diff options
| author | kaniini <nenolod@gmail.com> | 2018-10-29 15:28:29 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-10-29 15:28:29 +0000 |
| commit | fbbc5fc91970b2dccb2888e343cad42de8a157bb (patch) | |
| tree | 53e1dc6cdd0d88c7f09a6443f361aa4f221adbf0 /lib/pleroma/web/twitter_api/twitter_api.ex | |
| parent | 658036881d132e22cb033dff1ac2bdbd74e802a1 (diff) | |
| parent | 5c6ec2d9fc0bd9e6b49906ea58f163264c37a54e (diff) | |
| download | pleroma-fbbc5fc91970b2dccb2888e343cad42de8a157bb.tar.gz | |
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 (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index 3747285da..cb483df9d 100644 --- 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 |