From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Nov 2011 15:42:43 +0000 (+0000)
Subject: Update message delivery script to work with rails 3
X-Git-Tag: live~6614
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/2f4d12f990644a891df5db4fa0e00315522744ea

Update message delivery script to work with rails 3
---

diff --git a/script/deliver-message b/script/deliver-message
index 85519b299..f28a9d9f3 100755
--- 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,14 @@ end
 
 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,
-                      :sent_on => Time.now.getutc,
+                      :sent_on => mail.date.new_offset(0),
                       :title => mail.subject.sub(/\[OpenStreetMap\] */, ""),
-                      :body => mail.body)
+                      :body => mail.body.decoded)
 message.save!
 
-Notifier::deliver_message_notification(message)
+Notifier.message_notification(message).deliver
 
 exit 0