Merge branch 'master' into openstreetbugs
[rails.git] / script / deliver-message
index d3af5ffbaa13d53ed7eff520649d1de6c485d442..3df09f85fdbde5cf396d55da6591072dfba2b78c 100755 (executable)
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../config/environment'
-require 'mailread'
+require 'tmail'
 
 exit 0 unless recipient = ARGV[0].match(/^([cm])-(\d+)-(.*)$/)
 
@@ -19,12 +19,12 @@ end
 
 exit 0 unless recipient[3] == digest[0,6]
 
-mail = Mail.new(STDIN)
+mail = TMail::Mail.parse(STDIN.readlines.join)
 
 message = Message.new(:sender => from, :recipient => to,
                       :sent_on => Time.now.getutc,
-                      :title => mail["Subject"],
-                      :body => mail.body.join("\n"))
+                      :title => mail.subject,
+                      :body => mail.body)
 message.save!
 
 Notifier::deliver_message_notification(message)