X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2f4d12f990644a891df5db4fa0e00315522744ea..aa4205482a4af317ec26fc686793b57f02a6864a:/script/deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index f28a9d9f3..6dffea96c 100755
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -18,12 +18,23 @@ end
 
 exit 0 unless recipient[3] == digest[0,6]
 
+message.update_attribute(:message_read, true) if message
+
 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 => mail.body.decoded)
+if mail.multipart?
+  body = mail.html_part || mail.text_part
+else
+  body = mail
+end
+
+message = Message.new({
+  :sender => from,
+  :recipient => to,
+  :sent_on => mail.date.new_offset(0),
+  :title => mail.subject.sub(/\[OpenStreetMap\] */, ""),
+  :body => body.decoded
+}, :without_protection => true)
 message.save!
 
 Notifier.message_notification(message).deliver