Compare commits

...
Author SHA1 Message Date
phoenix 6caf5bd079 tsk-9: Version bump 2025-12-31 18:47:14 -05:00
phoenix 74894278d8 tsk-9: Added comments and formatted code 2025-12-31 18:47:00 -05:00
phoenix 32d67c681d tsk-9: Added return parameter 2025-12-31 18:42:18 -05:00
2 changed files with 16 additions and 8 deletions
+1 -1
View File
@@ -25,7 +25,7 @@ jobs:
run: |
echo "Creating version"
VERSION="0.0.8"
VERSION="0.1.0"
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
BRANCH_REF="${{ gitea.ref }}"
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
+15 -7
View File
@@ -15,14 +15,17 @@ import (
)
const Schedule_Type = "fixed"
const Schedulable_Limit_In_Seconds = 300
type MessageSender struct {
Config *auxcfg.TwilioConfig
}
func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTime *time.Time) (*types.TwilioResult, error) {
// 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) {
if m.Config == nil {
return nil, fmt.Errorf("Config has not been initialized")
return nil, nil, fmt.Errorf("Config has not been initialized")
}
now := time.Now()
client := twilio.NewRestClientWithParams(twilio.ClientParams{
@@ -41,18 +44,23 @@ func (m *MessageSender) Send(msg message.Message, number contact.Contact, sendTi
}
if resp, err := client.Api.CreateMessage(params); err != nil {
return nil, fmt.Errorf("Error sending message: %v", err)
return nil, nil, fmt.Errorf("Error sending message: %v", err)
} else {
if _, err := json.Marshal(*resp); err != nil {
return nil, fmt.Errorf("Error parsing result: %v", err)
if twilioRespMarshaled, err := json.Marshal(*resp); err != nil {
return nil, nil, fmt.Errorf("Error parsing result: %v", err)
} else {
return resp, nil
var rawObject map[string]any
if err := json.Unmarshal(twilioRespMarshaled, &rawObject); err != nil {
return resp, nil, err
} else {
return resp, rawObject, nil
}
}
}
}
func isSchedulable(now *time.Time, scheduled *time.Time) bool {
early := now.Add(300 * time.Second)
early := now.Add(Schedulable_Limit_In_Seconds * time.Second)
if scheduled.After(early) {
return true