Merge pull request #17 from danstowell/jsrouting-clearsearch

[rails.git] / script / deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index 6dffea96cbff9633dcc023f9f8a6cc7937c18c2a..e713b2cfcab93c25c567d4e78a9228a6be2dd1dd 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -7,34 +7,25 @@ exit 0 unless recipient = ARGV[0].match(/^([cm])-(\d+)-(.*)$/)
 if recipient[1] == "c"
   comment = DiaryComment.find(recipient[2])
   digest = comment.digest
+  date = diary_comment.created_at
   from = comment.diary_entry.user
   to = comment.user
 else
   message = Message.find(recipient[2])
   digest = message.digest
+  date = message.sent_on
   from = message.recipient
   to = message.sender
 end
 
 exit 0 unless recipient[3] == digest[0,6]
+exit 0 if date < 1.month.ago
 
 message.update_attribute(:message_read, true) if message
 
 mail = Mail.new(STDIN.readlines.join)
 
-if mail.multipart?
-  body = mail.html_part || mail.text_part
-else
-  body = mail
-end
-
-message = Message.new({
-  :sender => from,
-  :recipient => to,
-  :sent_on => mail.date.new_offset(0),
-  :title => mail.subject.sub(/\[OpenStreetMap\] */, ""),
-  :body => body.decoded
-}, :without_protection => true)
+message = Message.from_mail(mail, from, to)
 message.save!
 
 Notifier.message_notification(message).deliver