diff options
| author | lain <lain@soykaf.club> | 2020-05-25 13:57:27 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-25 13:57:27 +0200 |
| commit | ee35bb5ac287e0ff913685256a826e759add3fb9 (patch) | |
| tree | 971031903f987e4b70768ac1f91666fdfe6a10b4 /lib/pleroma/user.ex | |
| parent | 578ed3a37f28ecbd9fd976c54ee53e8ed2a6adff (diff) | |
| parent | ec470c4c7717dc9479df9e7b70f9805dcf2f5e08 (diff) | |
| download | pleroma-ee35bb5ac287e0ff913685256a826e759add3fb9.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 224dfd023..d2eeeb479 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -305,8 +305,13 @@ defmodule Pleroma.User do def avatar_url(user, options \\ []) do case user.avatar do - %{"url" => [%{"href" => href} | _]} -> href - _ -> !options[:no_default] && "#{Web.base_url()}/images/avi.png" + %{"url" => [%{"href" => href} | _]} -> + href + + _ -> + unless options[:no_default] do + Config.get([:assets, :default_user_avatar], "#{Web.base_url()}/images/avi.png") + end end end |