File tree Expand file tree Collapse file tree 1 file changed +15
-4
lines changed
actionmailbox/lib/action_mailbox/mail_ext Expand file tree Collapse file tree 1 file changed +15
-4
lines changed Original file line number Diff line number Diff line change 3
3
module Mail
4
4
class Message
5
5
def from_address
6
- header [ :from ] &. address_list &.addresses &.first
6
+ address_list ( header [ :from ] ) &.addresses &.first
7
7
end
8
8
9
9
def recipients_addresses
10
10
to_addresses + cc_addresses + bcc_addresses + x_original_to_addresses + x_forwarded_to_addresses
11
11
end
12
12
13
13
def to_addresses
14
- Array ( header [ :to ] &. address_list &.addresses )
14
+ Array ( address_list ( header [ :to ] ) &.addresses )
15
15
end
16
16
17
17
def cc_addresses
18
- Array ( header [ :cc ] &. address_list &.addresses )
18
+ Array ( address_list ( header [ :cc ] ) &.addresses )
19
19
end
20
20
21
21
def bcc_addresses
22
- Array ( header [ :bcc ] &. address_list &.addresses )
22
+ Array ( address_list ( header [ :bcc ] ) &.addresses )
23
23
end
24
24
25
25
def x_original_to_addresses
@@ -29,5 +29,16 @@ def x_original_to_addresses
29
29
def x_forwarded_to_addresses
30
30
Array ( header [ :x_forwarded_to ] ) . collect { |header | Mail ::Address . new header . to_s }
31
31
end
32
+
33
+ private
34
+ def address_list ( obj )
35
+ if obj &.respond_to? ( :element )
36
+ # Mail 2.8+
37
+ obj . element
38
+ else
39
+ # Mail <= 2.7.x
40
+ obj &.address_list
41
+ end
42
+ end
32
43
end
33
44
end
You can’t perform that action at this time.
0 commit comments