hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
href 2017-12-05 14:12:15 +01:00
commit 72f7baa654
No known key found for this signature in database
GPG key ID: EE8296C1A152C325
28 changed files with 126 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/web/twitter_api/views/user_view.ex
View file

@ -26,7 +26,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
user_info = User.get_cached_user_info(user)
%{
data = %{
"created_at" => user.inserted_at |> Utils.format_naive_asctime,
"description" => HtmlSanitizeEx.strip_tags(user.bio),
"favourites_count" => 0,
@ -48,6 +48,12 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
"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{