Compare commits

..
Author SHA1 Message Date
phoenix c6e3aac5d8 textsender-models version bump 2025-12-22 17:27:38 -05:00
phoenix 523c7cf67c textsender-models version bump 2025-12-22 14:27:33 -05:00
phoenix 22aab5534e Fixed syntax error 2025-12-20 19:58:42 -05:00
phoenix 47d6853b66 textsender-models version bump 2025-12-20 19:58:33 -05:00
4 changed files with 10 additions and 17 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ jobs:
run: |
echo "Creating version"
VERSION="0.0.8"
VERSION="0.0.7"
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
BRANCH_REF="${{ gitea.ref }}"
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
+1 -1
View File
@@ -3,7 +3,7 @@ module git.kundeng.us/phoenix/swoosh
go 1.25.4
require (
git.kundeng.us/phoenix/textsender-models v0.1.6-30-f4e2336771-556
git.kundeng.us/phoenix/textsender-models v0.0.12
github.com/twilio/twilio-go v1.28.8
)
-2
View File
@@ -1,7 +1,5 @@
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.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/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=
+8 -13
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"time"
auxcfg "git.kundeng.us/phoenix/textsender-models/tx0/config/auxiliary"
"git.kundeng.us/phoenix/textsender-models/tx0/config"
"git.kundeng.us/phoenix/textsender-models/tx0/contact"
"git.kundeng.us/phoenix/textsender-models/tx0/message"
"github.com/twilio/twilio-go"
@@ -17,12 +17,12 @@ import (
const Schedule_Type = "fixed"
type MessageSender struct {
Config *auxcfg.TwilioConfig
Config *config.TwilioConfig
}
func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTime *time.Time) (*types.TwilioResult, map[string]any, error) {
func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTime *time.Time) (*types.TwilioResult, error) {
if m.Config == nil {
return nil, nil, fmt.Errorf("Config has not been initialized")
return nil, fmt.Errorf("Config has not been initialized")
}
now := time.Now()
client := twilio.NewRestClientWithParams(twilio.ClientParams{
@@ -41,17 +41,12 @@ func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTi
}
if resp, err := client.Api.CreateMessage(params); err != nil {
return nil, nil, fmt.Errorf("Error sending message: %v", err)
return nil, fmt.Errorf("Error sending message: %v", err)
} else {
if twilioRespMarshaled, err := json.Marshal(*resp); err != nil {
return nil, nil, fmt.Errorf("Error parsing result: %v", err)
if _, err := json.Marshal(*resp); err != nil {
return nil, fmt.Errorf("Error parsing result: %v", err)
} else {
var rawObject map[string]any
if err := json.Unmarshal(twilioRespMarshaled, &rawObject); err != nil {
return resp, nil, err
} else {
return resp, rawObject, nil
}
return resp, nil
}
}
}