mirror of
https://github.com/philomena-dev/philomena.git
synced 2025-02-07 23:06:42 +01:00
Fixed user.avatar failure. Ran mix format.
This commit is contained in:
parent
0ae05b97b2
commit
7a164944b4
4 changed files with 99 additions and 98 deletions
|
@ -1,5 +1,4 @@
|
|||
defmodule PhilomenaWeb.AwardsJson do
|
||||
|
||||
def as_json(_conn, award) do
|
||||
%{
|
||||
image_url: badge_url_root() <> "/" <> award.badge.image,
|
||||
|
|
|
@ -10,7 +10,7 @@ defmodule PhilomenaWeb.Api.Json.ProfileController do
|
|||
profile =
|
||||
User
|
||||
|> where(id: ^id)
|
||||
|> preload([public_links: :tag, awards: :badge])
|
||||
|> preload(public_links: :tag, awards: :badge)
|
||||
|> Repo.one()
|
||||
|
||||
cond do
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
defmodule PhilomenaWeb.LinksJson do
|
||||
|
||||
def as_json(_conn, %{public: false}), do: nil
|
||||
|
||||
def as_json(_conn, link) do
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
defmodule PhilomenaWeb.UserJson do
|
||||
|
||||
alias PhilomenaWeb.LinksJson
|
||||
alias PhilomenaWeb.AwardsJson
|
||||
|
||||
|
@ -10,7 +9,7 @@ defmodule PhilomenaWeb.UserJson do
|
|||
slug: user.slug,
|
||||
role: role(user),
|
||||
description: user.description,
|
||||
avatar_url: avatar_url_root() <> "/" <> user.avatar,
|
||||
avatar_url: avatar_url(user),
|
||||
created_at: user.created_at,
|
||||
comments_count: user.comments_posted_count,
|
||||
uploads_count: user.uploads_count,
|
||||
|
@ -29,7 +28,11 @@ defmodule PhilomenaWeb.UserJson do
|
|||
user.role
|
||||
end
|
||||
|
||||
defp avatar_url_root do
|
||||
Application.get_env(:philomena, :avatar_url_root)
|
||||
defp avatar_url(%{avatar: nil}) do
|
||||
nil
|
||||
end
|
||||
|
||||
defp avatar_url(user) do
|
||||
Application.get_env(:philomena, :avatar_url_root) <> "/" <> user.avatar
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue