mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-22 16:16:34 +00:00
Display the users avatar if he has one set.
This commit is contained in:
parent
d7e3b72c6a
commit
03a9c11d25
2 changed files with 11 additions and 8 deletions
|
@ -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)
|
||||
|
|
|
@ -8,18 +8,19 @@ defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenterTest do
|
|||
import Pleroma.Factory
|
||||
|
||||
setup do
|
||||
# {:ok, user} = UserBuilder.insert
|
||||
user = insert(:user)
|
||||
[user: user]
|
||||
end
|
||||
|
||||
test "A user with an avatar object", %{user: user} do
|
||||
image = "image"
|
||||
user = %{ user | avatar: %{ "url" => [%{"href" => image}] }}
|
||||
represented = UserRepresenter.to_map(user)
|
||||
assert represented["profile_image_url"] == image
|
||||
end
|
||||
|
||||
test "A user", %{user: user} do
|
||||
image = "https://placehold.it/48x48"
|
||||
image = if user.avatar do
|
||||
|
||||
else
|
||||
image
|
||||
end
|
||||
|
||||
represented = %{
|
||||
"id" => user.id,
|
||||
|
|
Loading…
Reference in a new issue