diff options
| author | kaniini <nenolod@gmail.com> | 2018-11-30 18:15:44 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-11-30 18:15:44 +0000 |
| commit | ca24ad2a2babed0700a38effb74910008d58f6ea (patch) | |
| tree | 13430c7b870e3dcc7cb32c299cbde6ca8d6ef362 /lib/pleroma/web/twitter_api/twitter_api.ex | |
| parent | e99bab8f279b419a6b54efa2f5397a78970c10ee (diff) | |
| parent | 8e0e20631c378a5008f0f0b4aba9deb994ea6c6c (diff) | |
| download | pleroma-ca24ad2a2babed0700a38effb74910008d58f6ea.tar.gz | |
Merge branch 'feature/reverse-proxy' into 'develop'
reverse proxy / uploads
See merge request pleroma/pleroma!470
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index 5bfb83b1e..6223580e1 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -97,7 +97,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do {:ok, object} = ActivityPub.upload(file) url = List.first(object.data["url"]) - href = url["href"] |> MediaProxy.url() + href = url["href"] type = url["mediaType"] case format do |