diff options
| author | lain <lain@soykaf.club> | 2020-05-08 09:04:24 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-08 09:04:24 +0000 |
| commit | 218a22c9a36ff2f8de353110f0badfc1ec5aa0f2 (patch) | |
| tree | 2175816b58e6c999d9a17edc08736592aa8eedbe /lib | |
| parent | 769d95644daf07bf27fb483e91d0e793eaa18bd8 (diff) | |
| parent | ea01e647df4466975b9382f123f0a2aa35ebfe76 (diff) | |
| download | pleroma-218a22c9a36ff2f8de353110f0badfc1ec5aa0f2.tar.gz pleroma-218a22c9a36ff2f8de353110f0badfc1ec5aa0f2.zip | |
Merge branch 'fix/privacy-notification' into 'develop'
Privacy option affects all push notifications, not just Direct Messages
Closes #1745
See merge request pleroma/pleroma!2485
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/push/impl.ex | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/pleroma/web/push/impl.ex b/lib/pleroma/web/push/impl.ex index a9f893f7b..691725702 100644 --- a/lib/pleroma/web/push/impl.ex +++ b/lib/pleroma/web/push/impl.ex @@ -106,14 +106,13 @@ defmodule Pleroma.Web.Push.Impl do def build_content( %{ - activity: %{data: %{"directMessage" => true}}, user: %{notification_settings: %{privacy_option: true}} - }, - actor, + } = notification, + _actor, _object, - _mastodon_type + mastodon_type ) do - %{title: "New Direct Message", body: "@#{actor.nickname}"} + %{body: format_title(notification, mastodon_type)} end def build_content(notification, actor, object, mastodon_type) do |