Move method for getting the to, cc and envelope-to addresses of a mail to the mail handler.

2 files changed, 13 insertions, 0 deletions

diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb
index 4a8bd446c..2b1cef0d4 100644
--- a/lib/mail_handler/backends/mail_backend.rb
+++ b/lib/mail_handler/backends/mail_backend.rb
@@ -77,6 +77,13 @@ module MailHandler
                 end
             end
 
+            def get_all_addresses(mail)
+                envelope_to = mail['envelope-to'] ? [mail['envelope-to'].value] : []
+                ((mail.to || []) +
+                (mail.cc || []) +
+                (envelope_to || [])).uniq
+            end
+
             # Format
             def address_from_name_and_email(name, email)
                 if !MySociety::Validate.is_valid_email(email)
diff --git a/lib/mail_handler/backends/tmail_backend.rb b/lib/mail_handler/backends/tmail_backend.rb
index 445a81124..b8fdb2c88 100644
--- a/lib/mail_handler/backends/tmail_backend.rb
+++ b/lib/mail_handler/backends/tmail_backend.rb
@@ -59,6 +59,12 @@ module MailHandler
                 mail.from_name_if_present
             end
 
+            def get_all_addresses(mail)
+                ((mail.to || []) +
+                (mail.cc || []) +
+                (mail.envelope_to || [])).uniq
+            end
+
             def address_from_name_and_email(name, email)
                 if !MySociety::Validate.is_valid_email(email)
                     raise "invalid email " + email + " passed to address_from_name_and_email"