Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e4b6b191f0
|
||
|
|
6b2907cd69 | ||
|
|
9516f1a052 |
@@ -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
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user