~sircmpwn/aerc

baa70469c3b25e1b937c9c2a9e0b16762a227bca — Wagner Riffel 1 year, 4 months ago feacca3
all: rewrite references to strings.Index to strings.Contains

Signed-off-by: Wagner Riffel <wgrriffel@gmail.com>
2 files changed, 2 insertions(+), 2 deletions(-)

M commands/account/compose.go
M worker/lib/parse.go
M commands/account/compose.go => commands/account/compose.go +1 -1
@@ 53,7 53,7 @@ func buildBody(args []string) (string, error) {
	for _, opt := range opts {
		switch opt.Option {
		case 'H':
			if strings.Index(opt.Value, ":") != -1 {
			if strings.Contains(opt.Value, ":") {
				// ensure first colon is followed by a single space
				re := regexp.MustCompile(`^(.*?):\s*(.*)`)
				headers += re.ReplaceAllString(opt.Value, "$1: $2") + "\n"

M worker/lib/parse.go => worker/lib/parse.go +1 -1
@@ 173,7 173,7 @@ func parseAddressList(h *mail.Header, key string) ([]*models.Address, error) {
	var converted []*models.Address
	addrs, err := h.AddressList(key)
	if err != nil {
		if hdr, err := h.Text(key); err != nil && strings.Index(hdr, "@") < 0 {
		if hdr, err := h.Text(key); err != nil && strings.Contains(hdr, "@") {
			return []*models.Address{&models.Address{
				Name: hdr,
			}}, nil