From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Tue, 12 Jun 2018 20:47:23 +0000 (+0200)
Subject: mod_push: Also include sender/body for carbons
X-Git-Tag: 18.06~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a9f52222281b73d5a383a42e1b20079bf545aa4;p=ejabberd

mod_push: Also include sender/body for carbons

If the 'include_sender' and/or 'include_body' options are specified,
also include a urn:xmpp:push:summary form in push notifications that are
generated for carbon-copied messages (with a body).
---

diff --git a/src/mod_push.erl b/src/mod_push.erl
index 077556ffd..eb06e41b0 100644
--- a/src/mod_push.erl
+++ b/src/mod_push.erl
@@ -346,7 +346,7 @@ c2s_stanza(State, #stream_error{}, _SendResult) ->
 c2s_stanza(#{push_enabled := true, mgmt_state := pending} = State,
 	   Pkt, _SendResult) ->
     ?DEBUG("Notifying client of stanza", []),
-    notify(State, Pkt),
+    notify(State, xmpp_util:unwrap_carbon(Pkt)),
     State;
 c2s_stanza(State, _Pkt, _SendResult) ->
     State.