Compare commits

...
Author SHA1 Message Date
phoenix e4b6b191f0 Added scheduling check 2025-11-29 13:46:14 -05:00
phoenixandphoenix 6b2907cd69 fixes (#4)
Reviewed-on: #4
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
2025-11-29 18:38:47 +00:00
2 changed files with 15 additions and 5 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ jobs:
run: |
echo "Creating version"
VERSION="0.0.3"
VERSION="0.0.4"
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
BRANCH_REF="${{ gitea.ref }}"
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
+14 -4
View File
@@ -14,6 +14,7 @@ import (
"git.kundeng.us/phoenix/swoosh/swoop/types"
)
type MessageSender struct {
Config *config.TwiloConfig
}
@@ -31,11 +32,10 @@ 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 {
if sendTime.After(now) {
params.SetSendAt(*sendTime)
}
if sendTime != nil && isSchedulable(now, sendTime) {
params.SetSendAt(*sendTime)
}
if resp, err := client.Api.CreateMessage(params); err != nil {
@@ -48,3 +48,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.Before(early) && scheduled.After(now) {
return true
} else {
return false
}
}