From f72b9ba01d1173acbe277fc676ee94ba631cdad1 Mon Sep 17 00:00:00 2001 From: KMY Date: Mon, 1 May 2023 14:05:18 +0900 Subject: [PATCH] Fix statuses filter merges --- app/models/account_statuses_filter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/account_statuses_filter.rb b/app/models/account_statuses_filter.rb index d440a6a8be..f95c4ce1b8 100644 --- a/app/models/account_statuses_filter.rb +++ b/app/models/account_statuses_filter.rb @@ -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