Merge branch 'main' into glitch-soc/merge-upstream
This commit is contained in:
commit
1c6ab3aba9
2 changed files with 4 additions and 1 deletions
|
@ -38,6 +38,8 @@ module Admin
|
|||
log_action :create, @email_domain_block
|
||||
|
||||
(@email_domain_block.other_domains || []).uniq.each do |domain|
|
||||
next if EmailDomainBlock.where(domain: domain).exists?
|
||||
|
||||
other_email_domain_block = EmailDomainBlock.create!(domain: domain, parent: @email_domain_block)
|
||||
log_action :create, other_email_domain_block
|
||||
end
|
||||
|
|
|
@ -15,7 +15,8 @@ class Scheduler::EmailDomainBlockRefreshScheduler
|
|||
if ip?(email_domain_block.domain)
|
||||
[email_domain_block.domain]
|
||||
else
|
||||
dns.getresources(email_domain_block.domain, Resolv::DNS::Resource::IN::A).to_a + dns.getresources(email_domain_block.domain, Resolv::DNS::Resource::IN::AAAA).to_a.map { |resource| resource.address.to_s }
|
||||
resources = dns.getresources(email_domain_block.domain, Resolv::DNS::Resource::IN::A).to_a + dns.getresources(email_domain_block.domain, Resolv::DNS::Resource::IN::AAAA).to_a
|
||||
resources.map { |resource| resource.address.to_s }
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue