X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/300639dfa352d93fbbead68075f5edb29b1b5de7..5bbe1c4aee4e070cb1867d7bdfec9566aacb1466:/script/deliver-message?ds=sidebyside

diff --git a/script/deliver-message b/script/deliver-message
index 7382f251a..e713b2cfc 100755
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -7,34 +7,25 @@ exit 0 unless recipient = ARGV[0].match(/^([cm])-(\d+)-(.*)$/)
 if recipient[1] == "c"
   comment = DiaryComment.find(recipient[2])
   digest = comment.digest
+  date = diary_comment.created_at
   from = comment.diary_entry.user
   to = comment.user
 else
   message = Message.find(recipient[2])
   digest = message.digest
+  date = message.sent_on
   from = message.recipient
   to = message.sender
-
-  message.update_attribute(:message_read, true)
 end
 
 exit 0 unless recipient[3] == digest[0,6]
+exit 0 if date < 1.month.ago
 
-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
-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
-}, :without_protection => true)
+message = Message.from_mail(mail, from, to)
 message.save!
 
 Notifier.message_notification(message).deliver