refactor smtp sending

* [x] move package creation logic to `pmapi.SendMessageReq`
* [ ] write test of package creation logic
    * [x] internal
    * [x] plain
    * [x] external encrypted
    * [ ] signature ???
    * [x] attachments

pkg/pmapi/messages.go

@@ -569,114 +569,6 @@ func (c *client) GetMessage(id string) (msg *Message, err error) {
 	return res.Message, res.Err()
 }
 
-type SendMessageReq struct {
-	ExpirationTime int64 `json:",omitempty"`
-	// AutoSaveContacts int `json:",omitempty"`
-
-	// Data for encrypted recipients.
-	Packages []*MessagePackage
-}
-
-// Message package types.
-const (
-	InternalPackage         = 1
-	EncryptedOutsidePackage = 2
-	ClearPackage            = 4
-	PGPInlinePackage        = 8
-	PGPMIMEPackage          = 16
-	ClearMIMEPackage        = 32
-)
-
-// Signature types.
-const (
-	NoSignature  = 0
-	YesSignature = 1
-)
-
-type MessagePackage struct {
-	Addresses      map[string]*MessageAddress
-	Type           int
-	MIMEType       string
-	Body           string             // base64-encoded encrypted data packet.
-	BodyKey        AlgoKey            // base64-encoded session key (only if cleartext recipients).
-	AttachmentKeys map[string]AlgoKey // Only include if cleartext & attachments.
-}
-
-type MessageAddress struct {
-	Type                 int
-	BodyKeyPacket        string // base64-encoded key packet.
-	Signature            int    // 0 = None, 1 = Detached, 2 = Attached/Armored
-	AttachmentKeyPackets map[string]string
-}
-
-type AlgoKey struct {
-	Key       string
-	Algorithm string
-}
-
-type SendMessageRes struct {
-	Res
-
-	Sent *Message
-
-	// Parent is only present if the sent message has a parent (reply/reply all/forward).
-	Parent *Message
-}
-
-func (c *client) SendMessage(id string, sendReq *SendMessageReq) (sent, parent *Message, err error) {
-	if id == "" {
-		err = errors.New("pmapi: cannot send message with an empty id")
-		return
-	}
-
-	if sendReq.Packages == nil {
-		sendReq.Packages = []*MessagePackage{}
-	}
-
-	req, err := c.NewJSONRequest("POST", "/mail/v4/messages/"+id, sendReq)
-	if err != nil {
-		return
-	}
-
-	var res SendMessageRes
-	if err = c.DoJSON(req, &res); err != nil {
-		return
-	}
-
-	sent, parent, err = res.Sent, res.Parent, res.Err()
-	return
-}
-
-const (
-	DraftActionReply    = 0
-	DraftActionReplyAll = 1
-	DraftActionForward  = 2
-)
-
-type DraftReq struct {
-	Message              *Message
-	ParentID             string `json:",omitempty"`
-	Action               int
-	AttachmentKeyPackets []string
-}
-
-func (c *client) CreateDraft(m *Message, parent string, action int) (created *Message, err error) {
-	createReq := &DraftReq{Message: m, ParentID: parent, Action: action, AttachmentKeyPackets: []string{}}
-
-	req, err := c.NewJSONRequest("POST", "/mail/v4/messages", createReq)
-	if err != nil {
-		return
-	}
-
-	var res MessageRes
-	if err = c.DoJSON(req, &res); err != nil {
-		return
-	}
-
-	created, err = res.Message, res.Err()
-	return
-}
-
 type MessagesActionReq struct {
 	IDs []string
 }