X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7be823bb11ad2aa93ffd4d85cc7f11469a867fa2..24b138db094e4b5e8d062c5248ee867967dc0fd7:/script/deliver-message diff --git a/script/deliver-message b/script/deliver-message index 3fd641f8d..2c440c3ec 100755 --- a/script/deliver-message +++ b/script/deliver-message @@ -1,26 +1,33 @@ #!/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 = comment.diary_entry.subscribers.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 -message.update_attribute(:message_read, true) if message +message&.update(:message_read => true) -mail = Mail.new(STDIN.readlines.join) +mail = Mail.new(STDIN.read + .encode(:universal_newline => true) + .encode(:crlf_newline => true)) message = Message.from_mail(mail, from, to) message.save!