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
3 changed files with 8 additions and 18 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ jobs:
run: |
echo "Creating version"
VERSION="0.0.4"
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
+4 -14
View File
@@ -14,7 +14,6 @@ import (
"git.kundeng.us/phoenix/swoosh/swoop/types"
)
type MessageSender struct {
Config *config.TwiloConfig
}
@@ -32,10 +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)
if sendTime != nil {
if sendTime.After(now) {
params.SetSendAt(*sendTime)
}
}
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
}
}