From 2a186cfd713e5ba5ae649f6794b58f1bd02393fc Mon Sep 17 00:00:00 2001 From: Reto Brunner Date: Wed, 19 Aug 2020 12:06:02 +0200 Subject: msg/reply: handle addresses as addresses This simplifies the code considerably and makes it easier to follow --- commands/msg/reply.go | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) (limited to 'commands/msg') diff --git a/commands/msg/reply.go b/commands/msg/reply.go index 6fd6141..7181e1e 100644 --- a/commands/msg/reply.go +++ b/commands/msg/reply.go @@ -5,12 +5,12 @@ import ( "errors" "fmt" "io" - gomail "net/mail" "strings" "git.sr.ht/~sircmpwn/getopt" "git.sr.ht/~sircmpwn/aerc/lib" + "git.sr.ht/~sircmpwn/aerc/lib/format" "git.sr.ht/~sircmpwn/aerc/models" "git.sr.ht/~sircmpwn/aerc/widgets" ) @@ -60,7 +60,10 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error { return errors.New("No account selected") } conf := acct.AccountConfig() - us, _ := gomail.ParseAddress(conf.From) + from, err := format.ParseAddress(conf.From) + if err != nil { + return err + } store := widget.Store() if store == nil { return errors.New("Cannot perform action. Messages still loading") @@ -72,27 +75,18 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error { acct.Logger().Println("Replying to email " + msg.Envelope.MessageId) var ( - to []string - cc []string - toList []*models.Address + to []*models.Address + cc []*models.Address ) if args[0] == "reply" { if len(msg.Envelope.ReplyTo) != 0 { - toList = msg.Envelope.ReplyTo + to = msg.Envelope.ReplyTo } else { - toList = msg.Envelope.From - } - for _, addr := range toList { - if addr.Name != "" { - to = append(to, fmt.Sprintf("%s <%s@%s>", - addr.Name, addr.Mailbox, addr.Host)) - } else { - to = append(to, fmt.Sprintf("<%s@%s>", addr.Mailbox, addr.Host)) - } + to = msg.Envelope.From } isMainRecipient := func(a *models.Address) bool { - for _, ta := range toList { - if ta.Mailbox == a.Mailbox && ta.Host == a.Host { + for _, ta := range to { + if ta.Address == a.Address { return true } } @@ -104,15 +98,16 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error { if isMainRecipient(addr) { continue } - cc = append(cc, addr.Format()) + cc = append(cc, addr) } + envTos := make([]*models.Address, 0, len(msg.Envelope.To)) for _, addr := range msg.Envelope.To { - address := fmt.Sprintf("%s@%s", addr.Mailbox, addr.Host) - if strings.EqualFold(address, us.Address) { + if addr.Address == from.Address { continue } - to = append(to, addr.Format()) + envTos = append(envTos, addr) } + to = append(to, envTos...) } } @@ -124,8 +119,9 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error { } defaults := map[string]string{ - "To": strings.Join(to, ", "), - "Cc": strings.Join(cc, ", "), + "To": format.FormatAddresses(to), + "Cc": format.FormatAddresses(cc), + "From": from.Format(), "Subject": subject, "In-Reply-To": msg.Envelope.MessageId, } @@ -133,7 +129,7 @@ func (reply) Execute(aerc *widgets.Aerc, args []string) error { addTab := func() error { if template != "" { - original.From = models.FormatAddresses(msg.Envelope.From) + original.From = format.FormatAddresses(msg.Envelope.From) original.Date = msg.Envelope.Date } -- cgit 1.4.1-2-gfad0 d='n6' href='#n6'>6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239