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

.replit

@@ -1,2 +1,2 @@
 language = "python3"
-run = "pip install -r requirements.txt && ./run"
+run = "./run"

Dockerfile

@@ -69,7 +69,7 @@ COPY whoogle.env .
 
 EXPOSE $EXPOSE_PORT
 
-HEALTHCHECK  --interval=5m --timeout=5s \
+HEALTHCHECK  --interval=30s --timeout=5s \
   CMD wget --no-verbose --tries=1 http://localhost:${EXPOSE_PORT}/ || exit 1
 
 CMD misc/tor/start-tor.sh & ./run

README.md

@@ -68,6 +68,8 @@ Provides:
 ### B) [Repl.it](https://repl.it)
 [![Run on Repl.it](https://repl.it/badge/github/benbusby/whoogle-search)](https://repl.it/github/benbusby/whoogle-search)
 
+*Note: Requires a (free) Replit account*
+
 Provides:
 - Free deployment of app
 - Free HTTPS url (https://\<app name\>.\<username\>\.repl\.co)
@@ -363,7 +365,7 @@ A lot of the app currently piggybacks on Google's existing support for fetching
 - [https://whoogle.kavin.rocks](https://whoogle.kavin.rocks) or [http://whoogledq5f5wly5p4i2ohnvjwlihnlg4oajjum2oeddfwqdwupbuhqd.onion](http://whoogledq5f5wly5p4i2ohnvjwlihnlg4oajjum2oeddfwqdwupbuhqd.onion)
 - [https://search.garudalinux.org](https://search.garudalinux.org)
 - [https://whooglesearch.net/](https://whooglesearch.net/)
-
+- [https://search.whoogle.tech/](https://search.whoogle.tech/)
 ## Screenshots
 #### Desktop
 ![Whoogle Desktop](docs/screenshot_desktop.jpg)

app/__init__.py

@@ -21,7 +21,7 @@ app.default_key = generate_user_key()
 app.no_cookie_ips = []
 app.config['SECRET_KEY'] = os.urandom(32)
 app.config['SESSION_TYPE'] = 'filesystem'
-app.config['VERSION_NUMBER'] = '0.4.0'
+app.config['VERSION_NUMBER'] = '0.4.1'
 app.config['APP_ROOT'] = os.getenv(
     'APP_ROOT',
     os.path.dirname(os.path.abspath(__file__)))

app/request.py

@@ -49,14 +49,13 @@ def send_tor_signal(signal: Signal) -> bool:
 
 
 def gen_user_agent(is_mobile) -> str:
-    mozilla = random.choice(['Moo', 'Woah', 'Bro', 'Slow']) + 'zilla'
     firefox = random.choice(['Choir', 'Squier', 'Higher', 'Wire']) + 'fox'
     linux = random.choice(['Win', 'Sin', 'Gin', 'Fin', 'Kin']) + 'ux'
 
     if is_mobile:
-        return MOBILE_UA.format(mozilla, firefox)
+        return MOBILE_UA.format("Mozilla", firefox)
 
-    return DESKTOP_UA.format(mozilla, linux, firefox)
+    return DESKTOP_UA.format("Mozilla", linux, firefox)
 
 
 def gen_query(query, args, config, near_city=None) -> str:

setup.py

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