Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix blocked domain appears from account feed (#26823)

Browse Source 
Co-authored-by: Jeong Arm <kjwonmail@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
This commit is contained in:
Claire
2023-09-06 21:04:48 +02:00
committed by GitHub
parent 14f6798836
commit 1f99d86287
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/lib/account_statuses_filter.rb
View File

@@ -55,7 +55,14 @@ class AccountStatusesFilter
end
def filtered_reblogs_scope
Status.left_outer_joins(:reblog).where(reblog_of_id: nil).or(Status.where.not(reblogs_statuses: { account_id: current_account.excluded_from_timeline_account_ids }))
scope = Status.left_outer_joins(reblog: :account)
scope
.where(reblog_of_id: nil)
.or(
scope
.where.not(reblog: { account_id: current_account.excluded_from_timeline_account_ids })
.where.not(reblog: { accounts: { domain: current_account.excluded_from_timeline_domains } })
)
end
def only_media_scope