X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f4d12f990644a891df5db4fa0e00315522744ea..078a9d8ee3058fe95e437b8597a22c97911e89c1:/script/deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index f28a9d9f3..e713b2cfc 100755
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -7,23 +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)
 
-message = Message.new(:sender => from, :recipient => to,
-                      :sent_on => mail.date.new_offset(0),
-                      :title => mail.subject.sub(/\[OpenStreetMap\] */, ""),
-                      :body => mail.body.decoded)
+message = Message.from_mail(mail, from, to)
 message.save!
 
 Notifier.message_notification(message).deliver