X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e731dd71a77ad4ad1e9db22535e89444bb98e5d9..152414861caa30e9217e3451caabd5a2b983ce2b:/script/deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index 2c440c3ec..71fa4f2f1 100755
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + "/../config/environment"
+require File.join(File.dirname(__FILE__), "..", "config", "environment")
 
 if recipient = ARGV[0].match(/^c-(\d+)-(\d+)-(.*)$/)
   comment = DiaryComment.find(recipient[1])
@@ -20,18 +20,19 @@ else
   exit 0
 end
 
+exit 0 unless from.active?
 exit 0 unless token == digest[0, 6]
 exit 0 if date < 1.month.ago
 
 message&.update(:message_read => true)
 
-mail = Mail.new(STDIN.read
+mail = Mail.new($stdin.read
                      .encode(:universal_newline => true)
                      .encode(:crlf_newline => true))
 
 message = Message.from_mail(mail, from, to)
 message.save!
 
-Notifier.message_notification(message).deliver
+UserMailer.message_notification(message).deliver
 
 exit 0