Refactor the friend_users test, and remove the tests which duplicate the (renamed...

[rails.git] / script / deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index 3fd641f8dbf40ddb76273ad2b8bf45a6e5c4dd73..c15d365962e45124e6a7148c51f89dc6a22c6e88 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -1,22 +1,27 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../config/environment'
+require File.dirname(__FILE__) + "/../config/environment"
 
-exit 0 unless recipient = ARGV[0].match(/^([cm])-(\d+)-(.*)$/)
-
-if recipient[1] == "c"
-  comment = DiaryComment.find(recipient[2])
+if recipient = ARGV[0].match(/^c-(\d+)-(\d+)-(.*)$/)
+  comment = DiaryComment.find(recipient[1])
   digest = comment.digest
-  from = comment.diary_entry.user
+  date = comment.created_at
+  from = User.find(recipient[2])
   to = comment.user
-else
-  message = Message.find(recipient[2])
+  token = recipient[3]
+elsif recipient = ARGV[0].match(/^m-(\d+)-(.*)$/)
+  message = Message.find(recipient[1])
   digest = message.digest
+  date = message.sent_on
   from = message.recipient
   to = message.sender
+  token = recipient[2]
+else
+  exit 0
 end
 
-exit 0 unless recipient[3] == digest[0,6]
+exit 0 unless token == digest[0, 6]
+exit 0 if date < 1.month.ago
 
 message.update_attribute(:message_read, true) if message