X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2ee961be9f6461421bf9f0e1952d578df676268f..6c8845d62fdb3768647ad6fdcb356bf0e6a33302:/script/deliver-message diff --git a/script/deliver-message b/script/deliver-message index 6dffea96c..3fd641f8d 100755 --- a/script/deliver-message +++ b/script/deliver-message @@ -22,19 +22,7 @@ message.update_attribute(:message_read, true) if message mail = Mail.new(STDIN.readlines.join) -if mail.multipart? - body = mail.html_part || mail.text_part -else - body = mail -end - -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