Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
32d67c681d
|
||
|
|
ae0df7ef0a
|
||
|
|
0ec0b3dece
|
@@ -3,7 +3,7 @@ module git.kundeng.us/phoenix/swoosh
|
|||||||
go 1.25.4
|
go 1.25.4
|
||||||
|
|
||||||
require (
|
require (
|
||||||
git.kundeng.us/phoenix/textsender-models v0.0.12
|
git.kundeng.us/phoenix/textsender-models v0.1.6-30-f4e2336771-556
|
||||||
github.com/twilio/twilio-go v1.28.8
|
github.com/twilio/twilio-go v1.28.8
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
git.kundeng.us/phoenix/textsender-models v0.0.12 h1:ps9H3FS5LyCwQhAiIvg4vYyfLZZ64dex1y9ytb0o9C4=
|
git.kundeng.us/phoenix/textsender-models v0.0.12 h1:ps9H3FS5LyCwQhAiIvg4vYyfLZZ64dex1y9ytb0o9C4=
|
||||||
git.kundeng.us/phoenix/textsender-models v0.0.12/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
|
git.kundeng.us/phoenix/textsender-models v0.0.12/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
|
||||||
|
git.kundeng.us/phoenix/textsender-models v0.1.6-30-f4e2336771-556 h1:869mq7lyB+XaNqJOMOGWdfHs97sC2OrreIxW4zkIjkQ=
|
||||||
|
git.kundeng.us/phoenix/textsender-models v0.1.6-30-f4e2336771-556/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
|
||||||
github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
|
github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
|
||||||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
|||||||
+13
-8
@@ -5,7 +5,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.kundeng.us/phoenix/textsender-models/tx0/config"
|
auxcfg "git.kundeng.us/phoenix/textsender-models/tx0/config/auxiliary"
|
||||||
"git.kundeng.us/phoenix/textsender-models/tx0/contact"
|
"git.kundeng.us/phoenix/textsender-models/tx0/contact"
|
||||||
"git.kundeng.us/phoenix/textsender-models/tx0/message"
|
"git.kundeng.us/phoenix/textsender-models/tx0/message"
|
||||||
"github.com/twilio/twilio-go"
|
"github.com/twilio/twilio-go"
|
||||||
@@ -17,12 +17,12 @@ import (
|
|||||||
const Schedule_Type = "fixed"
|
const Schedule_Type = "fixed"
|
||||||
|
|
||||||
type MessageSender struct {
|
type MessageSender struct {
|
||||||
Config *config.TwilioConfig
|
Config *auxcfg.TwilioConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTime *time.Time) (*types.TwilioResult, error) {
|
func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTime *time.Time) (*types.TwilioResult, map[string]any, error) {
|
||||||
if m.Config == nil {
|
if m.Config == nil {
|
||||||
return nil, fmt.Errorf("Config has not been initialized")
|
return nil, nil, fmt.Errorf("Config has not been initialized")
|
||||||
}
|
}
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
client := twilio.NewRestClientWithParams(twilio.ClientParams{
|
client := twilio.NewRestClientWithParams(twilio.ClientParams{
|
||||||
@@ -41,12 +41,17 @@ func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTi
|
|||||||
}
|
}
|
||||||
|
|
||||||
if resp, err := client.Api.CreateMessage(params); err != nil {
|
if resp, err := client.Api.CreateMessage(params); err != nil {
|
||||||
return nil, fmt.Errorf("Error sending message: %v", err)
|
return nil, nil, fmt.Errorf("Error sending message: %v", err)
|
||||||
} else {
|
} else {
|
||||||
if _, err := json.Marshal(*resp); err != nil {
|
if twilioRespMarshaled, err := json.Marshal(*resp); err != nil {
|
||||||
return nil, fmt.Errorf("Error parsing result: %v", err)
|
return nil, nil, fmt.Errorf("Error parsing result: %v", err)
|
||||||
} else {
|
} else {
|
||||||
return resp, nil
|
var rawObject map[string]any
|
||||||
|
if err := json.Unmarshal(twilioRespMarshaled, &rawObject); err != nil {
|
||||||
|
return resp, nil, err
|
||||||
|
} else {
|
||||||
|
return resp, rawObject, nil
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user