X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c7762fed23c186436807ef11fbd8a2def9acbfa6..7f61fc22de8d46bfcdcce44edcfdc912d951070e:/script/deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index 15a9fbdc7..2c440c3ec 100755
--- 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
-  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+)-(.*)$/)
@@ -23,7 +23,7 @@ end
 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
                      .encode(:universal_newline => true)