mirror of
https://dev.narayana.im/narayana/telegabber.git
synced 2026-08-05 04:07:07 +00:00
Make the child message of forward belong to jabber:client namespace
This commit is contained in:
parent
c4341433d6
commit
6e0da6ba3a
2 changed files with 11 additions and 2 deletions
|
|
@ -408,7 +408,7 @@ type FlipPage struct {
|
||||||
// ForwardedMessage is from XEP-0297 (go-xmpp lacks Delay)
|
// ForwardedMessage is from XEP-0297 (go-xmpp lacks Delay)
|
||||||
type ForwardedMessage struct {
|
type ForwardedMessage struct {
|
||||||
XMLName xml.Name `xml:"urn:xmpp:forward:0 forwarded"`
|
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"`
|
Delay *MessageDelay `xml:"urn:xmpp:delay delay,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -446,9 +446,18 @@ func sendMessageWrapper(to, from, body, subject, errorText, id string, component
|
||||||
mamQueryId = mneVpadluProbrasyvatJoshParametryPoraRefaktorit[1]
|
mamQueryId = mneVpadluProbrasyvatJoshParametryPoraRefaktorit[1]
|
||||||
delay := extensions.NewMessageDelay(timestamp, "")
|
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{
|
forwarded := extensions.ForwardedMessage{
|
||||||
Delay: &delay,
|
Delay: &delay,
|
||||||
Message: &message,
|
Message: &clientMessage,
|
||||||
}
|
}
|
||||||
|
|
||||||
var ext stanza.MsgExtension
|
var ext stanza.MsgExtension
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue