From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 6 May 2020 21:30:05 +0000 (-0500)
Subject: Privacy option affects all push notifications, not just Direct Messages
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=57736c18332b0017e01d90e56547af1f5f830b7a;p=akkoma

Privacy option affects all push notifications, not just Direct Messages
---

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