Remove production credentials from the repository

[rails.git] / script / deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index 6907637a67d532623482883f1bb5c93fbf836e0d..087a117c3dceeeba884d600e8107de05aa77d950 100755 (executable)
--- 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,8 +20,8 @@ else
   exit 0
 end
 
+exit 0 unless ActiveSupport::SecurityUtils.secure_compare(token, digest[0, 6])
 exit 0 unless from.active?
-exit 0 unless token == digest[0, 6]
 exit 0 if date < 1.month.ago
 
 message&.update(:message_read => true)
@@ -33,6 +33,6 @@ mail = Mail.new($stdin.read
 message = Message.from_mail(mail, from, to)
 message.save!
 
-Notifier.message_notification(message).deliver
+UserMailer.message_notification(message).deliver
 
 exit 0