X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/122fab7066cea03b3412d27ef9640d672a03094c..e3de1c457205e281fcae31e42fd8651b37a4c214:/script/deliver-message diff --git a/script/deliver-message b/script/deliver-message index 85519b299..04dcb881b 100755 --- a/script/deliver-message +++ b/script/deliver-message @@ -1,32 +1,33 @@ #!/usr/bin/env ruby -require File.dirname(__FILE__) + '/../config/environment' -require 'tmail' +require File.dirname(__FILE__) + "/../config/environment" 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 unless recipient[3] == digest[0, 6] +exit 0 if date < 1.month.ago -mail = TMail::Mail.parse(STDIN.readlines.join) +message.update_attribute(:message_read, true) if message -message = Message.new(:sender => from, :recipient => to, - :sent_on => Time.now.getutc, - :title => mail.subject.sub(/\[OpenStreetMap\] */, ""), - :body => mail.body) +mail = Mail.new(STDIN.readlines.join) + +message = Message.from_mail(mail, from, to) message.save! -Notifier::deliver_message_notification(message) +Notifier.message_notification(message).deliver exit 0