change site colors; remove aws rank code

Author: frewsxcv

Pipfile

@@ -5,7 +5,6 @@ verify_ssl = true
 
 [packages]
 jinja2 = "*"
-myawis = "*"
 geoip2 = "*"
 whois = "*"
 

build.py

@@ -15,12 +15,8 @@
 import geoip2.database
 import urllib.request
 import whois
-import check
-
-from xml.etree import ElementTree
 
 import jinja2
-import myawis
 
 
 HATE_SITES_CSV_DEFAULT_PATH = 'hate-sites.csv'
@@ -36,35 +32,6 @@
 }
 
 
-def site_rank(site: str) -> typing.Optional[int]:
-    while True:
-        obj = myawis.CallAwis(args.aws_access_key_id, args.aws_secret_access_key)
-        try:
-            urlinfo = obj.urlinfo(site)
-            break
-        except requests.exceptions.ConnectionError:
-            log_error(site, "AWIS connection error, trying again")
-    try:
-        tree = ElementTree.fromstring(str(urlinfo))
-    except ElementTree.ParseError:
-        log_error(site, "Could not retrieve rank")
-        return None
-    results = tree.findall(
-        './/aws:TrafficData/aws:Rank',
-        {'aws': "http://awis.amazonaws.com/doc/2005-07-11"}
-    )
-    if not results:
-        log_error(site, 'Could not find rank')
-        return None
-    rank = tree.findall(
-        './/aws:TrafficData/aws:Rank',
-        {'aws': "http://awis.amazonaws.com/doc/2005-07-11"}
-    )[0].text
-    log_info(site, f"Found site rank: {rank}")
-    # TODO fetch `aws:ContributingSubdomain`
-    return int(rank) if rank else None
-
-
 def log_info(site: str, s: str):
     logging.info(f"{site} - {s}")
 
@@ -127,14 +94,11 @@ def build_isps_data(limit=None):
         if isp is None:
             continue
 
-        rank = site_rank(site)
-
         hate_site_response = HateSiteLoader(domain=site).load()
         is_site_up = isinstance(
             HateSiteResponseAnalyzer(response=hate_site_response, page_string=page_string).analyze(),
             HateSiteResponseSiteUp
         )
-        print(f"site up: {is_site_up}")
 
         if classification != 'splc':
             classification = None
@@ -192,7 +156,7 @@ class HateSiteResponsePageStringNotFound:
     pass
 
 
-class HateSiteReponseSiteDown(typing.NamedTuple):
+class HateSiteResponseSiteDown(typing.NamedTuple):
     status_code: typing.Optional[int]
     reason: str
 
@@ -201,7 +165,7 @@ class HateSiteResponseAnalyzer(typing.NamedTuple):
     response: typing.Union[HateSiteResponse, HateSiteErrorResponse]
     page_string: str
 
-    def analyze(self) -> typing.Union[HateSiteResponseSiteUp, HateSiteResponsePageStringNotFound, HateSiteReponseSiteDown]:
+    def analyze(self) -> typing.Union[HateSiteResponseSiteUp, HateSiteResponsePageStringNotFound, HateSiteResponseSiteDown]:
         if isinstance(self.response, HateSiteResponse):
             if self.page_string.encode() in self.response.body:
                 return HateSiteResponseSiteUp()
@@ -237,8 +201,6 @@ def render(limit=None):
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
-    parser.add_argument('aws_access_key_id')
-    parser.add_argument('aws_secret_access_key')
     parser.add_argument('--hate-sites-csv-path', default=HATE_SITES_CSV_DEFAULT_PATH)
     parser.add_argument('--log', action='store_true')
     parser.add_argument('--limit', type=int, help='Limit the number of sites to process')

templates/base.html.j2

@@ -32,31 +32,31 @@
       }
 
       /* variables */
-      /* https://paletton.com/#uid=73Y1U0kcEbc8EmTaIhAiWa8o57L */
+      /* https://paletton.com/#uid=73Y1U0kcrbw8knSaNimj9aqoB7L */
       :root {
-        --color-primary-0: #292A3E;
-        --color-primary-1: #61637F;
-        --color-primary-2: #454761;
-        --color-primary-3: #1C1D38;
-        --color-primary-4: #0F112B;
-
-        --color-secondary-1-0: #594036;
-        --color-secondary-1-1: #B69285;
-        --color-secondary-1-2: #8C6A5D;
-        --color-secondary-1-3: #512E21;
-        --color-secondary-1-4: #3E1C0F;
-
-        --color-secondary-2-0: #253E33;
-        --color-secondary-2-1: #5C7E6F;
-        --color-secondary-2-2: #406152;
-        --color-secondary-2-3: #173829;
-        --color-secondary-2-4: #0B2B1C;
-
-        --color-complement-0: #595036;
-        --color-complement-1: #B6AA85;
-        --color-complement-2: #8C805D;
-        --color-complement-3: #514421;
-        --color-complement-4: #3E320F;
+        --color-primary-0: #2B2C40;
+        --color-primary-1: #676884;
+        --color-primary-2: #484A66;
+        --color-primary-3: #1C1E3A;
+        --color-primary-4: #0F102B;
+
+        --color-secondary-1-0: #5C4238;
+        --color-secondary-1-1: #BE9A8D;
+        --color-secondary-1-2: #926E61;
+        --color-secondary-1-3: #532F21;
+        --color-secondary-1-4: #3E1B0E;
+
+        --color-secondary-2-0: #273F34;
+        --color-secondary-2-1: #618374;
+        --color-secondary-2-2: #436556;
+        --color-secondary-2-3: #17392A;
+        --color-secondary-2-4: #0A2B1C;
+
+        --color-complement-0: #5C5238;
+        --color-complement-1: #BEB18D;
+        --color-complement-2: #928561;
+        --color-complement-3: #534621;
+        --color-complement-4: #3E310E;
       }
 
       /* margin */