diff options
| author | Reto Brunner <reto@labrat.space> | 2020-06-19 17:58:08 +0200 |
|---|---|---|
| committer | Reto Brunner <reto@labrat.space> | 2020-07-27 09:19:27 +0200 |
| commit | c574a838fa89bf46bf7188442f400b206b04df95 (patch) | |
| tree | 89c40ba4a7f5f5a2e67ca8fb225f7d5d3eb319ad /commands/msg/reply.go | |
| parent | 494bd674a98bc9f2889acad0fda3ff4c77c641b5 (diff) | |
| download | aerc-c574a838fa89bf46bf7188442f400b206b04df95.tar.gz | |
Remove hard coded bodystruct path everywhere
Aerc usually used the path []int{1} if it didn't know what the proper path is.
However this only works for multipart messages and breaks if it isn't one.
This patch removes all the hard coding and extracts the necessary helpers to lib.
Diffstat (limited to 'commands/msg/reply.go')
| -rw-r--r-- | commands/msg/reply.go | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/commands/msg/reply.go b/commands/msg/reply.go index 1deab316..6fd61413 100644 --- a/commands/msg/reply.go +++ b/commands/msg/reply.go @@ -10,6 +10,7 @@ import ( "git.sr.ht/~sircmpwn/getopt" + "git.sr.ht/~sircmpwn/aerc/lib" "git.sr.ht/~sircmpwn/aerc/models" "git.sr.ht/~sircmpwn/aerc/widgets" ) @@ -169,14 +170,12 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error { template = aerc.Config().Templates.QuotedReply } - part := findPlaintext(msg.BodyStructure, nil) + part := lib.FindPlaintext(msg.BodyStructure, nil) if part == nil { - //mkey... let's get the first thing that isn't a container - part = findFirstNonMultipart(msg.BodyStructure, nil) - if part == nil { - // give up, use whatever is first - part = []int{1} - } + // mkey... let's get the first thing that isn't a container + // if that's still nil it's either not a multipart msg (ok) or + // broken (containers only) + part = lib.FindFirstNonMultipart(msg.BodyStructure, nil) } store.FetchBodyPart(msg.Uid, part, func(reader io.Reader) { buf := new(bytes.Buffer) |