Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream

2023-10-08 17:10:39 +02:00
parent 8eb09c6f72 37bbd3c106
commit 74c27e33e3
11 changed files with 83 additions and 72 deletions
@@ -60,8 +60,12 @@ class AccountStatusesFilter
      .where(reblog_of_id: nil)
      .or(
        scope
+          # This is basically `Status.not_domain_blocked_by_account(current_account)`
+          # and `Status.not_excluded_by_account(current_account)` but on the
+          # `reblog` association. Unfortunately, there seem to be no clean way
+          # to re-use those scopes in our case.
+          .where(reblog: { accounts: { domain: nil } }).or(scope.where.not(reblog: { accounts: { domain: current_account.excluded_from_timeline_domains } }))
          .where.not(reblog: { account_id: current_account.excluded_from_timeline_account_ids })
-          .where.not(reblog: { accounts: { domain: current_account.excluded_from_timeline_domains } })
      )
  end