Correct some misspell and unreachable code.
This commit is contained in:
parent
1743a46eea
commit
e871a899f0
|
|
@ -51,7 +51,7 @@ func loadConfigFile() bool {
|
||||||
if _, err := os.Stat(configFile); err == nil {
|
if _, err := os.Stat(configFile); err == nil {
|
||||||
// The config file exist
|
// The config file exist
|
||||||
if cfg.Load(configFile, MapConfig) == nil {
|
if cfg.Load(configFile, MapConfig) == nil {
|
||||||
// And has been loaded succesfully
|
// And has been loaded successfully
|
||||||
logger.Info.Println("Find configuration file at " + configFile)
|
logger.Info.Println("Find configuration file at " + configFile)
|
||||||
ret = true
|
ret = true
|
||||||
break
|
break
|
||||||
|
|
|
||||||
|
|
@ -45,10 +45,6 @@ func (g *GatewayInfo) SteamRun() {
|
||||||
g.mainSteam()
|
g.mainSteam()
|
||||||
|
|
||||||
logger.Info.Printf("[%s] Reach main method's end", g.XMPP_JID_Client)
|
logger.Info.Printf("[%s] Reach main method's end", g.XMPP_JID_Client)
|
||||||
return
|
|
||||||
g.Disconnect()
|
|
||||||
go g.XMPP_Disconnect()
|
|
||||||
g.Run()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *GatewayInfo) mainSteam() {
|
func (g *GatewayInfo) mainSteam() {
|
||||||
|
|
|
||||||
|
|
@ -232,11 +232,11 @@ func execCommandAdHoc(iq *xmpp.Iq) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if authCode != "" {
|
if authCode != "" {
|
||||||
// Succeded
|
// Succeeded
|
||||||
g := MapGatewayInfo[jidBareFrom]
|
g := MapGatewayInfo[jidBareFrom]
|
||||||
if g != nil {
|
if g != nil {
|
||||||
g.SetSteamAuthCode(authCode)
|
g.SetSteamAuthCode(authCode)
|
||||||
note.Value = "Command succeded !"
|
note.Value = "Command succeeded !"
|
||||||
} else {
|
} else {
|
||||||
note.Value = "Your are not registred. Please, register before sending Steam auth code."
|
note.Value = "Your are not registred. Please, register before sending Steam auth code."
|
||||||
}
|
}
|
||||||
|
|
@ -256,7 +256,7 @@ func execCommandAdHoc(iq *xmpp.Iq) {
|
||||||
if dbUser != nil {
|
if dbUser != nil {
|
||||||
if dbUser.UpdateUser() {
|
if dbUser.UpdateUser() {
|
||||||
AddNewUser(dbUser.Jid, dbUser.SteamLogin, dbUser.SteamPwd, dbUser.Debug)
|
AddNewUser(dbUser.Jid, dbUser.SteamLogin, dbUser.SteamPwd, dbUser.Debug)
|
||||||
note.Value = "Command succeded !"
|
note.Value = "Command succeeded !"
|
||||||
} else {
|
} else {
|
||||||
note.Value = "Error append while executing command"
|
note.Value = "Error append while executing command"
|
||||||
}
|
}
|
||||||
|
|
@ -281,7 +281,7 @@ func execCommandAdHoc(iq *xmpp.Iq) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if message != "" {
|
if message != "" {
|
||||||
// Succeded
|
// Succeeded
|
||||||
for userJID, _ := range MapGatewayInfo {
|
for userJID, _ := range MapGatewayInfo {
|
||||||
SendMessage(userJID, "", message)
|
SendMessage(userJID, "", message)
|
||||||
}
|
}
|
||||||
|
|
@ -329,7 +329,7 @@ func getUser(fields []xmpp.AdHocField, iq *xmpp.Iq) *database.DatabaseLine {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if steamLogin != "" {
|
if steamLogin != "" {
|
||||||
// Succeded
|
// Succeeded
|
||||||
jidBareFrom := strings.SplitN(iq.From, "/", 2)[0]
|
jidBareFrom := strings.SplitN(iq.From, "/", 2)[0]
|
||||||
dbUser := new(database.DatabaseLine)
|
dbUser := new(database.DatabaseLine)
|
||||||
dbUser.Jid = jidBareFrom
|
dbUser.Jid = jidBareFrom
|
||||||
|
|
|
||||||
|
|
@ -65,8 +65,8 @@ func mainXMPP() {
|
||||||
g := MapGatewayInfo[jidBareFrom]
|
g := MapGatewayInfo[jidBareFrom]
|
||||||
if g != nil {
|
if g != nil {
|
||||||
if jidBareTo == jid.Domain {
|
if jidBareTo == jid.Domain {
|
||||||
// Forward only if presence is for componant, in order to to not spam set presence on Steam
|
// Forward only if presence is for component, in order to to not spam set presence on Steam
|
||||||
logger.Debug.Printf("Presence transfered to %s", jidBareFrom)
|
logger.Debug.Printf("Presence transferred to %s", jidBareFrom)
|
||||||
go g.ReceivedXMPP_Presence(v)
|
go g.ReceivedXMPP_Presence(v)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -79,7 +79,7 @@ func mainXMPP() {
|
||||||
jidBareFrom := strings.SplitN(v.From, "/", 2)[0]
|
jidBareFrom := strings.SplitN(v.From, "/", 2)[0]
|
||||||
g := MapGatewayInfo[jidBareFrom]
|
g := MapGatewayInfo[jidBareFrom]
|
||||||
if g != nil {
|
if g != nil {
|
||||||
logger.Debug.Printf("Message transfered to %s", jidBareFrom)
|
logger.Debug.Printf("Message transferred to %s", jidBareFrom)
|
||||||
go g.ReceivedXMPP_Message(v)
|
go g.ReceivedXMPP_Message(v)
|
||||||
} else {
|
} else {
|
||||||
SendMessage(v.From, "", "Your are not registred. If you want to register, please, send an Ad-Hoc command.")
|
SendMessage(v.From, "", "Your are not registred. If you want to register, please, send an Ad-Hoc command.")
|
||||||
|
|
@ -92,7 +92,7 @@ func mainXMPP() {
|
||||||
g := MapGatewayInfo[jidBareFrom]
|
g := MapGatewayInfo[jidBareFrom]
|
||||||
iqTreated := false
|
iqTreated := false
|
||||||
if g != nil {
|
if g != nil {
|
||||||
logger.Debug.Printf("Iq transfered to %s", jidBareFrom)
|
logger.Debug.Printf("Iq transferred to %s", jidBareFrom)
|
||||||
iqTreated = g.ReceivedXMPP_IQ(v)
|
iqTreated = g.ReceivedXMPP_IQ(v)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue