From 6c573cc9fd27a85c0551fe08b90acf903ac4ff97 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Sat, 9 Sep 2023 17:33:16 +0200 Subject: [PATCH] mod_push: Set 'last-message-sender' to bare JID If the mod_push option 'include_sender' is set to 'true', use the bare JID rather than the full JID for the 'last-message-sender' field. --- src/mod_push.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mod_push.erl b/src/mod_push.erl index 7979125c5..8a6901efb 100644 --- a/src/mod_push.erl +++ b/src/mod_push.erl @@ -682,7 +682,7 @@ drop_online_sessions(LUser, LServer, Clients) -> -spec make_summary(binary(), xmpp_element() | xmlel() | none, direction()) -> xdata() | undefined. -make_summary(Host, #message{from = From} = Pkt, recv) -> +make_summary(Host, #message{from = From0} = Pkt, recv) -> case {mod_push_opt:include_sender(Host), mod_push_opt:include_body(Host)} of {false, false} -> @@ -702,6 +702,7 @@ make_summary(Host, #message{from = From} = Pkt, recv) -> end, Fields2 = case IncludeSender of true -> + From = jid:remove_resource(From0), [{'last-message-sender', From} | Fields1]; false -> Fields1