Privacy option affects all push notifications, not just Direct Messages

2020-05-06 16:30:05 -05:00 · 2020-05-06 16:30:05 -05:00 · 57736c1833
parent 68a126317d
commit 57736c1833
1 changed files with 3 additions and 4 deletions
--- 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