X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/23b8672bc9a8449f6a89d94b25ea036f4815e4bc..046fbdc1777e0e9dfd400eb56d560f46bc69ddec:/script/deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index d3af5ffba..e713b2cfc 100755
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -1,32 +1,33 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../config/environment'
-require 'mailread'
 
 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
 
-mail = Mail.new(STDIN)
+message.update_attribute(:message_read, true) if message
 
-message = Message.new(:sender => from, :recipient => to,
-                      :sent_on => Time.now.getutc,
-                      :title => mail["Subject"],
-                      :body => mail.body.join("\n"))
+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