From d64fd5cb161f3dddcd3f0804e616ae3c5d193e62 Mon Sep 17 00:00:00 2001
From: Chteufleur <chteufleur@kingpenguin.tk>
Date: Fri, 2 Sep 2016 21:56:13 +0200
Subject: [PATCH] Re-organize to handle disco

---
 xmpp/commands.go | 62 +++++++++++++++++++++++++++++++++---------------
 xmpp/xmpp.go     |  2 ++
 2 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/xmpp/commands.go b/xmpp/commands.go
index 1539355..549f839 100644
--- a/xmpp/commands.go
+++ b/xmpp/commands.go
@@ -18,33 +18,57 @@ const (
 
 var (
 	ChanAuthCode = make(chan string)
+	identity = &xmpp.DiscoIdentity{Category: "gateway", Type: "steam", Name: "Steam Gateway"}
 )
 
 func execDiscoCommand(iq *xmpp.Iq) {
 	log.Printf("%sDiscovery item iq received", LogInfo)
-	reply := iq.Response(xmpp.IQTypeResult)
-	discoItem := &xmpp.DiscoItems{Node: xmpp.NodeAdHocCommand}
 
-	jidBare := strings.SplitN(iq.From, "/", 2)[0]
-	dbUser := database.GetLine(jidBare)
+	discoInfo := &xmpp.DiscoItems{}
+	iq.PayloadDecode(discoInfo)
+	if discoInfo.Node == "" {
+		// Disco feature
+		execDisco(iq)
+		return
+	} else if discoInfo.Node == xmpp.NodeAdHocCommand {
+		// Disco Ad-Hoc
+		reply := iq.Response(xmpp.IQTypeResult)
+		discoItem := &xmpp.DiscoItems{Node: xmpp.NodeAdHocCommand}
 
-	// Add available commands
-	if dbUser == nil {
-		discoI := &xmpp.DiscoItem{JID: jid.Domain, Node: CommandGetIdentifiants, Name: "Steam registration"}
-		discoItem.Item = append(discoItem.Item, *discoI)
-	} else {
-		// Add only if user is registered
-		discoI := &xmpp.DiscoItem{JID: jid.Domain, Node: CommandAuthcode, Name: "Add Steam Auth Code"}
-		discoItem.Item = append(discoItem.Item, *discoI)
-		discoI = &xmpp.DiscoItem{JID: jid.Domain, Node: CommandDisconnectSteam, Name: "Force Steam deconnexion"}
-		discoItem.Item = append(discoItem.Item, *discoI)
-		discoI = &xmpp.DiscoItem{JID: jid.Domain, Node: CommandRemoveRegistration, Name: "Remove registration"}
-		discoItem.Item = append(discoItem.Item, *discoI)
-		discoI = &xmpp.DiscoItem{JID: jid.Domain, Node: CommandToggleDebugMode, Name: "Toggle debug mode"}
-		discoItem.Item = append(discoItem.Item, *discoI)
+		jidBare := strings.SplitN(iq.From, "/", 2)[0]
+		dbUser := database.GetLine(jidBare)
+
+		// Add available commands
+		if dbUser == nil {
+			discoI := &xmpp.DiscoItem{JID: jid.Domain, Node: CommandGetIdentifiants, Name: "Steam registration"}
+			discoItem.Item = append(discoItem.Item, *discoI)
+			} else {
+				// Add only if user is registered
+				discoI := &xmpp.DiscoItem{JID: jid.Domain, Node: CommandAuthcode, Name: "Add Steam Auth Code"}
+				discoItem.Item = append(discoItem.Item, *discoI)
+				discoI = &xmpp.DiscoItem{JID: jid.Domain, Node: CommandDisconnectSteam, Name: "Force Steam deconnexion"}
+				discoItem.Item = append(discoItem.Item, *discoI)
+				discoI = &xmpp.DiscoItem{JID: jid.Domain, Node: CommandRemoveRegistration, Name: "Remove registration"}
+				discoItem.Item = append(discoItem.Item, *discoI)
+				discoI = &xmpp.DiscoItem{JID: jid.Domain, Node: CommandToggleDebugMode, Name: "Toggle debug mode"}
+				discoItem.Item = append(discoItem.Item, *discoI)
+			}
+
+			reply.PayloadEncode(discoItem)
+			comp.Out <- reply
 	}
+}
 
-	reply.PayloadEncode(discoItem)
+func execDisco(iq *xmpp.Iq) {
+	log.Printf("%sDisco Feature", LogInfo)
+	reply := iq.Response(xmpp.IQTypeResult)
+
+	discoInfo := &xmpp.DiscoInfo{}
+	discoInfo.Identity = append(discoInfo.Identity, *identity)
+	discoInfo.Feature = append(discoInfo.Feature, xmpp.DiscoFeature{Var: xmpp.NSJabberClient})
+	discoInfo.Feature = append(discoInfo.Feature, xmpp.DiscoFeature{Var: xmpp.NodeAdHocCommand})
+
+	reply.PayloadEncode(discoInfo)
 	comp.Out <- reply
 }
 
diff --git a/xmpp/xmpp.go b/xmpp/xmpp.go
index 7644df5..e991d7f 100644
--- a/xmpp/xmpp.go
+++ b/xmpp/xmpp.go
@@ -89,6 +89,8 @@ func mainXMPP() {
 				} else {
 					sendNotSupportedFeature(v)
 				}
+			case xmpp.NSDiscoInfo:
+				execDisco(v)
 
 			case xmpp.NodeAdHocCommand:
 				if jidBare == jid.Domain {