diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index e543c6f..f033b53 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -25,7 +25,7 @@ jobs: run: | echo "Creating version" - VERSION="0.0.4" + VERSION="0.0.5" PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10) BRANCH_REF="${{ gitea.ref }}" BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3) diff --git a/go.mod b/go.mod index 76b7b39..f7b283d 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.25.4 require ( git.kundeng.us/phoenix/textsender-models v0.0.10 - github.com/twilio/twilio-go v1.28.6 + github.com/twilio/twilio-go v1.28.7 ) require ( diff --git a/go.sum b/go.sum index bed12c6..3fbaf2d 100644 --- a/go.sum +++ b/go.sum @@ -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.6 h1:L/pikXkARmPOzF/gUMeZPP/Lu5mY/wA4XC7sRzS86W4= -github.com/twilio/twilio-go v1.28.6/go.mod h1:FpgNWMoD8CFnmukpKq9RNpUSGXC0BwnbeKZj2YHlIkw= +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/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= diff --git a/swoop/send/sender.go b/swoop/send/sender.go index a809a67..fba7803 100644 --- a/swoop/send/sender.go +++ b/swoop/send/sender.go @@ -14,6 +14,8 @@ import ( "git.kundeng.us/phoenix/swoosh/swoop/types" ) +const Schedule_Type = "fixed" + type MessageSender struct { Config *config.TwiloConfig } @@ -33,10 +35,9 @@ func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTi params.SetFrom(m.Config.Number) params.SetMessagingServiceSid(m.Config.ServiceSID) params.SetBody(msg.Content) - if sendTime != nil { - if sendTime.After(now) { - params.SetSendAt(*sendTime) - } + if sendTime != nil && isSchedulable(&now, sendTime) { + params.SetSendAt(*sendTime) + params.SetScheduleType(Schedule_Type) } if resp, err := client.Api.CreateMessage(params); err != nil { @@ -49,3 +50,13 @@ 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 + } +}