Fixed parameters issue with not_domain_blocked_by_account

VantaInteractive · Dec 3, 2024 · 77c4768 · 77c4768
1 parent 5057605
commit 77c4768
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/account.rb b/app/models/account.rb
@@ -148,7 +148,7 @@ class Account < ApplicationRecord
   scope :by_recent_activity, -> { left_joins(:user, :account_stat).order(coalesced_activity_timestamps.desc).order(id: :desc) }
   scope :by_domain_and_subdomains, ->(domain) { where(domain: Instance.by_domain_and_subdomains(domain).select(:domain)) }
   scope :not_excluded_by_account, ->(account) { where.not(id: account.excluded_from_timeline_account_ids) }
-  scope :not_domain_blocked_by_account, lambda { |account, bubble_only|
+  scope :not_domain_blocked_by_account, lambda { |account, bubble_only = false|
     exclude = arel_table[:domain].not_in(account.excluded_from_timeline_domains)
     if bubble_only
       where(arel_table[:domain].in(BubbleDomain.bubble_domains).and(exclude))

diff --git a/app/models/status.rb b/app/models/status.rb
@@ -117,7 +117,7 @@ class Status < ApplicationRecord
   scope :without_reblogs, -> { where(statuses: { reblog_of_id: nil }) }
   scope :tagged_with, ->(tag_ids) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag_ids }) }
   scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) }
-  scope :not_domain_blocked_by_account, ->(account, bubble_only) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).merge(Account.not_domain_blocked_by_account(account, bubble_only)) }
+  scope :not_domain_blocked_by_account, ->(account, bubble_only = false) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).merge(Account.not_domain_blocked_by_account(account, bubble_only)) }
   scope :tagged_with_all, lambda { |tag_ids|
     Array(tag_ids).map(&:to_i).reduce(self) do |result, id|
       result.where(<<~SQL.squish, tag_id: id)