Push: respect alerts settings
This commit is contained in:
parent
d8984b7bf8
commit
b1bcd97a0f
1 changed files with 16 additions and 11 deletions
|
@ -42,45 +42,50 @@ def handle_cast(
|
||||||
when type in @types do
|
when type in @types do
|
||||||
actor = User.get_cached_by_ap_id(notification.activity.data["actor"])
|
actor = User.get_cached_by_ap_id(notification.activity.data["actor"])
|
||||||
|
|
||||||
|
type = format_type(notification)
|
||||||
|
|
||||||
Subscription
|
Subscription
|
||||||
|> where(user_id: ^user_id)
|
|> where(user_id: ^user_id)
|
||||||
|> preload(:token)
|
|> preload(:token)
|
||||||
|> Repo.all()
|
|> Repo.all()
|
||||||
|> Enum.each(fn record ->
|
|> Enum.filter(fn subscription ->
|
||||||
subscription = %{
|
get_in(subscription.data, ["alerts", type]) || false
|
||||||
|
end)
|
||||||
|
|> Enum.each(fn subscription ->
|
||||||
|
sub = %{
|
||||||
keys: %{
|
keys: %{
|
||||||
p256dh: record.key_p256dh,
|
p256dh: subscription.key_p256dh,
|
||||||
auth: record.key_auth
|
auth: subscription.key_auth
|
||||||
},
|
},
|
||||||
endpoint: record.endpoint
|
endpoint: subscription.endpoint
|
||||||
}
|
}
|
||||||
|
|
||||||
body =
|
body =
|
||||||
Jason.encode!(%{
|
Jason.encode!(%{
|
||||||
title: format_title(notification),
|
title: format_title(notification),
|
||||||
access_token: record.token.token,
|
access_token: subscription.token.token,
|
||||||
body: format_body(notification, actor),
|
body: format_body(notification, actor),
|
||||||
notification_id: notification.id,
|
notification_id: notification.id,
|
||||||
notification_type: format_type(notification),
|
notification_type: type,
|
||||||
icon: User.avatar_url(actor),
|
icon: User.avatar_url(actor),
|
||||||
preferred_locale: "en"
|
preferred_locale: "en"
|
||||||
})
|
})
|
||||||
|
|
||||||
case WebPushEncryption.send_web_push(body, subscription) do
|
case WebPushEncryption.send_web_push(body, sub) do
|
||||||
{:ok, %{status_code: code}} when 400 <= code and code < 500 ->
|
{:ok, %{status_code: code}} when 400 <= code and code < 500 ->
|
||||||
Logger.debug("Removing subscription record")
|
Logger.debug("Removing subscription record")
|
||||||
Repo.delete!(record)
|
Repo.delete!(subscription)
|
||||||
:ok
|
:ok
|
||||||
|
|
||||||
{:ok, %{status_code: code}} when 200 <= code and code < 300 ->
|
{:ok, %{status_code: code}} when 200 <= code and code < 300 ->
|
||||||
:ok
|
:ok
|
||||||
|
|
||||||
{:ok, %{status_code: code}} ->
|
{:ok, %{status_code: code}} ->
|
||||||
Logger.error("Web Push Nonification failed with code: #{code}")
|
Logger.error("Web Push Notification failed with code: #{code}")
|
||||||
:error
|
:error
|
||||||
|
|
||||||
_ ->
|
_ ->
|
||||||
Logger.error("Web Push Nonification failed with unknown error")
|
Logger.error("Web Push Notification failed with unknown error")
|
||||||
:error
|
:error
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
Loading…
Reference in a new issue