Add check for visibility.nil? even though it can't ever be, to check for race conditions

diff --git a/app/lib/exceptions.rb b/app/lib/exceptions.rb
index 200da9fe16a1feac0449641e9f17c7e5342d4176..9bc802c12074f0bf5aa9254fe53255078f783d0e 100644 (file)
--- a/app/lib/exceptions.rb
+++ b/app/lib/exceptions.rb
@@ -4,4 +4,5 @@ module Mastodon
   class Error < StandardError; end
   class NotPermittedError < Error; end
   class ValidationError < Error; end
+  class RaceConditionError < Error; end
 end

diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 402b84b2f873b6cec7475f73e012d8c519f1059d..df404cbef174e1597d6a29c050d86bda8b0adcbe 100644 (file)
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -4,6 +4,8 @@ class FanOutOnWriteService < BaseService
   # Push a status into home and mentions feeds
   # @param [Status] status
   def call(status)
+    raise Mastodon::RaceConditionError if status.visibility.nil?
+
     deliver_to_self(status) if status.account.local?
 
     if status.direct_visibility?