Merge remote-tracking branch 'upstream/develop' into media-proxy

diff --cc lib/pleroma/web/twitter_api/views/user_view.ex
index eeef1c0374d74ae87c7890b658316ec19cdbc7b4,d1c7e6fbde4023f62af3390a91de2b85dbd9877b..cc6b450fb1f6067ced932388acb1774ccde0934a
--- 1/lib/pleroma/web/twitter_api/views/user_view.ex
--- 2/lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/lib/pleroma/web/twitter_api/views/user_view.ex
@@@ -45,9 -44,15 +45,15 @@@ defmodule Pleroma.Web.TwitterAPI.UserVi
        "screen_name" => user.nickname,
        "statuses_count" => user_info[:note_count],
        "statusnet_profile_url" => user.ap_id,
 -      "cover_photo" => image_url(user.info["banner"]),
 -      "background_image" => image_url(user.info["background"])
 +      "cover_photo" => image_url(user.info["banner"]) |> MediaProxy.url(),
 +      "background_image" => image_url(user.info["background"]) |> MediaProxy.url(),
      }
+ 
+     if assigns[:token] do
+       Map.put(data, "token", assigns[:token])
+     else
+       data
+     end
    end
  
    def render("short.json", %{user: %User{