Merge remote-tracking branch 'upstream/pull/4331'

[rails.git] / script / deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index 7b5f60e01354756a6b4401dd4fb783fa1fd95824..28d755b24d4a40e74934d50600258764234d5803 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -1,32 +1,38 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../config/environment'
+require File.join(File.dirname(__FILE__), "..", "config", "environment")
 
-exit 0 unless recipient = ARGV[0].match(/^([cm])-(\d+)-(.*)$/)
-
-if recipient[1] == "c"
-  comment = DiaryComment.find(recipient[2])
-  digest = comment.digest
-  from = comment.diary_entry.user
+if recipient = ARGV[0].match(/^c-(\d+)-(\d+)-(.*)$/)
+  comment = DiaryComment.find(recipient[1])
+  expected_token = comment.notification_token(recipient[2])
+  date = comment.created_at
+  from = comment.diary_entry.subscribers.find(recipient[2])
   to = comment.user
-else
-  message = Message.find(recipient[2])
-  digest = message.digest
+  token = recipient[3]
+elsif recipient = ARGV[0].match(/^m-(\d+)-(.*)$/)
+  message = Message.find(recipient[1])
+  expected_token = message.notification_token
+  date = message.sent_on
   from = message.recipient
   to = message.sender
+  token = recipient[2]
+else
+  exit 0
 end
 
-exit 0 unless recipient[3] == digest[0,6]
+exit 0 unless ActiveSupport::SecurityUtils.secure_compare(token, expected_token)
+exit 0 unless from.active?
+exit 0 if date < 1.month.ago
+
+message&.update(:message_read => true)
 
-mail = Mail.new(STDIN.readlines.join)
-body = mail.html_part || mail.text_part
+mail = Mail.new($stdin.read
+                     .encode(:universal_newline => true)
+                     .encode(:crlf_newline => true))
 
-message = Message.new(:sender => from, :recipient => to,
-                      :sent_on => mail.date.new_offset(0),
-                      :title => mail.subject.sub(/\[OpenStreetMap\] */, ""),
-                      :body => body.decoded)
+message = Message.from_mail(mail, from, to)
 message.save!
 
-Notifier.message_notification(message).deliver
+UserMailer.message_notification(message).deliver
 
 exit 0