aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-05-06 16:30:05 -0500
committerMark Felder <feld@FreeBSD.org>2020-05-06 16:30:05 -0500
commit57736c18332b0017e01d90e56547af1f5f830b7a (patch)
treed473bc5db0e07071905db0c6d11572cc292d5e3f /lib
parent68a126317d7cdd670c8e244319da08ff85639d33 (diff)
downloadpleroma-57736c18332b0017e01d90e56547af1f5f830b7a.tar.gz
Privacy option affects all push notifications, not just Direct Messages
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/push/impl.ex7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/pleroma/web/push/impl.ex b/lib/pleroma/web/push/impl.ex
index a9f893f7b..7f80bb0c9 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}}
- },
+ } = notification,
actor,
_object,
- _mastodon_type
+ mastodon_type
) do
- %{title: "New Direct Message", body: "@#{actor.nickname}"}
+ %{title: format_title(notification, mastodon_type), body: "@#{actor.nickname}"}
end
def build_content(notification, actor, object, mastodon_type) do