diff options
author | Kevin Kuehler <keur@ocf.berkeley.edu> | 2019-06-01 22:15:04 -0700 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-06-02 10:16:29 -0400 |
commit | 753adb90692e4821f8caea1d5d86cd69e312efa7 (patch) | |
tree | 79f7563e0ef68264b12244160b3274b678875624 /commands/msg | |
parent | 2be985fecb0d76e8fa7cdc46c8de92b6caab9552 (diff) | |
download | aerc-753adb90692e4821f8caea1d5d86cd69e312efa7.tar.gz |
widget: Add ProvidesMessage interface
Consists of 3 functions * Store: Access to MessageStore type * SelectedAccount: Access to Account widget that the target widget belongs to * SelectedMessage: Current message (selected in msglist or the one we are viewing) Signed-off-by: Kevin Kuehler <keur@ocf.berkeley.edu>
Diffstat (limited to 'commands/msg')
-rw-r--r-- | commands/msg/copy.go | 39 | ||||
-rw-r--r-- | commands/msg/delete.go | 45 | ||||
-rw-r--r-- | commands/msg/move.go | 44 | ||||
-rw-r--r-- | commands/msg/msg.go | 16 | ||||
-rw-r--r-- | commands/msg/reply.go | 257 |
5 files changed, 401 insertions, 0 deletions
diff --git a/commands/msg/copy.go b/commands/msg/copy.go new file mode 100644 index 0000000..57c93a3 --- /dev/null +++ b/commands/msg/copy.go @@ -0,0 +1,39 @@ +package msg + +import ( + "errors" + "time" + + "github.com/gdamore/tcell" + + "git.sr.ht/~sircmpwn/aerc/widgets" + "git.sr.ht/~sircmpwn/aerc/worker/types" +) + +func init() { + register("cp", Copy) + register("copy", Copy) +} + +func Copy(aerc *widgets.Aerc, args []string) error { + if len(args) != 2 { + return errors.New("Usage: mv <folder>") + } + widget := aerc.SelectedTab().(widgets.ProvidesMessage) + acct := widget.SelectedAccount() + if acct == nil { + return errors.New("No account selected") + } + msg := widget.SelectedMessage() + store := widget.Store() + store.Copy([]uint32{msg.Uid}, args[1], func(msg types.WorkerMessage) { + switch msg := msg.(type) { + case *types.Done: + aerc.PushStatus("Messages copied.", 10*time.Second) + case *types.Error: + aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second). + Color(tcell.ColorDefault, tcell.ColorRed) + } + }) + return nil +} diff --git a/commands/msg/delete.go b/commands/msg/delete.go new file mode 100644 index 0000000..082dbe3 --- /dev/null +++ b/commands/msg/delete.go @@ -0,0 +1,45 @@ +package msg + +import ( + "errors" + "time" + + "github.com/gdamore/tcell" + + "git.sr.ht/~sircmpwn/aerc/widgets" + "git.sr.ht/~sircmpwn/aerc/worker/types" +) + +func init() { + register("delete", DeleteMessage) + register("delete-message", DeleteMessage) +} + +func DeleteMessage(aerc *widgets.Aerc, args []string) error { + if len(args) != 1 { + return errors.New("Usage: :delete") + } + + widget := aerc.SelectedTab().(widgets.ProvidesMessage) + acct := widget.SelectedAccount() + if acct == nil { + return errors.New("No account selected") + } + store := widget.Store() + msg := widget.SelectedMessage() + _, isMsgView := widget.(*widgets.MessageViewer) + if isMsgView { + aerc.RemoveTab(widget) + } + acct.Messages().Next() + store.Delete([]uint32{msg.Uid}, func(msg types.WorkerMessage) { + switch msg := msg.(type) { + case *types.Done: + aerc.PushStatus("Messages deleted.", 10*time.Second) + case *types.Error: + aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second). + Color(tcell.ColorDefault, tcell.ColorRed) + } + }) + return nil +} diff --git a/commands/msg/move.go b/commands/msg/move.go new file mode 100644 index 0000000..1224efa --- /dev/null +++ b/commands/msg/move.go @@ -0,0 +1,44 @@ +package msg + +import ( + "errors" + "time" + + "github.com/gdamore/tcell" + + "git.sr.ht/~sircmpwn/aerc/widgets" + "git.sr.ht/~sircmpwn/aerc/worker/types" +) + +func init() { + register("mv", Move) + register("move", Move) +} + +func Move(aerc *widgets.Aerc, args []string) error { + if len(args) != 2 { + return errors.New("Usage: mv <folder>") + } + widget := aerc.SelectedTab().(widgets.ProvidesMessage) + acct := widget.SelectedAccount() + if acct == nil { + return errors.New("No account selected") + } + msg := widget.SelectedMessage() + store := widget.Store() + _, isMsgView := widget.(*widgets.MessageViewer) + if isMsgView { + aerc.RemoveTab(widget) + } + acct.Messages().Next() + store.Move([]uint32{msg.Uid}, args[1], func(msg types.WorkerMessage) { + switch msg := msg.(type) { + case *types.Done: + aerc.PushStatus("Messages moved.", 10*time.Second) + case *types.Error: + aerc.PushStatus(" "+msg.Error.Error(), 10*time.Second). + Color(tcell.ColorDefault, tcell.ColorRed) + } + }) + return nil +} diff --git a/commands/msg/msg.go b/commands/msg/msg.go new file mode 100644 index 0000000..73755aa --- /dev/null +++ b/commands/msg/msg.go @@ -0,0 +1,16 @@ +package msg + +import ( + "git.sr.ht/~sircmpwn/aerc/commands" +) + +var ( + MessageCommands *commands.Commands +) + +func register(name string, cmd commands.AercCommand) { + if MessageCommands == nil { + MessageCommands = commands.NewCommands() + } + MessageCommands.Register(name, cmd) +} diff --git a/commands/msg/reply.go b/commands/msg/reply.go new file mode 100644 index 0000000..e09a118 --- /dev/null +++ b/commands/msg/reply.go @@ -0,0 +1,257 @@ +package msg + +import ( + "bufio" + "errors" + "fmt" + "io" + gomail "net/mail" + "regexp" + "strings" + + "git.sr.ht/~sircmpwn/getopt" + "github.com/emersion/go-imap" + "github.com/emersion/go-message" + _ "github.com/emersion/go-message/charset" + "github.com/emersion/go-message/mail" + + "git.sr.ht/~sircmpwn/aerc/widgets" +) + +func init() { + register("reply", Reply) + register("forward", Reply) +} + +var ( + atom *regexp.Regexp = regexp.MustCompile("^[a-z0-9!#$%7'*+-/=?^_`{}|~ ]+$") +) + +func formatAddress(addr *imap.Address) string { + if addr.PersonalName != "" { + if atom.MatchString(addr.PersonalName) { + return fmt.Sprintf("%s <%s@%s>", + addr.PersonalName, addr.MailboxName, addr.HostName) + } else { + return fmt.Sprintf("\"%s\" <%s@%s>", + strings.ReplaceAll(addr.PersonalName, "\"", "'"), + addr.MailboxName, addr.HostName) + } + } else { + return fmt.Sprintf("<%s@%s>", addr.MailboxName, addr.HostName) + } +} + +func Reply(aerc *widgets.Aerc, args []string) error { + opts, optind, err := getopt.Getopts(args[1:], "aq") + if err != nil { + return err + } + if optind != len(args)-1 { + return errors.New("Usage: reply [-aq]") + } + var ( + quote bool + replyAll bool + ) + for _, opt := range opts { + switch opt.Option { + case 'a': + replyAll = true + case 'q': + quote = true + } + } + + widget := aerc.SelectedTab().(widgets.ProvidesMessage) + acct := widget.SelectedAccount() + if acct == nil { + return errors.New("No account selected") + } + conf := acct.AccountConfig() + us, _ := gomail.ParseAddress(conf.From) + store := widget.Store() + msg := widget.SelectedMessage() + acct.Logger().Println("Replying to email " + msg.Envelope.MessageId) + + var ( + to []string + cc []string + toList []*imap.Address + ) + if args[0] == "reply" { + if len(msg.Envelope.ReplyTo) != 0 { + toList = msg.Envelope.ReplyTo + } else { + toList = msg.Envelope.From + } + for _, addr := range toList { + if addr.PersonalName != "" { + to = append(to, fmt.Sprintf("%s <%s@%s>", + addr.PersonalName, addr.MailboxName, addr.HostName)) + } else { + to = append(to, fmt.Sprintf("<%s@%s>", + addr.MailboxName, addr.HostName)) + } + } + if replyAll { + for _, addr := range msg.Envelope.Cc { + cc = append(cc, formatAddress(addr)) + } + for _, addr := range msg.Envelope.To { + address := fmt.Sprintf("%s@%s", addr.MailboxName, addr.HostName) + if address == us.Address { + continue + } + to = append(to, formatAddress(addr)) + } + } + } + + var subject string + if args[0] == "forward" { + subject = "Fwd: " + msg.Envelope.Subject + } else { + if !strings.HasPrefix(msg.Envelope.Subject, "Re: ") { + subject = "Re: " + msg.Envelope.Subject + } else { + subject = msg.Envelope.Subject + } + } + + composer := widgets.NewComposer( + aerc.Config(), acct.AccountConfig(), acct.Worker()). + Defaults(map[string]string{ + "To": strings.Join(to, ", "), + "Cc": strings.Join(cc, ", "), + "Subject": subject, + "In-Reply-To": msg.Envelope.MessageId, + }) + + if args[0] == "reply" { + composer.FocusTerminal() + } + + addTab := func() { + tab := aerc.NewTab(composer, subject) + composer.OnSubjectChange(func(subject string) { + if subject == "" { + tab.Name = "New email" + } else { + tab.Name = subject + } + tab.Content.Invalidate() + }) + } + + if args[0] == "forward" { + // TODO: something more intelligent than fetching the 1st part + // TODO: add attachments! + store.FetchBodyPart(msg.Uid, []int{1}, func(reader io.Reader) { + header := message.Header{} + header.SetText( + "Content-Transfer-Encoding", msg.BodyStructure.Encoding) + header.SetContentType( + msg.BodyStructure.MIMEType, msg.BodyStructure.Params) + header.SetText("Content-Description", msg.BodyStructure.Description) + entity, err := message.New(header, reader) + if err != nil { + // TODO: Do something with the error + addTab() + return + } + mreader := mail.NewReader(entity) + part, err := mreader.NextPart() + if err != nil { + // TODO: Do something with the error + addTab() + return + } + + pipeout, pipein := io.Pipe() + scanner := bufio.NewScanner(part.Body) + go composer.SetContents(pipeout) + // TODO: Let user customize the date format used here + io.WriteString(pipein, fmt.Sprintf("Forwarded message from %s on %s:\n\n", + msg.Envelope.From[0].PersonalName, + msg.Envelope.Date.Format("Mon Jan 2, 2006 at 3:04 PM"))) + for scanner.Scan() { + io.WriteString(pipein, fmt.Sprintf("%s\n", scanner.Text())) + } + pipein.Close() + pipeout.Close() + addTab() + }) + } else { + if quote { + var ( + path []int + part *imap.BodyStructure + ) + if len(msg.BodyStructure.Parts) != 0 { + part, path = findPlaintext(msg.BodyStructure, path) + } + if part == nil { + part = msg.BodyStructure + path = []int{1} + } + + store.FetchBodyPart(msg.Uid, path, func(reader io.Reader) { + header := message.Header{} + header.SetText( + "Content-Transfer-Encoding", part.Encoding) + header.SetContentType(part.MIMEType, part.Params) + header.SetText("Content-Description", part.Description) + entity, err := message.New(header, reader) + if err != nil { + // TODO: Do something with the error + addTab() + return + } + mreader := mail.NewReader(entity) + part, err := mreader.NextPart() + if err != nil { + // TODO: Do something with the error + addTab() + return + } + + pipeout, pipein := io.Pipe() + scanner := bufio.NewScanner(part.Body) + go composer.SetContents(pipeout) + // TODO: Let user customize the date format used here + io.WriteString(pipein, fmt.Sprintf("On %s %s wrote:\n", + msg.Envelope.Date.Format("Mon Jan 2, 2006 at 3:04 PM"), + msg.Envelope.From[0].PersonalName)) + for scanner.Scan() { + io.WriteString(pipein, fmt.Sprintf("> %s\n", scanner.Text())) + } + pipein.Close() + pipeout.Close() + addTab() + }) + } else { + addTab() + } + } + + return nil +} + +func findPlaintext(bs *imap.BodyStructure, + path []int) (*imap.BodyStructure, []int) { + + for i, part := range bs.Parts { + cur := append(path, i+1) + if part.MIMEType == "text" && part.MIMESubType == "plain" { + return part, cur + } + if part.MIMEType == "multipart" { + if part, path := findPlaintext(part, cur); path != nil { + return part, path + } + } + } + + return nil, nil +} |