diff --git a/encoding.go b/encoding.go index 0640d310..77243fc1 100644 --- a/encoding.go +++ b/encoding.go @@ -19,9 +19,6 @@ type MIMEVersion string // MIMEType represents the MIME type for the mail type MIMEType string -// Disposition represents a content disposition for the Msg -type Disposition string - // List of supported encodings const ( // EncodingB64 represents the Base64 encoding as specified in RFC 2045. @@ -163,11 +160,6 @@ const ( MIMESMime MIMEType = `signed; protocol="application/pkcs7-signature"; micalg=sha256` ) -// List of common content disposition -const ( - DispositionSMime Disposition = `attachment; filename="smime.p7s"` -) - // String is a standard method to convert an Charset into a printable format func (c Charset) String() string { return string(c) @@ -182,8 +174,3 @@ func (c ContentType) String() string { func (e Encoding) String() string { return string(e) } - -// String is a standard method to convert an Disposition into a printable format -func (d Disposition) String() string { - return string(d) -} diff --git a/encoding_test.go b/encoding_test.go index 588cff17..11bf991c 100644 --- a/encoding_test.go +++ b/encoding_test.go @@ -126,22 +126,3 @@ func TestCharset_String(t *testing.T) { }) } } - -// TestDisposition_String tests the string method of the Disposition object -func TestDisposition_String(t *testing.T) { - tests := []struct { - name string - d Disposition - want string - }{ - {"Disposition: S/Mime", DispositionSMime, `attachment; filename="smime.p7s"`}, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - if tt.d.String() != tt.want { - t.Errorf("wrong string for Disposition returned. Expected: %s, got: %s", - tt.want, tt.d.String()) - } - }) - } -} diff --git a/msgwriter.go b/msgwriter.go index 684c223f..372e1e1a 100644 --- a/msgwriter.go +++ b/msgwriter.go @@ -269,9 +269,6 @@ func (mw *msgWriter) writePart(part *Part, charset Charset) { if part.description != "" { mimeHeader.Add(string(HeaderContentDescription), part.description) } - if part.disposition != "" { - mimeHeader.Add(string(HeaderContentDisposition), part.disposition.String()) - } mimeHeader.Add(string(HeaderContentType), contentType) mimeHeader.Add(string(HeaderContentTransferEnc), contentTransferEnc) mw.newPart(mimeHeader) diff --git a/part.go b/part.go index 005da29a..7c76b7d9 100644 --- a/part.go +++ b/part.go @@ -17,7 +17,6 @@ type Part struct { contentType ContentType charset Charset description string - disposition Disposition encoding Encoding isDeleted bool writeFunc func(io.Writer) (int64, error) @@ -57,11 +56,6 @@ func (p *Part) GetDescription() string { return p.description } -// GetDisposition returns the currently set Content-Disposition of the Part -func (p *Part) GetDisposition() Disposition { - return p.disposition -} - // SetContent overrides the content of the Part with the given string func (p *Part) SetContent(content string) { buffer := bytes.NewBufferString(content) @@ -88,11 +82,6 @@ func (p *Part) SetDescription(description string) { p.description = description } -// SetDisposition overrides the Content-Disposition of the Part -func (p *Part) SetDisposition(disposition Disposition) { - p.disposition = disposition -} - // SetWriteFunc overrides the WriteFunc of the Part func (p *Part) SetWriteFunc(writeFunc func(io.Writer) (int64, error)) { p.writeFunc = writeFunc @@ -124,10 +113,3 @@ func WithPartContentDescription(description string) PartOption { p.description = description } } - -// WithContentDisposition overrides the default Part Content-Disposition -func WithContentDisposition(disposition Disposition) PartOption { - return func(p *Part) { - p.disposition = disposition - } -}