2020-04-24 09:42:22 +00:00
|
|
|
package msg
|
|
|
|
|
|
|
|
import (
|
|
|
|
"io"
|
|
|
|
|
|
|
|
"github.com/emersion/go-message"
|
|
|
|
_ "github.com/emersion/go-message/charset"
|
|
|
|
"github.com/emersion/go-message/mail"
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
|
2021-11-05 09:19:46 +00:00
|
|
|
"git.sr.ht/~rjarry/aerc/lib"
|
|
|
|
"git.sr.ht/~rjarry/aerc/models"
|
|
|
|
"git.sr.ht/~rjarry/aerc/widgets"
|
|
|
|
"git.sr.ht/~rjarry/aerc/worker/types"
|
recall: allow recalling messages from any folder
Recall fails when called outside of the "postpone" folder (usually
"Drafts"). This makes sense for postponed messages. However, sometimes
the user would like to re-edit and re-send an old, possibly sent,
message, which would serve as a basis for the new one.
This patch allows recall to work outside the postpone folder, thus
allowing for re-edition of any message.
In the original recall function, if the recalled message is found in the
"postpone" folder, once the message has been recalled, re-edited and
sent, the original draft is deleted. With this patch, when the message
is not in the "postpone" folder, the original message is not deleted.
Signed-off-by: inwit <inwit@sindominio.net>
2021-12-13 10:28:01 +00:00
|
|
|
"git.sr.ht/~sircmpwn/getopt"
|
2020-04-24 09:42:22 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
type Recall struct{}
|
|
|
|
|
|
|
|
func init() {
|
|
|
|
register(Recall{})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (Recall) Aliases() []string {
|
|
|
|
return []string{"recall"}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (Recall) Complete(aerc *widgets.Aerc, args []string) []string {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (Recall) Execute(aerc *widgets.Aerc, args []string) error {
|
recall: allow recalling messages from any folder
Recall fails when called outside of the "postpone" folder (usually
"Drafts"). This makes sense for postponed messages. However, sometimes
the user would like to re-edit and re-send an old, possibly sent,
message, which would serve as a basis for the new one.
This patch allows recall to work outside the postpone folder, thus
allowing for re-edition of any message.
In the original recall function, if the recalled message is found in the
"postpone" folder, once the message has been recalled, re-edited and
sent, the original draft is deleted. With this patch, when the message
is not in the "postpone" folder, the original message is not deleted.
Signed-off-by: inwit <inwit@sindominio.net>
2021-12-13 10:28:01 +00:00
|
|
|
force := false
|
|
|
|
|
|
|
|
opts, optind, err := getopt.Getopts(args, "f")
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
for _, opt := range opts {
|
|
|
|
switch opt.Option {
|
|
|
|
case 'f':
|
|
|
|
force = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(args) != optind {
|
|
|
|
return errors.New("Usage: recall [-f]")
|
2020-04-24 09:42:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
widget := aerc.SelectedTab().(widgets.ProvidesMessage)
|
|
|
|
acct := widget.SelectedAccount()
|
|
|
|
if acct == nil {
|
|
|
|
return errors.New("No account selected")
|
|
|
|
}
|
recall: allow recalling messages from any folder
Recall fails when called outside of the "postpone" folder (usually
"Drafts"). This makes sense for postponed messages. However, sometimes
the user would like to re-edit and re-send an old, possibly sent,
message, which would serve as a basis for the new one.
This patch allows recall to work outside the postpone folder, thus
allowing for re-edition of any message.
In the original recall function, if the recalled message is found in the
"postpone" folder, once the message has been recalled, re-edited and
sent, the original draft is deleted. With this patch, when the message
is not in the "postpone" folder, the original message is not deleted.
Signed-off-by: inwit <inwit@sindominio.net>
2021-12-13 10:28:01 +00:00
|
|
|
if acct.SelectedDirectory() != acct.AccountConfig().Postpone && !force {
|
2022-04-29 12:05:01 +00:00
|
|
|
return errors.New("Use -f to recall from outside the " +
|
|
|
|
acct.AccountConfig().Postpone + " directory.")
|
2020-04-24 09:42:22 +00:00
|
|
|
}
|
|
|
|
store := widget.Store()
|
|
|
|
if store == nil {
|
|
|
|
return errors.New("Cannot perform action. Messages still loading")
|
|
|
|
}
|
|
|
|
|
|
|
|
msgInfo, err := widget.SelectedMessage()
|
|
|
|
if err != nil {
|
|
|
|
return errors.Wrap(err, "Recall failed")
|
|
|
|
}
|
|
|
|
acct.Logger().Println("Recalling message " + msgInfo.Envelope.MessageId)
|
|
|
|
|
|
|
|
composer, err := widgets.NewComposer(aerc, acct, aerc.Config(),
|
2020-11-10 19:27:30 +00:00
|
|
|
acct.AccountConfig(), acct.Worker(), "", msgInfo.RFC822Headers,
|
|
|
|
models.OriginalMail{})
|
2020-04-24 09:42:22 +00:00
|
|
|
if err != nil {
|
|
|
|
return errors.Wrap(err, "Cannot open a new composer")
|
|
|
|
}
|
|
|
|
|
|
|
|
// focus the terminal since the header fields are likely already done
|
|
|
|
composer.FocusTerminal()
|
|
|
|
|
|
|
|
addTab := func() {
|
|
|
|
subject := msgInfo.Envelope.Subject
|
|
|
|
if subject == "" {
|
|
|
|
subject = "Recalled email"
|
|
|
|
}
|
|
|
|
tab := aerc.NewTab(composer, subject)
|
|
|
|
composer.OnHeaderChange("Subject", func(subject string) {
|
|
|
|
if subject == "" {
|
|
|
|
tab.Name = "New email"
|
|
|
|
} else {
|
|
|
|
tab.Name = subject
|
|
|
|
}
|
|
|
|
tab.Content.Invalidate()
|
|
|
|
})
|
|
|
|
composer.OnClose(func(composer *widgets.Composer) {
|
|
|
|
worker := composer.Worker()
|
|
|
|
uids := []uint32{msgInfo.Uid}
|
|
|
|
|
recall: allow recalling messages from any folder
Recall fails when called outside of the "postpone" folder (usually
"Drafts"). This makes sense for postponed messages. However, sometimes
the user would like to re-edit and re-send an old, possibly sent,
message, which would serve as a basis for the new one.
This patch allows recall to work outside the postpone folder, thus
allowing for re-edition of any message.
In the original recall function, if the recalled message is found in the
"postpone" folder, once the message has been recalled, re-edited and
sent, the original draft is deleted. With this patch, when the message
is not in the "postpone" folder, the original message is not deleted.
Signed-off-by: inwit <inwit@sindominio.net>
2021-12-13 10:28:01 +00:00
|
|
|
if acct.SelectedDirectory() != acct.AccountConfig().Postpone {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2020-04-24 09:42:22 +00:00
|
|
|
worker.PostAction(&types.DeleteMessages{
|
|
|
|
Uids: uids,
|
|
|
|
}, func(msg types.WorkerMessage) {
|
|
|
|
switch msg := msg.(type) {
|
|
|
|
case *types.Error:
|
2021-01-30 12:51:32 +00:00
|
|
|
aerc.PushError(msg.Error.Error())
|
2020-04-24 09:42:22 +00:00
|
|
|
composer.Close()
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
// find the main body part and add it to the editor
|
|
|
|
// TODO: copy all parts of the message over?
|
|
|
|
var (
|
|
|
|
path []int
|
|
|
|
part *models.BodyStructure
|
|
|
|
)
|
|
|
|
if len(msgInfo.BodyStructure.Parts) != 0 {
|
2020-06-19 15:58:08 +00:00
|
|
|
path = lib.FindPlaintext(msgInfo.BodyStructure, path)
|
2020-04-24 09:42:22 +00:00
|
|
|
}
|
2020-05-17 10:08:17 +00:00
|
|
|
part, err = msgInfo.BodyStructure.PartAtIndex(path)
|
|
|
|
if part == nil || err != nil {
|
2020-04-24 09:42:22 +00:00
|
|
|
part = msgInfo.BodyStructure
|
|
|
|
}
|
|
|
|
|
2020-05-17 09:44:38 +00:00
|
|
|
store.FetchBodyPart(msgInfo.Uid, path, func(reader io.Reader) {
|
2020-04-24 09:42:22 +00:00
|
|
|
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
|
|
|
|
}
|
|
|
|
composer.SetContents(part.Body)
|
|
|
|
addTab()
|
|
|
|
})
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|