diff options
author | lain <lain@soykaf.club> | 2020-06-04 14:49:10 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-06-04 14:49:10 +0200 |
commit | b952f3f37907c735e3426ba43d01027f6f49c5b5 (patch) | |
tree | 85f0bc4bcc92dabbbe80d9ad6b1ec4ddb4d1bd5e /lib | |
parent | 5d7dda883e76041025384e453da74110c550aa3b (diff) | |
download | pleroma-b952f3f37907c735e3426ba43d01027f6f49c5b5.tar.gz |
WebPush: Push out chat message notications.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/push/impl.ex | 3 | ||||
-rw-r--r-- | lib/pleroma/web/push/subscription.ex | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/push/impl.ex b/lib/pleroma/web/push/impl.ex index 125f33755..006a242af 100644 --- a/lib/pleroma/web/push/impl.ex +++ b/lib/pleroma/web/push/impl.ex @@ -32,7 +32,7 @@ defmodule Pleroma.Web.Push.Impl do mastodon_type = notification.type gcm_api_key = Application.get_env(:web_push_encryption, :gcm_api_key) avatar_url = User.avatar_url(actor) - object = Object.normalize(activity) + object = Object.normalize(activity, false) user = User.get_cached_by_id(user_id) direct_conversation_id = Activity.direct_conversation_id(activity, user) @@ -171,6 +171,7 @@ defmodule Pleroma.Web.Push.Impl do "follow_request" -> "New Follow Request" "reblog" -> "New Repeat" "favourite" -> "New Favorite" + "pleroma:chat_mention" -> "New Chat Message" type -> "New #{String.capitalize(type || "event")}" end end diff --git a/lib/pleroma/web/push/subscription.ex b/lib/pleroma/web/push/subscription.ex index 3e401a490..5b5aa0d59 100644 --- a/lib/pleroma/web/push/subscription.ex +++ b/lib/pleroma/web/push/subscription.ex @@ -25,7 +25,7 @@ defmodule Pleroma.Web.Push.Subscription do timestamps() end - @supported_alert_types ~w[follow favourite mention reblog]a + @supported_alert_types ~w[follow favourite mention reblog pleroma:chat_mention]a defp alerts(%{data: %{alerts: alerts}}) do alerts = Map.take(alerts, @supported_alert_types) |