From 724c0a54660ec691aaf2aa5f46d78fb69f8ae362 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 7 Nov 2018 21:33:17 -0800 Subject: Use the address lists that have already been supplied to ensure we get the names as well --- lib/action_mailbox/mail_ext/addresses.rb | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/action_mailbox/mail_ext/addresses.rb b/lib/action_mailbox/mail_ext/addresses.rb index 94bb846d75..8059ce0027 100644 --- a/lib/action_mailbox/mail_ext/addresses.rb +++ b/lib/action_mailbox/mail_ext/addresses.rb @@ -1,26 +1,21 @@ class Mail::Message def from_address - Mail::Address.new from.first + header[:from]&.address_list&.addresses&.first end def recipients_addresses - convert_to_addresses recipients + to_addresses + cc_addresses + bcc_addresses end def to_addresses - convert_to_addresses to + Array(header[:to]&.address_list&.addresses) end def cc_addresses - convert_to_addresses cc + Array(header[:cc]&.address_list&.addresses) end def bcc_addresses - convert_to_addresses bcc + Array(header[:bcc]&.address_list&.addresses) end - - private - def convert_to_addresses(recipients) - Array(recipients).collect { |recipient| Mail::Address.new recipient } - end end -- cgit v1.2.3