Package events and smsglobal

This commit is contained in:
Adrian Gallagher
2017-03-29 08:16:11 +11:00
parent 659ac59bbb
commit a459d37f81
3 changed files with 16 additions and 14 deletions

View File

@@ -1,4 +1,4 @@
package main
package events
import (
"errors"

View File

@@ -30,6 +30,7 @@ import (
"github.com/thrasher-/gocryptotrader/exchanges/okcoin"
"github.com/thrasher-/gocryptotrader/exchanges/poloniex"
"github.com/thrasher-/gocryptotrader/exchanges/ticker"
"github.com/thrasher-/gocryptotrader/smsglobal"
)
type ExchangeMain struct {
@@ -98,7 +99,7 @@ func main() {
log.Println(err) // non fatal event
bot.config.SMS.Enabled = false
} else {
log.Printf("SMS support enabled. Number of SMS contacts %d.\n", GetEnabledSMSContacts())
log.Printf("SMS support enabled. Number of SMS contacts %d.\n", smsglobal.GetEnabledSMSContacts(bot.config.SMS))
}
} else {
log.Println("SMS support disabled.")

View File

@@ -1,4 +1,4 @@
package main
package smsglobal
import (
"errors"
@@ -7,6 +7,7 @@ import (
"strings"
"github.com/thrasher-/gocryptotrader/common"
"github.com/thrasher-/gocryptotrader/config"
)
const (
@@ -15,9 +16,9 @@ const (
ErrSMSNotSent = "SMS message not sent."
)
func GetEnabledSMSContacts() int {
func GetEnabledSMSContacts(smsCfg config.SMSGlobalConfig) int {
counter := 0
for _, contact := range bot.config.SMS.Contacts {
for _, contact := range smsCfg.Contacts {
if contact.Enabled {
counter++
}
@@ -25,10 +26,10 @@ func GetEnabledSMSContacts() int {
return counter
}
func SMSSendToAll(message string) {
for _, contact := range bot.config.SMS.Contacts {
func SMSSendToAll(message string, cfg config.Config) {
for _, contact := range cfg.SMS.Contacts {
if contact.Enabled {
err := SMSNotify(contact.Number, message)
err := SMSNotify(contact.Number, message, cfg)
if err != nil {
log.Printf("Unable to send SMS to %s.\n", contact.Name)
}
@@ -36,8 +37,8 @@ func SMSSendToAll(message string) {
}
}
func SMSGetNumberByName(name string) string {
for _, contact := range bot.config.SMS.Contacts {
func SMSGetNumberByName(name string, smsCfg config.SMSGlobalConfig) string {
for _, contact := range smsCfg.Contacts {
if contact.Name == name {
return contact.Number
}
@@ -45,12 +46,12 @@ func SMSGetNumberByName(name string) string {
return ErrSMSContactNotFound
}
func SMSNotify(to, message string) error {
func SMSNotify(to, message string, cfg config.Config) error {
values := url.Values{}
values.Set("action", "sendsms")
values.Set("user", bot.config.SMS.Username)
values.Set("password", bot.config.SMS.Password)
values.Set("from", bot.config.Name)
values.Set("user", cfg.SMS.Username)
values.Set("password", cfg.SMS.Password)
values.Set("from", cfg.Name)
values.Set("to", to)
values.Set("text", message)