hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/activitypub

Browse source
This commit is contained in:
Roger Braun 2018-02-11 09:50:55 +01:00
commit 52200998c9
101 changed files with 661 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/user.ex
View file

@ -29,14 +29,14 @@ defmodule Pleroma.User do
def avatar_url(user) do
case user.avatar do
%{"url" => [%{"href" => href} | _]} -> href
_ -> "https://placehold.it/48x48"
_ -> "#{Web.base_url()}/images/avi.png"
end
end
def banner_url(user) do
case user.info["banner"] do
%{"url" => [%{"href" => href} | _]} -> href
_ -> nil
_ -> "#{Web.base_url()}/images/banner.png"
end
end