gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/stable-4.2' into kb-draft-5.14-lts

Browse source
This commit is contained in:
KMY 2024-01-25 07:45:24 +09:00
commit 1d42b6b82f
59 changed files with 810 additions and 489 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/concerns/account_interactions.rb
View file

@ -60,12 +60,6 @@ module AccountInteractions
end
end
def domain_blocking_map(target_account_ids, account_id)
accounts_map = Account.where(id: target_account_ids).select('id, domain').each_with_object({}) { |a, h| h[a.id] = a.domain }
blocked_domains = domain_blocking_map_by_domain(accounts_map.values.compact, account_id)
accounts_map.reduce({}) { |h, (id, domain)| h.merge(id => blocked_domains[domain]) }
end
def domain_blocking_map_by_domain(target_domains, account_id)
follow_mapping(AccountDomainBlock.where(account_id: account_id, domain: target_domains), :domain)
end