add send options

README.md

@@ -1,6 +1,6 @@
 # VTwilio - Go
 #####  Note: breaking changes may happen in releases before v1.0.0
-### Version 0.0.3
+### Version 0.1.0
 Call the twilio rest api in go.
 
 ## Examples
@@ -132,6 +132,9 @@ func ReleaseNumber() error {
 [TwiML Docs](./twiml/README.md)
 
 ## Change Log
+### v0.1.0
+- Add from number option for send method to override the client's default
+- Add callback url option to send method
 ### v0.0.3
 - TwiML support
 - Incoming phone numbers

send.go

@@ -24,18 +24,26 @@ func (v *VTwilio) SendMessage(message string, to string, opts ...SendOption) (*M
 }
 
 func (v *VTwilio) sendMessage(message, to string, config *sendConfiguration) (*Message, error) {
+	from := v.twilioNumber
+	if config.From != "" {
+		from = config.From
+	}
+
 	values := url.Values{}
 	values.Set("To", to)
-	values.Set("From", v.twilioNumber)
+	values.Set("From", from)
 	values.Set("Body", message)
 	if config.MediaURL != "" {
 		values.Set("MediaUrl", config.MediaURL)
 	}
 
-	en := values.Encode()
+	if config.CallbackURL != "" && config.CallbackMethod != "" {
+		values.Set("statusCallback", config.CallbackURL)
+		values.Set("StatusCallbackMethod", config.CallbackMethod.String())
+	}
 
+	en := values.Encode()
 	urlStr := fmt.Sprintf("%s%s%s.json", v.baseAPI, v.accountSID, messageAPI)
-	fmt.Println(urlStr)
 	req, err := http.NewRequest("POST", urlStr, strings.NewReader(en))
 	if err != nil {
 		return nil, err

send_options.go

@@ -1,7 +1,10 @@
 package vtwilio
 
 type sendConfiguration struct {
-	MediaURL string
+	MediaURL       string
+	From           string
+	CallbackURL    string
+	CallbackMethod Method
 }
 
 // SendOption is an option for messages being sent
@@ -13,3 +16,19 @@ func MediaURL(url string) SendOption {
 		c.MediaURL = url
 	}
 }
+
+// FromNumber is the phone number that the text message will be sent from
+// This will override the phone number set on the client for the current text message
+func FromNumber(number string) SendOption {
+	return func(c *sendConfiguration) {
+		c.From = number
+	}
+}
+
+// Callback adds a callback url with the method that Twilio should call this endpoint
+func Callback(url string, method Method) SendOption {
+	return func(c *sendConfiguration) {
+		c.CallbackURL = url
+		c.CallbackMethod = method
+	}
+}

send_test.go

@@ -28,6 +28,14 @@ func TestSendRequest(t *testing.T) {
 			expectedPath: "/sid/Messages.json",
 			expectedBody: "Body=Text+message&From=%2B12345678910&To=%2B09876543210",
 		},
+		{
+			name:         "override from",
+			opts:         []SendOption{FromNumber("+10987654321")},
+			message:      "Text message",
+			to:           "+09876543210",
+			expectedPath: "/sid/Messages.json",
+			expectedBody: "Body=Text+message&From=%2B10987654321&To=%2B09876543210",
+		},
 		{
 			name:         "media url",
 			opts:         []SendOption{MediaURL("http://url.com")},
@@ -36,6 +44,22 @@ func TestSendRequest(t *testing.T) {
 			expectedPath: "/sid/Messages.json",
 			expectedBody: "Body=Text+message&From=%2B12345678910&MediaUrl=http%3A%2F%2Furl.com&To=%2B09876543210",
 		},
+		{
+			name:         "callback url",
+			opts:         []SendOption{Callback("http://url.com/callback", POST)},
+			message:      "Text message",
+			to:           "+09876543210",
+			expectedPath: "/sid/Messages.json",
+			expectedBody: "Body=Text+message&From=%2B12345678910&StatusCallbackMethod=POST&To=%2B09876543210&statusCallback=http%3A%2F%2Furl.com%2Fcallback",
+		},
+		{
+			name:         "meda url and callback url",
+			opts:         []SendOption{MediaURL("http://url.com"), Callback("http://url.com/callback", POST)},
+			message:      "Text message",
+			to:           "+09876543210",
+			expectedPath: "/sid/Messages.json",
+			expectedBody: "Body=Text+message&From=%2B12345678910&MediaUrl=http%3A%2F%2Furl.com&StatusCallbackMethod=POST&To=%2B09876543210&statusCallback=http%3A%2F%2Furl.com%2Fcallback",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {