Fix Style/SafeNavigation rubocop warnings

[rails.git] / script / deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index c15d365962e45124e6a7148c51f89dc6a22c6e88..2c440c3ec60144b00d6cb571dae9ec8e3569df4e 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -6,7 +6,7 @@ if recipient = ARGV[0].match(/^c-(\d+)-(\d+)-(.*)$/)
   comment = DiaryComment.find(recipient[1])
   digest = comment.digest
   date = comment.created_at
   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+)-(.*)$/)


@@ -23,9 +23,11 @@ end
 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_attribute(:message_read, true) if message
+message&.update(:message_read => true)

 
 

-mail = Mail.new(STDIN.readlines.join)
+mail = Mail.new(STDIN.read
+                     .encode(:universal_newline => true)
+                     .encode(:crlf_newline => true))

 
 message = Message.from_mail(mail, from, to)
 message.save!
 
 message = Message.from_mail(mail, from, to)
 message.save!