mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #46643 from ghiculescu/mail-28 

Fix CI for Mail 2.8+
This commit is contained in:
Jean Boussier 2022-12-05 11:59:45 +01:00 committed by GitHub
parent 9361b70ca7 9e443a861a
commit ade27e5028
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
actionmailbox/lib/action_mailbox/mail_ext/addresses.rb
View File

@ -3,7 +3,7 @@
module Mail
class Message
def from_address
header[:from]&.address_list&.addresses&.first
address_list(header[:from])&.addresses&.first
end
def recipients_addresses
@ -11,15 +11,15 @@ module Mail
end
def to_addresses
Array(header[:to]&.address_list&.addresses)
Array(address_list(header[:to])&.addresses)
end
def cc_addresses
Array(header[:cc]&.address_list&.addresses)
Array(address_list(header[:cc])&.addresses)
end
def bcc_addresses
Array(header[:bcc]&.address_list&.addresses)
Array(address_list(header[:bcc])&.addresses)
end
def x_original_to_addresses
@ -29,5 +29,16 @@ module Mail
def x_forwarded_to_addresses
Array(header[:x_forwarded_to]).collect { |header| Mail::Address.new header.to_s }
end
private
def address_list(obj)
if obj&.respond_to?(:element)
# Mail 2.8+
obj.element
else
# Mail <= 2.7.x
obj&.address_list
end
end
end
end