Skip to content

Commit

Permalink
Fix typo attachment
Browse files Browse the repository at this point in the history
  • Loading branch information
antcs authored and gregdel committed Aug 20, 2020
1 parent c8ad547 commit 505cfd6
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 31 deletions.
6 changes: 3 additions & 3 deletions message.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func (m *Message) multipartRequest(pToken, rToken, url string) (*http.Request, e
body := &bytes.Buffer{}

if m.attachment == nil {
return nil, ErrMissingAttachement
return nil, ErrMissingAttachment
}

// Write the body as multipart form data
Expand All @@ -208,8 +208,8 @@ func (m *Message) multipartRequest(pToken, rToken, url string) (*http.Request, e
return nil, err
}

if written > MessageMaxAttachementByte {
return nil, ErrMessageAttachementTooLarge
if written > MessageMaxAttachmentByte {
return nil, ErrMessageAttachmentTooLarge
}

// Handle params
Expand Down
18 changes: 9 additions & 9 deletions message_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ func TestNewMessageWithTitle(t *testing.T) {
}
}

// TestMutlipartRequest
func TestMutlipartRequest(t *testing.T) {
// MultipartRequest
func TestMultipartRequest(t *testing.T) {
tt := []struct {
name string
attachmentSize int64
Expand All @@ -225,14 +225,14 @@ func TestMutlipartRequest(t *testing.T) {
attachmentSize: 16,
},
{
name: "no attachement",
expectedErr: ErrMissingAttachement,
name: "no attachment",
expectedErr: ErrMissingAttachment,
attachmentSize: 0,
},
{
name: "no attachement",
expectedErr: ErrMessageAttachementTooLarge,
attachmentSize: MessageMaxAttachementByte + 1,
name: "no attachment",
expectedErr: ErrMessageAttachmentTooLarge,
attachmentSize: MessageMaxAttachmentByte + 1,
},
}

Expand All @@ -242,8 +242,8 @@ func TestMutlipartRequest(t *testing.T) {

if tc.attachmentSize > 0 {
buf := make([]byte, tc.attachmentSize)
attachement := bytes.NewBuffer(buf)
message.AddAttachment(attachement)
attachment := bytes.NewBuffer(buf)
message.AddAttachment(attachment)
}

req, err := message.multipartRequest("pToken", "rToken", "url")
Expand Down
38 changes: 19 additions & 19 deletions pushover.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ var APIEndpoint = "https://api.pushover.net/1"
var (
ErrHTTPPushover = errors.New("pushover: http error")
ErrEmptyToken = errors.New("pushover: empty API token")
ErrEmptyURL = errors.New("pushover: empty URL, URLTitle needs an URL")
ErrEmptyRecipientToken = errors.New("pushover: empty recipient token")
ErrInvalidRecipientToken = errors.New("pushover: invalid recipient token")
ErrInvalidRecipient = errors.New("pushover: invalid recipient")
ErrInvalidHeaders = errors.New("pushover: invalid headers in server response")
ErrInvalidPriority = errors.New("pushover: invalid priority")
ErrInvalidToken = errors.New("pushover: invalid API token")
ErrMessageEmpty = errors.New("pushover: message empty")
ErrMessageTitleTooLong = errors.New("pushover: message title too long")
ErrMessageTooLong = errors.New("pushover: message too long")
ErrMessageAttachementTooLarge = errors.New("pushover: message attachement is too large")
ErrMessageURLTitleTooLong = errors.New("pushover: message URL title too long")
ErrMessageURLTooLong = errors.New("pushover: message URL too long")
ErrMissingAttachement = errors.New("pushover: missing attachement")
ErrMissingEmergencyParameter = errors.New("pushover: missing emergency parameter")
ErrInvalidDeviceName = errors.New("pushover: invalid device name")
ErrEmptyReceipt = errors.New("pushover: empty receipt")
ErrEmptyURL = errors.New("pushover: empty URL, URLTitle needs an URL")
ErrEmptyRecipientToken = errors.New("pushover: empty recipient token")
ErrInvalidRecipientToken = errors.New("pushover: invalid recipient token")
ErrInvalidRecipient = errors.New("pushover: invalid recipient")
ErrInvalidHeaders = errors.New("pushover: invalid headers in server response")
ErrInvalidPriority = errors.New("pushover: invalid priority")
ErrInvalidToken = errors.New("pushover: invalid API token")
ErrMessageEmpty = errors.New("pushover: message empty")
ErrMessageTitleTooLong = errors.New("pushover: message title too long")
ErrMessageTooLong = errors.New("pushover: message too long")
ErrMessageAttachmentTooLarge = errors.New("pushover: message attachment is too large")
ErrMessageURLTitleTooLong = errors.New("pushover: message URL title too long")
ErrMessageURLTooLong = errors.New("pushover: message URL too long")
ErrMissingAttachment = errors.New("pushover: missing attachment")
ErrMissingEmergencyParameter = errors.New("pushover: missing emergency parameter")
ErrInvalidDeviceName = errors.New("pushover: invalid device name")
ErrEmptyReceipt = errors.New("pushover: empty receipt")
)

// API limitations.
Expand All @@ -52,8 +52,8 @@ const (
MessageURLMaxLength = 512
// MessageURLTitleMaxLength is the max URL title number of characters.
MessageURLTitleMaxLength = 100
// MessageMaxAttachementByte is the max attachement size in byte.
MessageMaxAttachementByte = 2621440
// MessageMaxAttachmentByte is the max attachment size in byte.
MessageMaxAttachmentByte = 2621440
)

// Message priorities
Expand Down

0 comments on commit 505cfd6

Please sign in to comment.