X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e660e609661edadc1ed5ad49d6e83e936b2f91cd..2a44ff581f4c547a3637ea52567a3398b1d8bfe0:/script/deliver-message?ds=inline diff --git a/script/deliver-message b/script/deliver-message index 669e54a66..15a9fbdc7 100755 --- a/script/deliver-message +++ b/script/deliver-message @@ -1,38 +1,35 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../config/environment' +require File.dirname(__FILE__) + "/../config/environment" -exit 0 unless recipient = ARGV[0].match(/^([cm])-(\d+)-(.*)$/) - -if recipient[1] == "c" - comment = DiaryComment.find(recipient[2]) +if recipient = ARGV[0].match(/^c-(\d+)-(\d+)-(.*)$/) + comment = DiaryComment.find(recipient[1]) digest = comment.digest - from = comment.diary_entry.user + date = comment.created_at + from = User.find(recipient[2]) to = comment.user -else - message = Message.find(recipient[2]) + token = recipient[3] +elsif recipient = ARGV[0].match(/^m-(\d+)-(.*)$/) + message = Message.find(recipient[1]) digest = message.digest + date = message.sent_on from = message.recipient to = message.sender + token = recipient[2] +else + exit 0 end -exit 0 unless recipient[3] == digest[0,6] +exit 0 unless token == digest[0, 6] +exit 0 if date < 1.month.ago -mail = Mail.new(STDIN.readlines.join) +message.update(:message_read => true) if message -if mail.multipart? - body = mail.html_part || mail.text_part -else - body = mail -end +mail = Mail.new(STDIN.read + .encode(:universal_newline => true) + .encode(:crlf_newline => true)) -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