Changed format (#13)
Reviewed-on: #13 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
@@ -4,9 +4,6 @@ import (
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"git.kundeng.us/phoenix/textsender-models/pkg/contact"
|
||||
"git.kundeng.us/phoenix/textsender-models/pkg/message"
|
||||
|
||||
"git.kundeng.us/phoenix/sender/config"
|
||||
"git.kundeng.us/phoenix/sender/messaging"
|
||||
"git.kundeng.us/phoenix/sender/util"
|
||||
@@ -36,10 +33,19 @@ func main() {
|
||||
cfg, _ := config.ParseConfig(configPath)
|
||||
cfg.PrintConfig()
|
||||
|
||||
numbers := util.ParseNumbers(numberPath)
|
||||
prepMessage := util.ParseMessage(messagePath)
|
||||
numbers, err := util.ParseNumbers(numberPath)
|
||||
if err != nil {
|
||||
fmt.Println("Error:", err)
|
||||
return
|
||||
}
|
||||
|
||||
if len(numbers) == 0 || prepMessage.IsEmpty() {
|
||||
prepMessage, err := util.ParseMessage(messagePath)
|
||||
if err != nil {
|
||||
fmt.Println("Error:", err)
|
||||
return
|
||||
}
|
||||
|
||||
if len(numbers) == 0 || prepMessage.Content == "" {
|
||||
if len(numbers) == 0 {
|
||||
fmt.Println("No numbers to send")
|
||||
os.Exit(-1)
|
||||
@@ -50,27 +56,7 @@ func main() {
|
||||
}
|
||||
|
||||
fmt.Println("")
|
||||
prepMessage.Print()
|
||||
fmt.Println("Message:", prepMessage.Content)
|
||||
|
||||
convertedContacts, err := util.Convert(numbers, 1)
|
||||
if err != nil {
|
||||
fmt.Println("Error converting numbers: Error:", err)
|
||||
os.Exit(-1)
|
||||
}
|
||||
|
||||
convertedMessage, err := util.Convert(prepMessage, 0)
|
||||
if err != nil {
|
||||
fmt.Println("Error converting message")
|
||||
os.Exit(-1)
|
||||
}
|
||||
|
||||
if contacts, ok := convertedContacts.([]contact.Contact); ok {
|
||||
if msg, ok := convertedMessage.(message.Message); ok {
|
||||
messaging.SendMessages(cfg, contacts, msg, 5)
|
||||
} else {
|
||||
fmt.Println("Could not convert message")
|
||||
}
|
||||
} else {
|
||||
fmt.Println("Could not convert numbers")
|
||||
}
|
||||
messaging.SendMessages(cfg, numbers, *prepMessage, 5)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user