X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=d2eeeb479dd07a7fb83b9b0022a421e94da18307;hb=2069ec5006b9142b784dc6ab8b190838481dfe5b;hp=224dfd023100325108c80d915f718245889f890f;hpb=f166316f507ed2ac165e230fcab0463afa9503bf;p=akkoma

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