Do not send an empty line at the start of each steam message

We shouldn’t try to include the “Subject” part of the message: it’s always
empty, because this is only sent by MUC servers to signal the room’s
topic. This is not used in one-to-one conversations.

fix #20

database/database.go

@@ -132,7 +132,7 @@ func RemoveLine(jid string) bool {
 func GetLine(jid string) *DatabaseLine {
 	ret := getLine(jid)
 
-	if ret.SteamLogin == "" {
+	if ret == nil || ret.SteamLogin == "" {
 		log.Printf("%sLine empty", LogDebug)
 		return nil
 	}

gateway/xmpp.go

@@ -124,7 +124,7 @@ func (g *GatewayInfo) ReceivedXMPP_Presence(presence *xmpp.Presence) {
 
 func (g *GatewayInfo) ReceivedXMPP_Message(message *xmpp.Message) {
 	steamID := strings.SplitN(message.To, "@", 2)[0]
-	g.SendSteamMessage(steamID, message.Subject+"\n"+message.Body)
+	g.SendSteamMessage(steamID, message.Body)
 }
 
 func (g *GatewayInfo) XMPP_Disconnect() {

xmpp/commands.go

@@ -25,17 +25,24 @@ func execDiscoCommand(iq *xmpp.Iq) {
 	reply := iq.Response(xmpp.IQTypeResult)
 	discoItem := &xmpp.DiscoItems{Node: xmpp.NodeAdHocCommand}
 
+	jidBare := strings.SplitN(iq.From, "/", 2)[0]
+	dbUser := database.GetLine(jidBare)
+
 	// Add available commands
-	discoI := &xmpp.DiscoItem{JID: jid.Domain, Node: CommandAuthcode, Name: "Add Steam Auth Code"}
+	if dbUser == nil {
-	discoItem.Item = append(discoItem.Item, *discoI)
+		discoI := &xmpp.DiscoItem{JID: jid.Domain, Node: CommandGetIdentifiants, Name: "Steam registration"}
-	discoI = &xmpp.DiscoItem{JID: jid.Domain, Node: CommandGetIdentifiants, Name: "Steam registration"}
+		discoItem.Item = append(discoItem.Item, *discoI)
-	discoItem.Item = append(discoItem.Item, *discoI)
+	} else {
-	discoI = &xmpp.DiscoItem{JID: jid.Domain, Node: CommandDisconnectSteam, Name: "Force Steam deconnexion"}
+		// Add only if user is registered
-	discoItem.Item = append(discoItem.Item, *discoI)
+		discoI := &xmpp.DiscoItem{JID: jid.Domain, Node: CommandAuthcode, Name: "Add Steam Auth Code"}
-	discoI = &xmpp.DiscoItem{JID: jid.Domain, Node: CommandRemoveRegistration, Name: "Remove registration"}
+		discoItem.Item = append(discoItem.Item, *discoI)
-	discoItem.Item = append(discoItem.Item, *discoI)
+		discoI = &xmpp.DiscoItem{JID: jid.Domain, Node: CommandDisconnectSteam, Name: "Force Steam deconnexion"}
-	discoI = &xmpp.DiscoItem{JID: jid.Domain, Node: CommandToggleDebugMode, Name: "Toggle debug mode"}
+		discoItem.Item = append(discoItem.Item, *discoI)
-	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
@@ -108,18 +115,22 @@ func execCommandAdHoc(iq *xmpp.Iq) {
 
 			jidBare := strings.SplitN(iq.From, "/", 2)[0]
 			dbUser := database.GetLine(jidBare)
-			dbUser.Debug = !dbUser.Debug
+			if dbUser != nil {
-			g := MapGatewayInfo[jidBare]
+				dbUser.Debug = !dbUser.Debug
-			ok := dbUser.UpdateLine()
+				g := MapGatewayInfo[jidBare]
-			if ok && g != nil {
+				ok := dbUser.UpdateLine()
-				g.DebugMessage = dbUser.Debug
+				if ok && g != nil {
-				if dbUser.Debug {
+					g.DebugMessage = dbUser.Debug
-					note.Value = "Debug activated."
+					if dbUser.Debug {
+						note.Value = "Debug activated."
+					} else {
+						note.Value = "Debug desactivated."
+					}
 				} else {
-					note.Value = "Debug desactivated."
+					note.Value = "Failed to update your profile. :("
 				}
 			} else {
-				note.Value = "Failed to update your profile. :("
+				note.Value = "Your not registered."
 			}
 
 			cmd.Note = *note