Rework about page to avoid html in the translations

[rails.git] / script / deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index 15a9fbdc7f613f7d14cb9b6119a6dc7719d39afc..71fa4f2f15b1e500d5ca55ca2be19f5db0658987 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 
 #!/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])
   digest = comment.digest
   date = comment.created_at
 
 if recipient = ARGV[0].match(/^c-(\d+)-(\d+)-(.*)$/)
   comment = DiaryComment.find(recipient[1])
   digest = comment.digest
   date = comment.created_at

-  from = User.find(recipient[2])
+  from = comment.diary_entry.subscribers.find(recipient[2])

   to = comment.user
   token = recipient[3]
 elsif recipient = ARGV[0].match(/^m-(\d+)-(.*)$/)
   to = comment.user
   token = recipient[3]
 elsif recipient = ARGV[0].match(/^m-(\d+)-(.*)$/)


@@ -20,18 +20,19 @@ else
   exit 0
 end
 
   exit 0
 end
 

+exit 0 unless from.active?

 exit 0 unless token == digest[0, 6]
 exit 0 if date < 1.month.ago
 
 exit 0 unless token == digest[0, 6]
 exit 0 if date < 1.month.ago
 

-message.update(:message_read => true) if message
+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!
 
                      .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
 
 exit 0