diff options
| author | dtluna <dtluna@openmailbox.org> | 2017-04-28 16:06:57 +0300 |
|---|---|---|
| committer | dtluna <dtluna@openmailbox.org> | 2017-04-28 16:06:57 +0300 |
| commit | a9b2ad17596d1b6deca646239a95e94dc644ebf3 (patch) | |
| tree | 9e086441831f33e191cd62b05b61ece0677491cc /lib/pleroma/web/twitter_api/representers | |
| parent | 28b203d08fe2e0d7afe3f3ec03a16cef62288b23 (diff) | |
| parent | fb5cebc1b5dcfd6af7fa1a81bc5b26275714fa26 (diff) | |
| download | pleroma-a9b2ad17596d1b6deca646239a95e94dc644ebf3.tar.gz | |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity
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, 1 insertions, 5 deletions
diff --git a/lib/pleroma/web/twitter_api/representers/user_representer.ex b/lib/pleroma/web/twitter_api/representers/user_representer.ex index f358baf3c..ab7d6d353 100644 --- a/lib/pleroma/web/twitter_api/representers/user_representer.ex +++ b/lib/pleroma/web/twitter_api/representers/user_representer.ex @@ -4,11 +4,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenter do alias Pleroma.User def to_map(user, opts) do - image = case user.avatar do - %{"url" => [%{"href" => href} | _]} -> href - _ -> "https://placehold.it/48x48" - end - + image = User.avatar_url(user) following = if opts[:for] do User.following?(opts[:for], user) else |