Merge branch 'master' into openstreetbugs

[rails.git] / script / deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index b6c679b0a6cf3e863f9e765eed61d78915f6bb09..3fd641f8dbf40ddb76273ad2b8bf45a6e5c4dd73 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -18,18 +18,11 @@ end
 
 exit 0 unless recipient[3] == digest[0,6]
 
-mail = Mail.new(STDIN.readlines.join)
+message.update_attribute(:message_read, true) if message
 
-if mail.multipart?
-  body = mail.html_part || mail.text_part
-else
-  body = mail.body
-end
+mail = Mail.new(STDIN.readlines.join)
 
-message = Message.new(:sender => from, :recipient => to,
-                      :sent_on => mail.date.new_offset(0),
-                      :title => mail.subject.sub(/\[OpenStreetMap\] */, ""),
-                      :body => body.decoded)
+message = Message.from_mail(mail, from, to)
 message.save!
 
 Notifier.message_notification(message).deliver