Continued:

[fba.git] / fba / utils.py

diff --git a/fba/utils.py b/fba/utils.py
index d1cf021fe3781e65d154215f49352fdd34d43274..44c831014cbafd3db123376cebba73a536e70f49 100644 (file)
--- a/fba/utils.py
+++ b/fba/utils.py
@@ -20,9 +20,7 @@ from urllib.parse import urlparse
 
 import bs4
 import requests
-import validators
 
-from fba.helpers import blacklist
 from fba.helpers import config
 from fba.helpers import domain as domain_helper
 from fba.helpers import tidyup
@@ -99,7 +97,7 @@ def find_domains(tags: bs4.element.ResultSet, search: str) -> list:
         domain = domain.encode("idna").decode("utf-8")
         logger.debug("domain='%s' - AFTER!", domain)
 
-        if not is_domain_wanted(domain):
+        if not domain_helper.is_wanted(domain):
             logger.debug("domain='%s' is not wanted - SKIPPED!", domain)
             continue
 
@@ -109,41 +107,6 @@ def find_domains(tags: bs4.element.ResultSet, search: str) -> list:
     logger.debug("domains()=%d - EXIT!", len(domains))
     return domains
 
-def is_domain_wanted(domain: str) -> bool:
-    logger.debug("domain='%s' - CALLED!", domain)
-
-    wanted = True
-    if not isinstance(domain, str):
-        raise ValueError(f"Parameter domain[]='{type(domain)}' is not of type 'str'")
-    elif domain == "":
-        raise ValueError("Parameter 'domain' is empty")
-    elif domain.lower() != domain:
-        wanted = False
-    elif not validators.domain(domain.split("/")[0]):
-        logger.debug("domain='%s' is not a valid domain name - settings False ...", domain)
-        wanted = False
-    elif domain.endswith(".arpa"):
-        logger.debug("domain='%s' is a domain for reversed IP addresses - settings False ...", domain)
-        wanted = False
-    elif domain.endswith(".onion"):
-        logger.debug("domain='%s' is a TOR .onion domain - settings False ...", domain)
-        wanted = False
-    elif domain.endswith(".tld"):
-        logger.debug("domain='%s' is a fake domain - settings False ...", domain)
-        wanted = False
-    elif blacklist.is_blacklisted(domain):
-        logger.debug("domain='%s' is blacklisted - settings False ...", domain)
-        wanted = False
-    elif domain.find("/profile/") > 0 or domain.find("/users/") > 0 or (instances.is_registered(domain.split("/")[0]) and domain.find("/c/") > 0):
-        logger.debug("domain='%s' is a single user", domain)
-        wanted = False
-    elif domain.find("/tag/") > 0:
-        logger.debug("domain='%s' is a tag", domain)
-        wanted = False
-
-    logger.debug("wanted='%s' - EXIT!", wanted)
-    return wanted
-
 def deobfuscate(domain: str, blocker: str, domain_hash: str = None) -> str:
     logger.debug("domain='%s',blocker='%s',domain_hash='%s' - CALLED!", domain, blocker, domain_hash)
     domain_helper.raise_on(blocker)