From 6e0da6ba3a808602b3de07673bf70a8c81addb8a Mon Sep 17 00:00:00 2001 From: Bohdan Horbeshko Date: Tue, 26 Aug 2025 11:12:55 -0400 Subject: [PATCH] Make the child message of forward belong to jabber:client namespace --- xmpp/extensions/extensions.go | 2 +- xmpp/gateway/gateway.go | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xmpp/extensions/extensions.go b/xmpp/extensions/extensions.go index 0414fc8..dcf8b3f 100644 --- a/xmpp/extensions/extensions.go +++ b/xmpp/extensions/extensions.go @@ -408,7 +408,7 @@ type FlipPage struct { // ForwardedMessage is from XEP-0297 (go-xmpp lacks Delay) type ForwardedMessage struct { XMLName xml.Name `xml:"urn:xmpp:forward:0 forwarded"` - Message *stanza.Message `xml:"message"` + Message *ClientMessage `xml:"jabber:client message"` Delay *MessageDelay `xml:"urn:xmpp:delay delay,omitempty"` } diff --git a/xmpp/gateway/gateway.go b/xmpp/gateway/gateway.go index f8e6533..863950c 100644 --- a/xmpp/gateway/gateway.go +++ b/xmpp/gateway/gateway.go @@ -446,9 +446,18 @@ func sendMessageWrapper(to, from, body, subject, errorText, id string, component mamQueryId = mneVpadluProbrasyvatJoshParametryPoraRefaktorit[1] delay := extensions.NewMessageDelay(timestamp, "") + clientMessage := extensions.ClientMessage{ + Attrs: message.Attrs, + Subject: message.Subject, + Body: message.Body, + Thread: message.Thread, + Error: message.Error, + Extensions: message.Extensions, + } + forwarded := extensions.ForwardedMessage{ Delay: &delay, - Message: &message, + Message: &clientMessage, } var ext stanza.MsgExtension