Fix: #636 投稿削除時エラーが出る場合がある問題 (#637)

This commit is contained in:
KMY(雪あすか) 2024-03-05 20:17:47 +09:00 committed by GitHub
parent 8cb4838fb1
commit 82a8026ba2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 3 deletions

View file

@ -19,6 +19,9 @@ class RemoveStatusService < BaseService
@account = status.account
@options = options
@visibility = @status.visibility&.to_sym || :public
@searchability = @status.searchability&.to_sym || @status.compute_searchability&.to_sym || :public
with_redis_lock("distribute:#{@status.id}") do
@status.discard_with_reblogs
@ -146,7 +149,7 @@ class RemoveStatusService < BaseService
featured_tag.decrement(@status.id)
end
return unless %i(public public_unlisted login).include?(@status.visibility.to_sym) || (@status.unlisted_visibility? && %i(public public_unlisted).include?(@status.searchability.to_sym))
return unless %i(public public_unlisted login).include?(@visibility) || (@status.unlisted_visibility? && %i(public public_unlisted).include?(@searchability))
return if skip_streaming?
@ -157,7 +160,7 @@ class RemoveStatusService < BaseService
end
def remove_from_public
return unless %i(public public_unlisted login).include?(@status.visibility.to_sym)
return unless %i(public public_unlisted login).include?(@visibility)
return if skip_streaming?
@ -166,7 +169,7 @@ class RemoveStatusService < BaseService
end
def remove_from_media
return unless %i(public public_unlisted login).include?(@status.visibility.to_sym)
return unless %i(public public_unlisted login).include?(@visibility)
return if skip_streaming?