diff options
| author | eugenijm <eugenijm@protonmail.com> | 2020-04-12 22:54:43 +0300 |
|---|---|---|
| committer | eugenijm <eugenijm@protonmail.com> | 2020-05-21 04:41:42 +0300 |
| commit | b7fc61e17b995e3aa4e52f85b91d320a1cd1e106 (patch) | |
| tree | 2b361619e710819c511b986804e6e92ac8664c15 /lib/pleroma/user.ex | |
| parent | 42b06d78dfc9cec2a31bcb4676cc0135863ca97d (diff) | |
| download | pleroma-b7fc61e17b995e3aa4e52f85b91d320a1cd1e106.tar.gz | |
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
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 e8013bf40..eb9533d78 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 |