diff options
| author | francis <francis> | 2009-05-19 01:13:48 +0000 |
|---|---|---|
| committer | francis <francis> | 2009-05-19 01:13:48 +0000 |
| commit | 2b3147cddba783b47c72f642dc7ea069b3859dbc (patch) | |
| tree | 9ce0762ce39cb72325f60aa8120c89e0e15a53f9 | |
| parent | ee721d7a6faa69d5b0ae5292d8280e378eb7cec9 (diff) | |
Don't send to DoNotReply addresses.
| -rw-r--r-- | app/models/incoming_message.rb | 4 | ||||
| -rw-r--r-- | spec/models/incoming_message_spec.rb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 2b4469856..d531f4eb7 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -19,7 +19,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: incoming_message.rb,v 1.203 2009-05-09 07:46:59 tony Exp $ +# $Id: incoming_message.rb,v 1.204 2009-05-19 01:13:48 francis Exp $ # TODO # Move some of the (e.g. quoting) functions here into rblib, as they feel @@ -1134,7 +1134,7 @@ class IncomingMessage < ActiveRecord::Base prefix = email prefix =~ /^(.*)@/ prefix = $1 - if !prefix.nil? && prefix.downcase.match(/^(postmaster|mailer-daemon|auto_reply)$/) + if !prefix.nil? && prefix.downcase.match(/^(postmaster|mailer-daemon|auto_reply|donotreply)$/) return false end diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index ec9efca0c..f3bb51480 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -89,6 +89,10 @@ describe IncomingMessage, " checking validity to reply to" do test_email("Auto_Reply@mysociety.org", false) end + it "says DoNotReply email is bad" do + test_email("DoNotReply@tube.tfl.gov.uk", false) + end + |