Added test for changeset/download hiding redacted elements

[rails.git] / script / deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index 85519b299a4d2894c990f4a65b421ba06a7a880e..3fd641f8dbf40ddb76273ad2b8bf45a6e5c4dd73 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../config/environment'
-require 'tmail'
 
 exit 0 unless recipient = ARGV[0].match(/^([cm])-(\d+)-(.*)$/)
 
@@ -19,14 +18,13 @@ end
 
 exit 0 unless recipient[3] == digest[0,6]
 
-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 => mail.subject.sub(/\[OpenStreetMap\] */, ""),
-                      :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