Update message delivery script to work with rails 3

diff --git a/script/deliver-message b/script/deliver-message
index 85519b299a4d2894c990f4a65b421ba06a7a880e..f28a9d9f3b82e0a58e97cfc3f1bcc32da563ff88 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../config/environment'
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../config/environment'

-require 'tmail'

 
 exit 0 unless recipient = ARGV[0].match(/^([cm])-(\d+)-(.*)$/)
 
 
 exit 0 unless recipient = ARGV[0].match(/^([cm])-(\d+)-(.*)$/)
 


@@ -19,14 +18,14 @@ end
 
 exit 0 unless recipient[3] == digest[0,6]
 
 
 exit 0 unless recipient[3] == digest[0,6]
 

-mail = TMail::Mail.parse(STDIN.readlines.join)
+mail = Mail.new(STDIN.readlines.join)

 
 message = Message.new(:sender => from, :recipient => to,
 
 message = Message.new(:sender => from, :recipient => to,

-                      :sent_on => Time.now.getutc,
+                      :sent_on => mail.date.new_offset(0),

                       :title => mail.subject.sub(/\[OpenStreetMap\] */, ""),
                       :title => mail.subject.sub(/\[OpenStreetMap\] */, ""),

-                      :body => mail.body)
+                      :body => mail.body.decoded)

 message.save!
 
 message.save!
 

-Notifier::deliver_message_notification(message)
+Notifier.message_notification(message).deliver

 
 exit 0
 
 exit 0