Compare commits

..
Author SHA1 Message Date
phoenix 5b3655c46e Updated workflow 2025-11-26 20:55:36 -05:00
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
2 changed files with 5 additions and 15 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ jobs:
run: | run: |
echo "Creating version" echo "Creating version"
VERSION="0.0.4" VERSION="0.0.3"
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10) PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
BRANCH_REF="${{ gitea.ref }}" BRANCH_REF="${{ gitea.ref }}"
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3) BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
+4 -14
View File
@@ -14,7 +14,6 @@ import (
"git.kundeng.us/phoenix/swoosh/swoop/types" "git.kundeng.us/phoenix/swoosh/swoop/types"
) )
type MessageSender struct { type MessageSender struct {
Config *config.TwiloConfig Config *config.TwiloConfig
} }
@@ -32,10 +31,11 @@ func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTi
params := &twilioApi.CreateMessageParams{} params := &twilioApi.CreateMessageParams{}
params.SetTo(number.PhoneNumber) params.SetTo(number.PhoneNumber)
params.SetFrom(m.Config.Number) params.SetFrom(m.Config.Number)
params.SetMessagingServiceSid(m.Config.ServiceSID)
params.SetBody(msg.Content) params.SetBody(msg.Content)
if sendTime != nil && isSchedulable(now, sendTime) { if sendTime != nil {
params.SetSendAt(*sendTime) if sendTime.After(now) {
params.SetSendAt(*sendTime)
}
} }
if resp, err := client.Api.CreateMessage(params); err != nil { if resp, err := client.Api.CreateMessage(params); err != nil {
@@ -48,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.Before(early) && scheduled.After(now) {
return true
} else {
return false
}
}