Skip to content

Commit 836f745

Browse files
epelsepels
committed
Rename symbols in mms package
1 parent f263ca8 commit 836f745

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

‎mms/message.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
messagebird "github.com/messagebird/go-rest-api"
1111
)
1212

13-
// MMSMessage represents a MMS Message.
14-
type MMSMessage struct {
13+
// Message represents a MMS Message.
14+
type Message struct {
1515
ID string
1616
HRef string
1717
Direction string
@@ -39,8 +39,8 @@ type Params struct {
3939
const path = "mms"
4040

4141
// Read retrieves the information of an existing MmsMessage.
42-
func Read(c *messagebird.Client, id string) (*MMSMessage, error) {
43-
mmsMessage := &MMSMessage{}
42+
func Read(c *messagebird.Client, id string) (*Message, error) {
43+
mmsMessage := &Message{}
4444
if err := c.Request(mmsMessage, http.MethodGet, path+"/"+id, nil); err != nil {
4545
return nil, err
4646
}
@@ -49,26 +49,26 @@ func Read(c *messagebird.Client, id string) (*MMSMessage, error) {
4949
}
5050

5151
// Create creates a new MMS message for one or more recipients.
52-
func Create(c *messagebird.Client, originator string, recipients []string, msgParams *Params) (*MMSMessage, error) {
53-
params, err := paramsForMMSMessage(msgParams)
52+
func Create(c *messagebird.Client, originator string, recipients []string, msgParams *Params) (*Message, error) {
53+
params, err := paramsForMessage(msgParams)
5454
if err != nil {
5555
return nil, err
5656
}
5757

5858
params.Set("originator", originator)
5959
params.Set("recipients", strings.Join(recipients, ","))
6060

61-
mmsMessage := &MMSMessage{}
61+
mmsMessage := &Message{}
6262
if err := c.Request(mmsMessage, http.MethodPost, path, params); err != nil {
6363
return nil, err
6464
}
6565

6666
return mmsMessage, nil
6767
}
6868

69-
// paramsForMMSMessage converts the specified MMSMessageParams struct to a
70-
// url.Values pointer and returns it.
71-
func paramsForMMSMessage(params *Params) (*url.Values, error) {
69+
// paramsForMessage converts the specified Parmas struct to a url.Values
70+
// pointer and returns it.
71+
func paramsForMessage(params *Params) (*url.Values, error) {
7272
urlParams := &url.Values{}
7373

7474
if params.Body == "" && params.MediaUrls == nil {

‎mms/message_test.go

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -54,63 +54,63 @@ func TestCreate(t *testing.T) {
5454
ScheduledDatetime: time.Now(),
5555
}
5656

57-
mmsMessage, err := Create(client, "TestName", []string{"31612345678"}, params)
57+
message, err := Create(client, "TestName", []string{"31612345678"}, params)
5858

5959
if err != nil {
6060
t.Fatalf("Didn't expect error while creating a new MMS message: %s", err)
6161
}
62-
if mmsMessage.ID != "6d9e7100b1f9406c81a3c303c30ccf05" {
63-
t.Errorf("Unexpected mmsMessage id: %s", mmsMessage.ID)
62+
if message.ID != "6d9e7100b1f9406c81a3c303c30ccf05" {
63+
t.Errorf("Unexpected message id: %s", message.ID)
6464
}
65-
if mmsMessage.HRef != "https://rest.messagebird.com/mms/6d9e7100b1f9406c81a3c303c30ccf05" {
66-
t.Errorf("Unexpected mmsMessage href: %s", mmsMessage.HRef)
65+
if message.HRef != "https://rest.messagebird.com/mms/6d9e7100b1f9406c81a3c303c30ccf05" {
66+
t.Errorf("Unexpected message href: %s", message.HRef)
6767
}
68-
if mmsMessage.Direction != "mt" {
69-
t.Errorf("Unexpected mmsMessage direction: %s", mmsMessage.Direction)
68+
if message.Direction != "mt" {
69+
t.Errorf("Unexpected message direction: %s", message.Direction)
7070
}
71-
if mmsMessage.Originator != "TestName" {
72-
t.Errorf("Unexpected mmsMessage originator: %s", mmsMessage.Originator)
71+
if message.Originator != "TestName" {
72+
t.Errorf("Unexpected message originator: %s", message.Originator)
7373
}
74-
if mmsMessage.Body != "Hello World" {
75-
t.Errorf("Unexpected mmsMessage body: %s", mmsMessage.Body)
74+
if message.Body != "Hello World" {
75+
t.Errorf("Unexpected message body: %s", message.Body)
7676
}
77-
if mmsMessage.MediaUrls[0] != "http://w3.org/1.gif" {
78-
t.Errorf("Unexpected mmsMessage mediaUrl: %s", mmsMessage.MediaUrls[0])
77+
if message.MediaUrls[0] != "http://w3.org/1.gif" {
78+
t.Errorf("Unexpected message mediaUrl: %s", message.MediaUrls[0])
7979
}
80-
if mmsMessage.MediaUrls[1] != "http://w3.org/2.gif" {
81-
t.Errorf("Unexpected mmsMessage mediaUrl: %s", mmsMessage.MediaUrls[1])
80+
if message.MediaUrls[1] != "http://w3.org/2.gif" {
81+
t.Errorf("Unexpected message mediaUrl: %s", message.MediaUrls[1])
8282
}
83-
if mmsMessage.Reference != "TestReference" {
84-
t.Errorf("Unexpected mmsMessage reference: %s", mmsMessage.Reference)
83+
if message.Reference != "TestReference" {
84+
t.Errorf("Unexpected message reference: %s", message.Reference)
8585
}
86-
if mmsMessage.Subject != "TestSubject" {
87-
t.Errorf("Unexpected mmsMessage reference: %s", mmsMessage.Subject)
86+
if message.Subject != "TestSubject" {
87+
t.Errorf("Unexpected message reference: %s", message.Subject)
8888
}
89-
if mmsMessage.ScheduledDatetime != nil {
90-
t.Errorf("Unexpected mmsMessage scheduled datetime: %s", mmsMessage.ScheduledDatetime)
89+
if message.ScheduledDatetime != nil {
90+
t.Errorf("Unexpected message scheduled datetime: %s", message.ScheduledDatetime)
9191
}
92-
if mmsMessage.CreatedDatetime == nil || mmsMessage.CreatedDatetime.Format(time.RFC3339) != "2017-10-20T12:50:28Z" {
93-
t.Errorf("Unexpected mmsMessage created datetime: %s", mmsMessage.CreatedDatetime)
92+
if message.CreatedDatetime == nil || message.CreatedDatetime.Format(time.RFC3339) != "2017-10-20T12:50:28Z" {
93+
t.Errorf("Unexpected message created datetime: %s", message.CreatedDatetime)
9494
}
95-
if mmsMessage.Recipients.TotalCount != 1 {
96-
t.Fatalf("Unexpected number of total count: %d", mmsMessage.Recipients.TotalCount)
95+
if message.Recipients.TotalCount != 1 {
96+
t.Fatalf("Unexpected number of total count: %d", message.Recipients.TotalCount)
9797
}
98-
if mmsMessage.Recipients.TotalSentCount != 1 {
99-
t.Errorf("Unexpected number of total sent count: %d", mmsMessage.Recipients.TotalSentCount)
98+
if message.Recipients.TotalSentCount != 1 {
99+
t.Errorf("Unexpected number of total sent count: %d", message.Recipients.TotalSentCount)
100100
}
101-
if mmsMessage.Recipients.Items[0].Recipient != 31612345678 {
102-
t.Errorf("Unexpected mmsMessage recipient: %d", mmsMessage.Recipients.Items[0].Recipient)
101+
if message.Recipients.Items[0].Recipient != 31612345678 {
102+
t.Errorf("Unexpected message recipient: %d", message.Recipients.Items[0].Recipient)
103103
}
104-
if mmsMessage.Recipients.Items[0].Status != "sent" {
105-
t.Errorf("Unexpected mmsMessage recipient status: %s", mmsMessage.Recipients.Items[0].Status)
104+
if message.Recipients.Items[0].Status != "sent" {
105+
t.Errorf("Unexpected message recipient status: %s", message.Recipients.Items[0].Status)
106106
}
107-
if mmsMessage.Recipients.Items[0].StatusDatetime == nil || mmsMessage.Recipients.Items[0].StatusDatetime.Format(time.RFC3339) != "2017-10-20T12:50:28Z" {
108-
t.Errorf("Unexpected datetime status for mmsMessage recipient: %s", mmsMessage.Recipients.Items[0].StatusDatetime.Format(time.RFC3339))
107+
if message.Recipients.Items[0].StatusDatetime == nil || message.Recipients.Items[0].StatusDatetime.Format(time.RFC3339) != "2017-10-20T12:50:28Z" {
108+
t.Errorf("Unexpected datetime status for message recipient: %s", message.Recipients.Items[0].StatusDatetime.Format(time.RFC3339))
109109
}
110110

111111
errorResponse, ok := err.(messagebird.ErrorResponse)
112112
if ok {
113-
t.Errorf("Unexpected error returned with mmsMessage %#v", errorResponse)
113+
t.Errorf("Unexpected error returned with message %#v", errorResponse)
114114
}
115115
}
116116

0 commit comments

Comments
 (0)