X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/be1ea6dd431cb018b669feefc62765ec48f08366..ec6f14df0ce68192b9815a3895d1cc2737f23b6b:/script/deliver-message?ds=sidebyside diff --git a/script/deliver-message b/script/deliver-message index 3df09f85f..3fd641f8d 100755 --- a/script/deliver-message +++ b/script/deliver-message @@ -1,7 +1,6 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../config/environment' -require 'tmail' exit 0 unless recipient = ARGV[0].match(/^([cm])-(\d+)-(.*)$/) @@ -19,14 +18,13 @@ end exit 0 unless recipient[3] == digest[0,6] -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, - :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