Upgrade to go-xmpp version with multiple command elements support

1 files changed, 21 insertions, 12 deletions

diff --git a/xmpp/handlers.go b/xmpp/handlers.go
index 1a47c10..2615290 100644
--- a/xmpp/handlers.go
+++ b/xmpp/handlers.go
@@ -749,13 +749,20 @@ func handleSetQueryCommand(s xmpp.Sender, iq *stanza.IQ, command *stanza.Command
 
 	var cmdString string
 	var cmdType telegram.CommandType
-	form, formOk := command.CommandElement.(*stanza.Form)
+	var form *stanza.Form
+	for _, ce := range command.CommandElements {
+		fo, formOk := ce.(*stanza.Form)
+		if formOk {
+			form = fo
+			break
+		}
+	}
 	if toOk {
 		cmdType = telegram.CommandTypeChat
 	} else {
 		cmdType = telegram.CommandTypeTransport
 	}
-	if formOk {
+	if form != nil {
 		// just for the case the client messed the order somehow
 		sort.Slice(form.Fields, func(i int, j int) bool {
 			iField := form.Fields[i]
@@ -844,10 +851,10 @@ func handleSetQueryCommand(s xmpp.Sender, iq *stanza.IQ, command *stanza.Command
 					Fields:       fields,
 				}
 				answer.Payload = &stanza.Command{
-					SessionId:      command.Node,
-					Node:           command.Node,
-					Status:         stanza.CommandStatusExecuting,
-					CommandElement: &form,
+					SessionId:       command.Node,
+					Node:            command.Node,
+					Status:          stanza.CommandStatusExecuting,
+					CommandElements: []stanza.CommandElement{&form},
 				}
 				log.Debugf("form: %#v", form)
 			} else {
@@ -884,12 +891,14 @@ func handleSetQueryCommand(s xmpp.Sender, iq *stanza.IQ, command *stanza.Command
 		}
 
 		answer.Payload = &stanza.Command{
-			SessionId:      command.Node,
-			Node:           command.Node,
-			Status:         stanza.CommandStatusCompleted,
-			CommandElement: &stanza.Note{
-				Text: response,
-				Type: noteType,
+			SessionId:       command.Node,
+			Node:            command.Node,
+			Status:          stanza.CommandStatusCompleted,
+			CommandElements: []stanza.CommandElement{
+				&stanza.Note{
+					Text: response,
+					Type: noteType,
+				},
 			},
 		}