Fix: #304 rubocop:disable Style/OptionalBooleanParameter (#310)

This commit is contained in:
S.H 2023-11-28 21:27:55 +09:00 committed by GitHub
parent 6dd40ad7cd
commit d18b233239
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 13 deletions

View file

@ -37,12 +37,12 @@ class FeedManager
# @param [Status] status
# @param [Account|List] receiver
# @return [Boolean]
def filter?(timeline_type, status, receiver, stl_home = false) # rubocop:disable Style/OptionalBooleanParameter
def filter?(timeline_type, status, receiver, stl_home: false)
case timeline_type
when :home
filter_from_home?(status, receiver.id, build_crutches(receiver.id, [status]), :home)
when :list
filter_from_list?(status, receiver) || filter_from_home?(status, receiver.account_id, build_crutches(receiver.account_id, [status]), :list, stl_home)
filter_from_list?(status, receiver) || filter_from_home?(status, receiver.account_id, build_crutches(receiver.account_id, [status]), :list, stl_home: stl_home)
when :mentions
filter_from_mentions?(status, receiver.id)
when :tags
@ -409,7 +409,7 @@ class FeedManager
# @param [Integer] receiver_id
# @param [Hash] crutches
# @return [Boolean]
def filter_from_home?(status, receiver_id, crutches, timeline_type = :home, stl_home = false) # rubocop:disable Style/OptionalBooleanParameter
def filter_from_home?(status, receiver_id, crutches, timeline_type = :home, stl_home: false)
return false if receiver_id == status.account_id
return true if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?)
return true if (timeline_type != :list || stl_home) && (crutches[:exclusive_list_users][status.account_id].present? || crutches[:exclusive_antenna_users][status.account_id].present?)

View file

@ -80,7 +80,7 @@ class StatusCacheHydrator
def mapped_applied_custom_filter(account_id, status)
CustomFilter
.apply_cached_filters(CustomFilter.cached_filters_for(account_id), status, following?(account_id))
.apply_cached_filters(CustomFilter.cached_filters_for(account_id), status, following: following?(account_id))
.map { |filter| serialized_filter(filter) }
end