Compare commits

..
Author SHA1 Message Date
phoenix 7714a7fd3e For got missing value 2025-11-26 20:48:51 -05:00
phoenix a34ff04776 Added config error check 2025-11-26 20:47:21 -05:00
phoenix c6ca9063a3 textsender-models version bump 2025-11-26 20:41:42 -05:00
5 changed files with 14 additions and 26 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ jobs:
run: |
echo "Creating version"
VERSION="0.0.6"
VERSION="0.0.2"
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
BRANCH_REF="${{ gitea.ref }}"
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
+3 -3
View File
@@ -16,8 +16,8 @@ jobs:
go-version: '1.25.4'
- name: Configure Git for SSH
run: |
git config --global url."git@${{ secrets.GIT_HOST_ROOT }}:".insteadOf "https://${{ secrets.GIT_HOST_ROOT }}/"
go env -w GOPRIVATE=${{ secrets.GIT_HOST_ROOT }}/phoenix/*
git config --global url."git@git.kundeng.us:".insteadOf "https://git.kundeng.us/"
go env -w GOPRIVATE=git.kundeng.us/phoenix/*
- name: Download dependencies
run: |
@@ -25,7 +25,7 @@ jobs:
mkdir -p ~/.ssh
echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/swoosh_deploy_key
chmod 600 ~/.ssh/swoosh_deploy_key
ssh-keyscan ${{ secrets.MY_HOST }} >> ~/.ssh/known_hosts
ssh-keyscan ${{ vars.MY_HOST }} >> ~/.ssh/known_hosts
eval $(ssh-agent -s)
ssh-add -v ~/.ssh/swoosh_deploy_key
+2 -2
View File
@@ -3,8 +3,8 @@ module git.kundeng.us/phoenix/swoosh
go 1.25.4
require (
git.kundeng.us/phoenix/textsender-models v0.0.11
github.com/twilio/twilio-go v1.28.7
git.kundeng.us/phoenix/textsender-models v0.0.10
github.com/twilio/twilio-go v1.28.6
)
require (
+4 -4
View File
@@ -1,5 +1,5 @@
git.kundeng.us/phoenix/textsender-models v0.0.11 h1:kd2FdeZJhJJAXBm8MoyadtgNGyzC+puU1oR8B8N+MfE=
git.kundeng.us/phoenix/textsender-models v0.0.11/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
git.kundeng.us/phoenix/textsender-models v0.0.10 h1:0AMe/zm4Xte2BcuqqhRP7+42m+4To+rUnHkR2a9eXlI=
git.kundeng.us/phoenix/textsender-models v0.0.10/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=
@@ -25,8 +25,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/twilio/twilio-go v1.28.7 h1:WzzQDR/rqmNkVs1TwtcHFPYGTdSdPnx/eAZf5UIXzr4=
github.com/twilio/twilio-go v1.28.7/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw=
github.com/twilio/twilio-go v1.28.6 h1:L/pikXkARmPOzF/gUMeZPP/Lu5mY/wA4XC7sRzS86W4=
github.com/twilio/twilio-go v1.28.6/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+4 -16
View File
@@ -14,8 +14,6 @@ import (
"git.kundeng.us/phoenix/swoosh/swoop/types"
)
const Schedule_Type = "fixed"
type MessageSender struct {
Config *config.TwiloConfig
}
@@ -33,11 +31,11 @@ func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTi
params := &twilioApi.CreateMessageParams{}
params.SetTo(number.PhoneNumber)
params.SetFrom(m.Config.Number)
params.SetMessagingServiceSid(m.Config.ServiceSID)
params.SetBody(msg.Content)
if sendTime != nil && isSchedulable(&now, sendTime) {
params.SetSendAt(*sendTime)
params.SetScheduleType(Schedule_Type)
if sendTime != nil {
if sendTime.After(now) {
params.SetSendAt(*sendTime)
}
}
if resp, err := client.Api.CreateMessage(params); err != nil {
@@ -50,13 +48,3 @@ func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTi
}
}
}
func isSchedulable(now *time.Time, scheduled *time.Time) bool {
early := now.Add(300 * time.Second)
if scheduled.After(early) {
return true
} else {
return false
}
}