Stealthier and more correct - set from to be user's name.

2 files changed, 8 insertions, 4 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 09d9840bc..b2ee3582b 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.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: info_request.rb,v 1.38 2008-02-14 11:19:42 francis Exp $
+# $Id: info_request.rb,v 1.39 2008-02-14 12:21:59 francis Exp $
 
 require 'digest/sha1'
 
@@ -61,7 +61,7 @@ public
         return self.magic_email("request-")
     end
     def incoming_name_and_email
-        return "GovernmentSpy <" + self.incoming_email + ">"
+        return self.user.name + " <" + self.incoming_email + ">"
     end
 
     # Modified version of incoming_email to use in the envelope from, for
@@ -70,7 +70,7 @@ public
         return self.magic_email("request-bounce-")
     end
     def envelope_name_and_email
-        return "GovernmentSpy <" + self.envelope_email + ">"
+        return self.user.name + " <" + self.envelope_email + ">"
     end
 
     # Return info request corresponding to an incoming email address, or nil if
diff --git a/todo.txt b/todo.txt
index 9255c302c..ce5eb88f9 100644
--- a/todo.txt
+++ b/todo.txt
@@ -14,6 +14,9 @@ BAILII - relationship with law courts, robots.txt ?
 Status of messages stuff
 ========================
 
+You can send a followup, not be making a clarification, and it puts the
+    thing in awaiting state when it shouldn't really
+
 Use sent again date when there has been resent?, e.g. for
     http://foi.mysociety.org/request/16
 Make date estimate use follow up time etc.
@@ -46,7 +49,6 @@ Also: Consider removing login links from notifications of new responses
 
 Do something at least a bit aggressive when response is late
 
-
 Add - response was made in private state
 or maybe 'response refusing to publish for spurious reasons
 
@@ -54,6 +56,8 @@ or maybe 'response refusing to publish for spurious reasons
 Next
 ====
 
+Consider on staging sites making follow ups go to dummy address also
+
 Check "From:" of requests and followups, it is coming out as GovernmentSpy rather than the user
 
 Change ..@.. to something prettier / less confusing