phoenix/schedtxt_models
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 147 Wiki Activity

v0.0.12 (#16)

Browse Source 
Reviewed-on: phoenix/textsender-models#16
This commit is contained in:
phoenix
2025-12-22 22:15:18 +00:00
parent da53b1a913 404ad1594b
commit 12bf453925
7 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/tag_release.yaml
+1 -1
View File
@@ -25,7 +25,7 @@ jobs:
run: | run: |
echo "Creating version" echo "Creating version"
VERSION="0.0.11" VERSION="0.0.12"
PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10) PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10)
BRANCH_REF="${{ gitea.ref }}" BRANCH_REF="${{ gitea.ref }}"
BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3) BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
tx0/config/twilio_config.go
+7 -6
View File
@@ -4,7 +4,7 @@ import (
"fmt" "fmt"
) )
type TwiloConfig struct { type TwilioConfig struct {
AccountSID string `json:"auth_sid"` AccountSID string `json:"auth_sid"`
ServiceSID string `json:"service_sid"` ServiceSID string `json:"service_sid"`
URI string `json:"uri"` URI string `json:"uri"`
@@ -12,10 +12,11 @@ type TwiloConfig struct {
Number string `json:"phone_number"` Number string `json:"phone_number"`
} }
func (config *TwiloConfig) PrintConfig() { func (config *TwilioConfig) PrintConfig() {
fmt.Printf("Account SID: %s\n", config.AccountSID) fmt.Println("Twilio config")
fmt.Printf("Service SID: %s\n", config.ServiceSID) fmt.Println("Account SID:", config.AccountSID)
fmt.Println("Service SID:", config.ServiceSID)
fmt.Println("URI:", config.URI) fmt.Println("URI:", config.URI)
fmt.Printf("Auth Token: %s\n", config.AuthToken) fmt.Println("Auth Token:", config.AuthToken)
fmt.Printf("Number: %s\n", config.Number) fmt.Println("Number:", config.Number)
} }
tx0/contact/contact.go
+6 -3
View File
@@ -5,7 +5,10 @@ import (
) )
type Contact struct { type Contact struct {
Id uuid.UUID `json:"id,omitempty"` Id *uuid.UUID `json:"id,omitempty"`
PhoneNumber string `json:"phone_number,omitempty"` Firstname *string `json:"first_name,omitempty"`
UserId uuid.UUID `json:"user_id,omitempty"` Lastname *string `json:"last_name,omitempty"`
Nickname *string `json:"nickname,omitempty"`
PhoneNumber string `json:"phone_number"`
UserId *uuid.UUID `json:"user_id,omitempty"`
} }
tx0/message/message_event_response.go
+8
View File
@@ -13,5 +13,13 @@ type MessageEventResponse struct {
ScheduledMessageEventId uuid.UUID `json:"scheduled_message_event_id,omitempty"` ScheduledMessageEventId uuid.UUID `json:"scheduled_message_event_id,omitempty"`
Response types.JSONB `json:"response"` Response types.JSONB `json:"response"`
UserId uuid.UUID `json:"user_id,omitempty"` UserId uuid.UUID `json:"user_id,omitempty"`
ContactId *uuid.UUID `json:"contact_id,omitempty"`
MessageId *uuid.UUID `json:"message_id,omitempty"`
Status string `json:"status"`
Sent time.Time `json:"sent"` Sent time.Time `json:"sent"`
} }
const (
Message_Event_Response_Status_Instant = "INSTANT"
Message_Event_Response_Status_Scheduled = "SCHEDULED"
)
tx0/token/token.go
+9 -4
View File
@@ -11,8 +11,13 @@ type Claims struct {
jwt.RegisteredClaims jwt.RegisteredClaims
} }
type Login struct { type LoginResult struct {
AccessToken string `json:"access_token"` UserId uuid.UUID `json:"user_id"`
TokenType string `json:"token_type"` AccessToken string `json:"access_token"`
ExpiresIn int64 `json:"expires_in"` TokenType string `json:"token_type"`
ExpiresIn int64 `json:"expires_in"`
} }
// Alias for LoginResult
// Will be deprecated at some point
type Login = LoginResult
tx0/user/service_user.go
+4 -4
View File
@@ -7,8 +7,8 @@ import (
) )
type ServiceUser struct { type ServiceUser struct {
Id uuid.UUID `json:"id"` Id uuid.UUID `json:"id"`
Username string `json:"username,omitempty"` Username string `json:"username,omitempty"`
Passphrase string `json:"passphrase,omitempty"` Passphrase string `json:"passphrase,omitempty"`
Created *time.Time `json:"date_created,omitempty"` Created time.Time `json:"date_created"`
} }
tx0/user/user.go
+10 -4
View File
@@ -1,12 +1,18 @@
package user package user
import ( import (
"time"
"github.com/google/uuid" "github.com/google/uuid"
) )
type User struct { type User struct {
Id uuid.UUID `json:"id"` Id uuid.UUID `json:"id"`
PhoneNumber string `json:"phone_number"` PhoneNumber string `json:"phone_number"`
Username string `json:"username"` Username string `json:"username"`
Password string `json:"password"` Password string `json:"password"`
Firstname *string `json:"first_name,omitempty"`
Lastname *string `json:"last_name,omitempty"`
Created time.Time `json:"date_created"`
LastLogin *time.Time `json:"last_login,omitempty"`
} }