From 7f76a35240b2275f803c7ac8f190fffca5f5c6bf Mon Sep 17 00:00:00 2001 From: Chteufleur Date: Sat, 9 Apr 2016 13:50:19 +0200 Subject: [PATCH] go fmt --- main.go | 2 +- xmpp/commands.go | 91 +++++++++++++++++++++++------------------------- xmpp/xmpp.go | 22 ++++++------ 3 files changed, 56 insertions(+), 59 deletions(-) diff --git a/main.go b/main.go index 1dfdc7c..028370e 100644 --- a/main.go +++ b/main.go @@ -131,7 +131,7 @@ func gatewayXmppSteamMessage() { func gatewayXmppSteamAuthCode() { for { - authCode := <- xmpp.ChanAuthCode + authCode := <-xmpp.ChanAuthCode steam.AuthCode = authCode steam.Disconnect() time.Sleep(2 * time.Second) diff --git a/xmpp/commands.go b/xmpp/commands.go index 894dd2d..b611983 100644 --- a/xmpp/commands.go +++ b/xmpp/commands.go @@ -6,26 +6,23 @@ import ( "log" ) - - const ( - CommandAuthcode = "steamAuthCodeCommand" + CommandAuthcode = "steamAuthCodeCommand" ) var ( - ChanAuthCode = make(chan string) + ChanAuthCode = make(chan string) ) func execDiscoCommand(iq *xmpp.Iq) { - log.Printf("%sDiscovery item iq received", LogInfo) + log.Printf("%sDiscovery item iq received", LogInfo) reply := iq.Response(xmpp.IqTypeResult) discoItem := &xmpp.DiscoItems{Node: xmpp.NodeAdHocCommand} - // Add available commands + // Add available commands discoI := &xmpp.DiscoItem{JID: jid.Domain, Node: CommandAuthcode, Name: "Add Auth Code"} discoItem.Item = append(discoItem.Item, *discoI) - reply.PayloadEncode(discoItem) comp.Out <- reply } @@ -35,58 +32,58 @@ func execCommandAdHoc(iq *xmpp.Iq) { iq.PayloadDecode(adHoc) if adHoc.SessionId == "" && adHoc.Action == xmpp.ActionAdHocExecute { - // First step in the command - log.Printf("%sAd-Hoc command (Node : %s). First step.", LogInfo, adHoc.Node) + // First step in the command + log.Printf("%sAd-Hoc command (Node : %s). First step.", LogInfo, adHoc.Node) - reply := iq.Response(xmpp.IqTypeResult) - cmd := &xmpp.AdHocCommand{Node: adHoc.Node, Status: xmpp.StatusAdHocExecute, SessionId: xmpp.SessionId()} - if adHoc.Node == CommandAuthcode { - // Command Auth Code - cmdXForm := &xmpp.AdHocXForm{Type: xmpp.TypeAdHocForm, Title: "Steam Auth Code", Instructions: "Please provide the auth code that Steam sended to you."} + reply := iq.Response(xmpp.IqTypeResult) + cmd := &xmpp.AdHocCommand{Node: adHoc.Node, Status: xmpp.StatusAdHocExecute, SessionId: xmpp.SessionId()} + if adHoc.Node == CommandAuthcode { + // Command Auth Code + cmdXForm := &xmpp.AdHocXForm{Type: xmpp.TypeAdHocForm, Title: "Steam Auth Code", Instructions: "Please provide the auth code that Steam sended to you."} - field := &xmpp.AdHocField{Var: "code", Label: "Auth Code", Type: xmpp.TypeAdHocFieldTextSingle} - cmdXForm.Fields = append(cmdXForm.Fields, *field) - cmd.XForm = *cmdXForm + field := &xmpp.AdHocField{Var: "code", Label: "Auth Code", Type: xmpp.TypeAdHocFieldTextSingle} + cmdXForm.Fields = append(cmdXForm.Fields, *field) + cmd.XForm = *cmdXForm - } - reply.PayloadEncode(cmd) - comp.Out <- reply + } + reply.PayloadEncode(cmd) + comp.Out <- reply } else if adHoc.Action == xmpp.ActionAdHocExecute { // Last step in the command - log.Printf("%sAd-Hoc command (Node : %s). Last step.", LogInfo, adHoc.Node) - reply := iq.Response(xmpp.IqTypeResult) - cmd := &xmpp.AdHocCommand{Node: adHoc.Node, Status: xmpp.StatusAdHocCompleted, SessionId: adHoc.SessionId} + log.Printf("%sAd-Hoc command (Node : %s). Last step.", LogInfo, adHoc.Node) + reply := iq.Response(xmpp.IqTypeResult) + cmd := &xmpp.AdHocCommand{Node: adHoc.Node, Status: xmpp.StatusAdHocCompleted, SessionId: adHoc.SessionId} - if adHoc.Node == CommandAuthcode && adHoc.XForm.Type == xmpp.TypeAdHocSubmit { - cmdXForm := &xmpp.AdHocXForm{Type: xmpp.TypeAdHocResult, Title: "Steam Auth Code "} - cmd.XForm = *cmdXForm - note := &xmpp.AdHocNote{Type: xmpp.TypeAdHocNoteInfo} + if adHoc.Node == CommandAuthcode && adHoc.XForm.Type == xmpp.TypeAdHocSubmit { + cmdXForm := &xmpp.AdHocXForm{Type: xmpp.TypeAdHocResult, Title: "Steam Auth Code "} + cmd.XForm = *cmdXForm + note := &xmpp.AdHocNote{Type: xmpp.TypeAdHocNoteInfo} - // Command Auth Code - authCode := "" - fields := adHoc.XForm.Fields - for _, field := range fields { - if field.Var == "code" { - authCode = field.Value - break - } - } - if authCode != "" { - // Succeded - ChanAuthCode <- authCode - note.Value = "Commande effectuée avec succes !" - } else { - // Failed - note.Value = "Une erreur c'est produite à l'exécution de la commande…" - } - cmd.Note = *note - } + // Command Auth Code + authCode := "" + fields := adHoc.XForm.Fields + for _, field := range fields { + if field.Var == "code" { + authCode = field.Value + break + } + } + if authCode != "" { + // Succeded + ChanAuthCode <- authCode + note.Value = "Commande effectuée avec succes !" + } else { + // Failed + note.Value = "Une erreur c'est produite à l'exécution de la commande…" + } + cmd.Note = *note + } reply.PayloadEncode(cmd) comp.Out <- reply } else if adHoc.Action == xmpp.ActionAdHocCancel { // command canceled - log.Printf("%sAd-Hoc command (Node : %s). Command canceled.", LogInfo, adHoc.Node) + log.Printf("%sAd-Hoc command (Node : %s). Command canceled.", LogInfo, adHoc.Node) reply := iq.Response(xmpp.IqTypeResult) cmd := &xmpp.AdHocCommand{Node: adHoc.Node, Status: xmpp.StatusAdHocCanceled, SessionId: adHoc.SessionId} reply.PayloadEncode(cmd) diff --git a/xmpp/xmpp.go b/xmpp/xmpp.go index 667bfdc..00ddd53 100644 --- a/xmpp/xmpp.go +++ b/xmpp/xmpp.go @@ -132,17 +132,17 @@ func SendPresence(status, tpye, message string) { } func SendPresenceFrom(status, tpye, from, message, nick string) { -/* - if message == "" { - comp.Out <- xmpp.Presence{To: PreferedJID, From: from, Show: status, Type: tpye, Nick: nick} - } else if nick == "" { - comp.Out <- xmpp.Presence{To: PreferedJID, From: from, Show: status, Type: tpye, Status: message} - } else if nick == "" { - comp.Out <- xmpp.Presence{To: PreferedJID, From: from, Show: status, Type: tpye} - } else { - comp.Out <- xmpp.Presence{To: PreferedJID, From: from, Show: status, Type: tpye, Status: message, Nick: nick} - } -*/ + /* + if message == "" { + comp.Out <- xmpp.Presence{To: PreferedJID, From: from, Show: status, Type: tpye, Nick: nick} + } else if nick == "" { + comp.Out <- xmpp.Presence{To: PreferedJID, From: from, Show: status, Type: tpye, Status: message} + } else if nick == "" { + comp.Out <- xmpp.Presence{To: PreferedJID, From: from, Show: status, Type: tpye} + } else { + comp.Out <- xmpp.Presence{To: PreferedJID, From: from, Show: status, Type: tpye, Status: message, Nick: nick} + } + */ p := xmpp.Presence{To: PreferedJID, From: from} if status != "" {