Compare commits

..
Author SHA1 Message Date
phoenix 523c7cf67c textsender-models version bump 2025-12-22 14:27:33 -05:00
phoenix 22aab5534e Fixed syntax error 2025-12-20 19:58:42 -05:00
phoenix 47d6853b66 textsender-models version bump 2025-12-20 19:58:33 -05:00
4 changed files with 23 additions and 21 deletions
+11 -1
View File
@@ -25,7 +25,7 @@ jobs:
run: |
echo "Creating version"
VERSION="0.1.0"
VERSION="0.0.7"
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
BRANCH_REF="${{ gitea.ref }}"
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
@@ -44,3 +44,13 @@ jobs:
run: |
echo "Printing version"
echo "Version: ${{ steps.version.outputs.project_tag_release }}"
- name: Create GitHub Release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ steps.version.outputs.project_tag_release }}
release_name: Release ${{ steps.version.outputs.project_tag_release }}
body: |
Release of version ${{ steps.version.outputs.project_tag_release }}
+1 -1
View File
@@ -3,7 +3,7 @@ module git.kundeng.us/phoenix/swoosh
go 1.25.4
require (
git.kundeng.us/phoenix/textsender-models v0.1.6
git.kundeng.us/phoenix/textsender-models v0.0.11-16-bad958a592-556
github.com/twilio/twilio-go v1.28.8
)
+2 -2
View File
@@ -1,5 +1,5 @@
git.kundeng.us/phoenix/textsender-models v0.1.6 h1:d/rhvqjFSt1Ty/3UfwS21be+lYb9EtWEaDtkzfbzEp0=
git.kundeng.us/phoenix/textsender-models v0.1.6/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
git.kundeng.us/phoenix/textsender-models v0.0.11-16-bad958a592-556 h1:YDri8afsHKaFbAvFVPNArxgaH2E8/v8+ocrsXp29whY=
git.kundeng.us/phoenix/textsender-models v0.0.11-16-bad958a592-556/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0=
github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+9 -17
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"time"
auxcfg "git.kundeng.us/phoenix/textsender-models/tx0/config/auxiliary"
"git.kundeng.us/phoenix/textsender-models/tx0/config"
"git.kundeng.us/phoenix/textsender-models/tx0/contact"
"git.kundeng.us/phoenix/textsender-models/tx0/message"
"github.com/twilio/twilio-go"
@@ -15,17 +15,14 @@ import (
)
const Schedule_Type = "fixed"
const Schedulable_Limit_In_Seconds = 300
type MessageSender struct {
Config *auxcfg.TwilioConfig
Config *config.TwilioConfig
}
// Sends a message to a contact via Twilio
// Has support for scheduling a time based on if it is in the future
func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTime *time.Time) (*types.TwilioResult, map[string]any, error) {
func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTime *time.Time) (*types.TwilioResult, error) {
if m.Config == nil {
return nil, nil, fmt.Errorf("Config has not been initialized")
return nil, fmt.Errorf("Config has not been initialized")
}
now := time.Now()
client := twilio.NewRestClientWithParams(twilio.ClientParams{
@@ -44,23 +41,18 @@ func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTi
}
if resp, err := client.Api.CreateMessage(params); err != nil {
return nil, nil, fmt.Errorf("Error sending message: %v", err)
return nil, fmt.Errorf("Error sending message: %v", err)
} else {
if twilioRespMarshaled, err := json.Marshal(*resp); err != nil {
return nil, nil, fmt.Errorf("Error parsing result: %v", err)
if _, err := json.Marshal(*resp); err != nil {
return nil, fmt.Errorf("Error parsing result: %v", err)
} else {
var rawObject map[string]any
if err := json.Unmarshal(twilioRespMarshaled, &rawObject); err != nil {
return resp, nil, err
} else {
return resp, rawObject, nil
}
return resp, nil
}
}
}
func isSchedulable(now *time.Time, scheduled *time.Time) bool {
early := now.Add(Schedulable_Limit_In_Seconds * time.Second)
early := now.Add(300 * time.Second)
if scheduled.After(early) {
return true