diff options
author | dtluna <dtluna@openmailbox.org> | 2017-04-16 17:10:25 +0300 |
---|---|---|
committer | dtluna <dtluna@openmailbox.org> | 2017-04-16 17:10:25 +0300 |
commit | 85bd480be333896ca9cc0ade0e68ea99e10aaaa7 (patch) | |
tree | aa545ad989ae70367aff25e1dfe970f28e88e55a /lib/pleroma/web/twitter_api/representers | |
parent | ce1eef9c989f0387168b48f6f61a4c1f84b3f5b5 (diff) | |
parent | e158e32124a62f2c93a8910bf3edc4519c4a13e6 (diff) | |
download | pleroma-85bd480be333896ca9cc0ade0e68ea99e10aaaa7.tar.gz |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
Diffstat (limited to 'lib/pleroma/web/twitter_api/representers')
-rw-r--r-- | lib/pleroma/web/twitter_api/representers/user_representer.ex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/representers/user_representer.ex b/lib/pleroma/web/twitter_api/representers/user_representer.ex index d8f98488e..2ee4ee254 100644 --- a/lib/pleroma/web/twitter_api/representers/user_representer.ex +++ b/lib/pleroma/web/twitter_api/representers/user_representer.ex @@ -4,8 +4,10 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenter do alias Pleroma.User def to_map(user, opts) do - - image = "https://placehold.it/48x48" + image = case user.avatar do + %{"url" => [%{"href" => href} | _]} -> href + _ -> "https://placehold.it/48x48" + end following = if opts[:for] do User.following?(opts[:for], user) |