limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity

use User.avatar_url

Browse source
This commit is contained in:
Egor Kislitsyn 2018-12-06 20:55:46 +07:00
parent 79668c08fc
commit 6f36e903b0
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/pleroma/web/push/push.ex
View file

@ -68,7 +68,7 @@ defmodule Pleroma.Web.Push do
Logger.error("Web Push Nonification failed with code: #{code}") Logger.error("Web Push Nonification failed with code: #{code}")
:error :error
data -> _ ->
Logger.error("Web Push Nonification failed with unknown error") Logger.error("Web Push Nonification failed with unknown error")
:error :error
end end
@ -86,7 +86,7 @@ defmodule Pleroma.Web.Push do
%{ %{
title: "New Mention", title: "New Mention",
body: "@#{actor.nickname} has mentiond you", body: "@#{actor.nickname} has mentiond you",
icon: get_avatar_url(actor) icon: User.avatar_url(actor)
} }
end end
@ -94,7 +94,7 @@ defmodule Pleroma.Web.Push do
%{ %{
title: "New Follower", title: "New Follower",
body: "@#{actor.nickname} has followed you", body: "@#{actor.nickname} has followed you",
icon: get_avatar_url(actor) icon: User.avatar_url(actor)
} }
end end
@ -102,7 +102,7 @@ defmodule Pleroma.Web.Push do
%{ %{
title: "New Announce", title: "New Announce",
body: "@#{actor.nickname} has announced your post", body: "@#{actor.nickname} has announced your post",
icon: get_avatar_url(actor) icon: User.avatar_url(actor)
} }
end end
@ -110,18 +110,7 @@ defmodule Pleroma.Web.Push do
%{ %{
title: "New Like", title: "New Like",
body: "@#{actor.nickname} has liked your post", body: "@#{actor.nickname} has liked your post",
icon: get_avatar_url(actor) icon: User.avatar_url(actor)
} }
end end
def get_avatar_url(%{avatar: %{"type" => "Image", "url" => urls}}) do
case List.first(urls) do
%{"href" => url} -> url
_ -> get_avatar_url(nil)
end
end
def get_avatar_url(_) do
Pleroma.Web.Endpoint.static_url() <> "/images/avi.png"
end
end end