Support multiple command elements

This commit is contained in:
Bohdan Horbeshko 2024-05-12 09:13:13 -04:00
parent 380694353e
commit a21cbec9ec
2 changed files with 19 additions and 12 deletions

View file

@ -23,7 +23,7 @@ const (
type Command struct {
XMLName xml.Name `xml:"http://jabber.org/protocol/commands command"`
CommandElement CommandElement
CommandElements []CommandElement
BadAction *struct{} `xml:"bad-action,omitempty"`
BadLocale *struct{} `xml:"bad-locale,omitempty"`
@ -124,19 +124,19 @@ func (c *Command) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
case "actions":
a := Actions{}
err = d.DecodeElement(&a, &tt)
c.CommandElement = &a
c.CommandElements = append(c.CommandElements, &a)
case "note":
nt := Note{}
err = d.DecodeElement(&nt, &tt)
c.CommandElement = &nt
c.CommandElements = append(c.CommandElements, &nt)
case "x":
f := Form{}
err = d.DecodeElement(&f, &tt)
c.CommandElement = &f
c.CommandElements = append(c.CommandElements, &f)
default:
n := Node{}
err = d.DecodeElement(&n, &tt)
c.CommandElement = &n
c.CommandElements = append(c.CommandElements, &n)
if err != nil {
return err
}

View file

@ -240,7 +240,7 @@ func NewApprovePendingSubRequest(serviceId, sessionId, nodeId string) (*IQ, erro
Node: "http://jabber.org/protocol/pubsub#get-pending",
Action: CommandActionExecute,
SessionId: sessionId,
CommandElement: &n,
CommandElements: []CommandElement{&n},
}
return iq, nil
}
@ -353,11 +353,18 @@ func (iq *IQ) GetFormFields() (map[string]*Field, error) {
case *Command:
fieldMap := make(map[string]*Field)
co, ok := payload.CommandElement.(*Form)
if !ok {
var form *Form
for _, ce := range payload.CommandElements {
fo, ok := ce.(*Form)
if ok {
form = fo
break
}
}
if form == nil {
return nil, errors.New("this IQ does not contain a command payload with a form")
}
for _, elt := range co.Fields {
for _, elt := range form.Fields {
fieldMap[elt.Var] = elt
}
return fieldMap, nil