Fix statuses filter merges

This commit is contained in:
KMY 2023-05-01 14:05:18 +09:00
parent 7bcef0f8b2
commit f72b9ba01d

View file

@ -28,7 +28,7 @@ class AccountStatusesFilter
scope.merge!(scope.where(searchability: :public)) if domain_block&.reject_send_not_public_searchability
scope.merge!(scope.where.not(visibility: :public_unlisted)) if domain_block&.reject_send_public_unlisted || (domain_block&.detect_invalid_subscription && @account.user&.reject_public_unlisted_subscription?)
scope.merge!(scope.where.not(visibility: :unlisted)) if domain_block&.detect_invalid_subscription && @account.user&.unlisted_subscription?
scope.merge!(scope.where.not(visibility: :unlisted)) if domain_block&.detect_invalid_subscription && @account.user&.reject_unlisted_subscription?
scope.merge!(scope.where(spoiler_text: ['', nil])) if domain_block&.reject_send_sensitive
scope