logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 8232f76c482d3046055bd7bf224ef7835d0fa399
parent: 98a93aa07e087ea3af98253a55a9ba2a043c5b36
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Mon,  3 Apr 2017 22:54:46 +0200

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

Diffstat:

Mapp/lib/exceptions.rb1+
Mapp/services/fan_out_on_write_service.rb2++
2 files changed, 3 insertions(+), 0 deletions(-)

diff --git 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 @@ -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?