File tree Expand file tree Collapse file tree
builder/source/references Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1+ import * as TLD from 'tldts'
12import { FetchAdShieldDomainsFromFiltersLists } from './filterslists.js'
23import { FetchIABSellersJsonData } from './iabsellers.js'
34import { DiscardResolvedDupWildcard } from '@builder/utils/discard-resolved-dup-wildcard.js'
@@ -33,10 +34,14 @@ export async function FetchAdShieldDomains(): Promise<TASDomainContainer> {
3334 ] )
3435
3536 const CombinedDomains = new Set < string > ( [ ...IABSellersDomains , ...FiltersListsDomains ] )
37+ CombinedDomains . forEach ( Domain => {
38+ const Parsed = TLD . parse ( Domain )
39+ if ( Domain . startsWith ( '~' ) && ! Parsed . domain ?. startsWith ( '~' ) ) CombinedDomains . delete ( Domain )
40+ } )
41+ CustomDefinedMatches . forEach ( Match => CombinedDomains . add ( Match ) )
42+ CustomExcludeMatches . forEach ( Match => CombinedDomains . delete ( Match ) )
3643 const Result : TASDomainContainer = new Map ( )
3744 const NormalDomains = DiscardResolvedDupWildcard ( CombinedDomains )
38- CustomDefinedMatches . forEach ( Match => NormalDomains . add ( Match ) )
39- CustomExcludeMatches . forEach ( Match => NormalDomains . delete ( Match ) )
4045 const FullDomains = ConvertToFullDomains ( NormalDomains )
4146 const EachDomain = RegroupDomainTldLevel ( NormalDomains )
4247 const EachDomainFull = ConvertToFullDomains ( EachDomain )
You can’t perform that action at this time.
0 commit comments