diff options
author | Louise Crow <louise.crow@gmail.com> | 2012-12-03 18:10:50 +0000 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2012-12-03 18:10:50 +0000 |
commit | 9b9b875f8bd2b1cd60f0bcce9ff6609be3d86998 (patch) | |
tree | 5c97cf0407fc93fe5094a473a4f888200c67448b /lib/mail_handler/backends | |
parent | f87b9ed01d8196097ae04a383d215206d4396b9c (diff) |
Move the specifics of getting a From: name from a mail to the mail handler.
Diffstat (limited to 'lib/mail_handler/backends')
-rw-r--r-- | lib/mail_handler/backends/mail_backend.rb | 5 | ||||
-rw-r--r-- | lib/mail_handler/backends/tmail_backend.rb | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb index ac543540e..87c0d6181 100644 --- a/lib/mail_handler/backends/mail_backend.rb +++ b/lib/mail_handler/backends/mail_backend.rb @@ -50,6 +50,11 @@ module MailHandler first_from ? first_from.address : nil end + def get_from_name(mail) + first_from = first_from(mail) + first_from ? first_from.name : nil + 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 fa9f3fbb6..d2eed39d4 100644 --- a/lib/mail_handler/backends/tmail_backend.rb +++ b/lib/mail_handler/backends/tmail_backend.rb @@ -53,6 +53,10 @@ module MailHandler mail.from_addrs[0].spec end + def get_from_name(mail) + mail.from_name_if_present + 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" |