Merge remote-tracking branch 'origin/main' into heroku-app

app/__init__.py

@@ -14,7 +14,7 @@ app.default_key_set = generate_user_keys()
 app.no_cookie_ips = []
 app.config['SECRET_KEY'] = os.urandom(32)
 app.config['SESSION_TYPE'] = 'filesystem'
-app.config['VERSION_NUMBER'] = '0.3.1'
+app.config['VERSION_NUMBER'] = '0.3.2'
 app.config['APP_ROOT'] = os.getenv(
     'APP_ROOT',
     os.path.dirname(os.path.abspath(__file__)))

app/request.py

@@ -210,6 +210,12 @@ class Request:
             'User-Agent': self.modified_user_agent
         }
 
+        # FIXME: Should investigate this further to ensure the consent
+        # view is suppressed correctly
+        cookies = {
+            'CONSENT': 'PENDING+999'
+        }
+
         # Validate Tor conn and request new identity if the last one failed
         if self.tor and not send_tor_signal(
                 Signal.NEWNYM if attempt > 0 else Signal.HEARTBEAT):
@@ -233,7 +239,8 @@ class Request:
         response = requests.get(
             base_url + query,
             proxies=self.proxies,
-            headers=headers)
+            headers=headers,
+            cookies=cookies)
 
         # Retry query with new identity if using Tor (max 10 attempts)
         if 'form id="captcha-form"' in response.text and self.tor:

setup.py

@@ -8,7 +8,7 @@ setuptools.setup(
     author='Ben Busby',
     author_email='benbusby@protonmail.com',
     name='whoogle-search',
-    version='0.3.1',
+    version='0.3.2',
     include_package_data=True,
     install_requires=requirements,
     description='Self-hosted, ad-free, privacy-respecting metasearch engine',