From: href <href@random.sh>
Date: Tue, 5 Dec 2017 13:12:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into media-proxy
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=72f7baa6548dbd5cc5ae4c37d9c2e53126203449;p=akkoma

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

72f7baa6548dbd5cc5ae4c37d9c2e53126203449
diff --cc lib/pleroma/web/twitter_api/views/user_view.ex
index eeef1c037,d1c7e6fbd..cc6b450fb
--- a/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{