projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/ap-icon' into 'develop'
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index 09d20b4325d7618f34c7ecc9ff7e38092cfbfb80..3beebd1216394b3abe2c48aedfe7e2751681cc34 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-79,17
+79,17
@@
defmodule Pleroma.User do
def superuser?(%User{local: true, info: %User.Info{is_moderator: true}}), do: true
def superuser?(_), do: false
def superuser?(%User{local: true, info: %User.Info{is_moderator: true}}), do: true
def superuser?(_), do: false
- def avatar_url(user) do
+ def avatar_url(user
, options \\ []
) do
case user.avatar do
%{"url" => [%{"href" => href} | _]} -> href
case user.avatar do
%{"url" => [%{"href" => href} | _]} -> href
- _ -> "#{Web.base_url()}/images/avi.png"
+ _ ->
!options[:no_default] &&
"#{Web.base_url()}/images/avi.png"
end
end
end
end
- def banner_url(user) do
+ def banner_url(user
, options \\ []
) do
case user.info.banner do
%{"url" => [%{"href" => href} | _]} -> href
case user.info.banner do
%{"url" => [%{"href" => href} | _]} -> href
- _ -> "#{Web.base_url()}/images/banner.png"
+ _ ->
!options[:no_default] &&
"#{Web.base_url()}/images/banner.png"
end
end
end
end