Mark a message as read when we receive an email reply to it

[rails.git] / script / deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index 7b5f60e01354756a6b4401dd4fb783fa1fd95824..7382f251adfa5c4cdec2a2cabf621253be67ac7e 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -14,17 +14,27 @@ else
   digest = message.digest
   from = message.recipient
   to = message.sender
+
+  message.update_attribute(:message_read, true)
 end
 
 exit 0 unless recipient[3] == digest[0,6]
 
 mail = Mail.new(STDIN.readlines.join)
-body = mail.html_part || mail.text_part
 
-message = Message.new(:sender => from, :recipient => to,
-                      :sent_on => mail.date.new_offset(0),
-                      :title => mail.subject.sub(/\[OpenStreetMap\] */, ""),
-                      :body => 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