From 05fa79eb8efa02e39962c08231ec0e40cafe0020 Mon Sep 17 00:00:00 2001 From: Ben Fiedler Date: Fri, 24 Apr 2020 22:31:39 +0200 Subject: store.FetchFull: Change callback type to expose entire message This is a prerequisite for allowing the FetchFull message to return both the message content and the message headers. --- commands/msg/forward.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'commands/msg/forward.go') diff --git a/commands/msg/forward.go b/commands/msg/forward.go index 35a65d8e..0b81e520 100644 --- a/commands/msg/forward.go +++ b/commands/msg/forward.go @@ -12,6 +12,8 @@ import ( "git.sr.ht/~sircmpwn/aerc/models" "git.sr.ht/~sircmpwn/aerc/widgets" + "git.sr.ht/~sircmpwn/aerc/worker/types" + "git.sr.ht/~sircmpwn/getopt" ) @@ -109,7 +111,7 @@ func (forward) Execute(aerc *widgets.Aerc, args []string) error { } tmpFileName := path.Join(tmpDir, strings.ReplaceAll(fmt.Sprintf("%s.eml", msg.Envelope.Subject), "/", "-")) - store.FetchFull([]uint32{msg.Uid}, func(reader io.Reader) { + store.FetchFull([]uint32{msg.Uid}, func(fm *types.FullMessage) { tmpFile, err := os.Create(tmpFileName) if err != nil { println(err) @@ -119,7 +121,7 @@ func (forward) Execute(aerc *widgets.Aerc, args []string) error { } defer tmpFile.Close() - io.Copy(tmpFile, reader) + io.Copy(tmpFile, fm.Content.Reader) composer, err := addTab() if err != nil { return -- cgit