X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/52e5fa6ad78f375cec5a207a123a4aa3939c8ddf..5bb55c23152a448b4128be32f46178a13926cb74:/script/deliver-message diff --git a/script/deliver-message b/script/deliver-message index b6c679b0a..e713b2cfc 100755 --- a/script/deliver-message +++ b/script/deliver-message @@ -7,29 +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 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.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