X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/408461e5aa9419500a624d62c781d7328e5c2b9d..d48b25124eaf561428176c60b79cc90e0a8e8125:/script/deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index 28b32cda6..04dcb881b 100755
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -1,34 +1,33 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../config/environment'
-require 'tmail'
+require File.dirname(__FILE__) + "/../config/environment"
 
 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
-  subject = mail.subject
 else
   message = Message.find(recipient[2])
   digest = message.digest
+  date = message.sent_on
   from = message.recipient
   to = message.sender
-  subject = mail.subject.sub(/\[OpenStreetMap\] */, "")
 end
 
-exit 0 unless recipient[3] == digest[0,6]
+exit 0 unless recipient[3] == digest[0, 6]
+exit 0 if date < 1.month.ago
 
-mail = TMail::Mail.parse(STDIN.readlines.join)
+message.update_attribute(:message_read, true) if message
 
-message = Message.new(:sender => from, :recipient => to,
-                      :sent_on => Time.now.getutc,
-                      :title => subject,
-                      :body => mail.body)
+mail = Mail.new(STDIN.readlines.join)
+
+message = Message.from_mail(mail, from, to)
 message.save!
 
-Notifier::deliver_message_notification(message)
+Notifier.message_notification(message).deliver
 
 exit 0