diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-08 21:37:55 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-08 21:37:55 +0300 |
commit | b2924ab1fbba4e6add15030cf8444d2d3f0cfe0c (patch) | |
tree | 000420341c4397cb7e380ff6fa52bb023700476a /lib/pleroma/web/push/impl.ex | |
parent | d5cdc907e3fda14c2ce78ddbb124739441330ecc (diff) | |
parent | 570940a3fd8d5a2fb600656432dfc01304161221 (diff) | |
download | pleroma-b2924ab1fbba4e6add15030cf8444d2d3f0cfe0c.tar.gz |
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
Diffstat (limited to 'lib/pleroma/web/push/impl.ex')
-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 |