Refactor the application of masks and censor rules to messages.

Seems more logical to make this one method that figures out what to do
based on file type. Plus, incoming message does so many things, it
seemed like having these related methods be separate would make them
easier to read and understand. Also, email, mobile and login
substitution texts weren't being translated. Finally, I think passing
the censor rules and masks as arguments is a first step in some more
decoupling of models.

1 files changed, 16 insertions, 0 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index dcd16878b..20b7ef9af 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -1153,6 +1153,22 @@ public
         return binary
     end
 
+    # Masks we apply to text associated with this request convert email addresses
+    # we know about into textual descriptions of them
+    def masks
+        masks = [{ :to_replace => incoming_email,
+                   :replacement =>  _('[FOI #{{request}} email]',
+                                      :request => id.to_s) },
+                 { :to_replace => AlaveteliConfiguration::contact_email,
+                   :replacement => _("[{{site_name}} contact email]",
+                                     :site_name => AlaveteliConfiguration::site_name)} ]
+        if public_body.is_followupable?
+            masks << { :to_replace => public_body.request_email,
+                       :replacement => _("[{{public_body}} request email]",
+                                         :public_body => public_body.short_or_long_name) }
+        end
+     end
+
     def is_owning_user?(user)
         !user.nil? && (user.id == user_id || user.owns_every_request?)
     end