Merge branch 'main' into main

README.md

@@ -178,7 +178,7 @@ ___
   - macOS: `brew install openssl curl-openssl`
   - Ubuntu: `sudo apt-get install -y libcurl4-openssl-dev libssl-dev`
   - Arch: `pacman -S curl openssl`
-  
+
 #### Install
 
 Clone the repo and run the following commands to start the app in a local-only environment:
@@ -628,6 +628,7 @@ A lot of the app currently piggybacks on Google's existing support for fetching
 | [https://www.indexia.gq](https://www.indexia.gq) | 🇨🇦 CA | Multi-choice | ✅ |
 | [https://whoogle.hostux.net](https://whoogle.hostux.net) | 🇫🇷 FR | Multi-choice | |
 | [https://whoogle.lunar.icu](https://whoogle.lunar.icu) | 🇩🇪 DE | Multi-choice | ✅ |
+| [https://whoogle.rhyshl.live](https://whoogle.rhyshl.live) | 🇬🇧 GB | Multi-choice | ✅ |
 
 * A checkmark in the "Cloudflare" category here refers to the use of the reverse proxy, [Cloudflare](https://cloudflare.com). The checkmark will not be listed for a site which uses Cloudflare DNS but rather the proxying service which grants Cloudflare the ability to monitor traffic to the website.
 

app/static/settings/translations.json

@@ -223,6 +223,62 @@
         "qdr:y": "Año pasado",
         "config-time-period": "Periodo de tiempo"
     },
+    "lang_id": {
+        "": "--",
+        "search": "Telusuri",
+        "config": "Konfigurasi",
+        "config-country": "Negara",
+        "config-lang": "Bahasa Antarmuka",
+        "config-lang-search": "Bahasa Penelusuran",
+        "config-near": "Dekat",
+        "config-near-help": "Nama Kota",
+        "config-block": "Blokir",
+        "config-block-help": "Daftar situs yang dipisahkan dengan koma",
+        "config-block-title": "Blokir berdasarkan Judul",
+        "config-block-title-help": "Gunakan regex",
+        "config-block-url": "Blokir berdasarkan URL",
+        "config-block-url-help": "Gunakan regex",
+        "config-theme": "Tema",
+        "config-nojs": "Hapus Javascript dalam Tampilan Anonim",
+        "config-anon-view": "Tampilkan Tautan Tampilan Anonim",
+        "config-dark": "Mode Gelap",
+        "config-safe": "Pencarian Aman",
+        "config-alts": "Ganti Tautan Media Sosial",
+        "config-alts-help": "Mengganti tautan Twitter/YouTube/Instagram/dll dengan alternatif yang lebih menjaga privasi.",
+        "config-new-tab": "Buka Tautan dalam Tab Baru",
+        "config-images": "Pencarian Gambar Ukuran Penuh",
+        "config-images-help": "(Eksperimental) Menambahkan opsi 'Lihat Gambar' ke pencarian gambar desktop. Ini akan menyebabkan resolusi thumbnail hasil gambar menjadi lebih rendah.",
+        "config-tor": "Gunakan Tor",
+        "config-get-only": "Hanya Gunakan GET",
+        "config-url": "URL Dasar",
+        "config-pref-url": "URL Preferensi",
+        "config-pref-encryption": "Enkripsi Preferensi",
+        "config-pref-help": "Memerlukan WHOOGLE_CONFIG_PREFERENCES_KEY, jika tidak akan diabaikan.",
+        "config-css": "CSS Kustom",
+        "config-time-period": "Periode Waktu",
+        "load": "Muat",
+        "apply": "Terapkan",
+        "save-as": "Simpan Sebagai...",
+        "github-link": "Lihat di GitHub",
+        "translate": "terjemahkan",
+        "light": "terang",
+        "dark": "gelap",
+        "system": "sistem",
+        "ratelimit": "Instansi telah ratelimited",
+        "continue-search": "Lanjutkan penelusuran Anda dengan Farside",
+        "all": "Semua",
+        "images": "Gambar",
+        "maps": "Peta",
+        "videos": "Video",
+        "news": "Berita",
+        "books": "Buku",
+        "anon-view": "Tampilan Anonim",
+        "qdr:h": "1 jam yang lalu",
+        "qdr:d": "24 jam yang lalu",
+        "qdr:w": "1 minggu yang lalu",
+        "qdr:m": "1 bulan yang lalu",
+        "qdr:y": "1 tahun yang lalu"
+    },
     "lang_it": {
         "search": "Cerca",
         "config": "Impostazioni",
@@ -1173,5 +1229,61 @@
         "qdr:w": "Keçən həftə",
         "qdr:m": "Keçən ay",
         "qdr:y": "Keçən il"
+    },
+    "lang_el": {
+        "": "--",
+        "search": "Αναζήτηση",
+        "config": "Ρυθμήσεις",
+        "config-country": "Χώρα",
+        "config-lang": "Γλώσσα Περιβάλλοντος",
+        "config-lang-search": "Γλώσσα Αναζήτησης",
+        "config-near": "Κοντά",
+        "config-near-help": "Όνομα Πόλης",
+        "config-block": "Block",
+        "config-block-help": "Comma-separated site list",
+        "config-block-title": "Block by Title",
+        "config-block-title-help": "Use regex",
+        "config-block-url": "Block by URL",
+        "config-block-url-help": "Use regex",
+        "config-theme": "Θέμα",
+        "config-nojs": "Αφαίρεση Javascript σε ανώνυμη προβολή",
+        "config-anon-view": "Show Anonymous View Links",
+        "config-dark": "Dark Mode",
+        "config-safe": "Ασφαλής Αναζήτηση",
+        "config-alts": "Replace Social Media Links",
+        "config-alts-help": "Replaces Twitter/YouTube/Instagram/etc links with privacy respecting alternatives.",
+        "config-new-tab": "Άνοιγμα συνδέσμου σε νέα καρτέλα",
+        "config-images": "Full Size Image Search",
+        "config-images-help": "(Experimental) Adds the 'View Image' option to desktop image searches. This will cause image result thumbnails to be lower resolution.",
+        "config-tor": "Χρήση Tor",
+        "config-get-only": "GET Requests Only",
+        "config-url": "Root URL",
+        "config-pref-url": "Preferences URL",
+        "config-pref-encryption": "Encrypt Preferences",
+        "config-pref-help": "Requires WHOOGLE_CONFIG_PREFERENCES_KEY, otherwise this will be ignored.",
+        "config-css": "Custom CSS",
+        "config-time-period": "Time Period",
+        "load": "Load",
+        "apply": "Apply",
+        "save-as": "Save As...",
+        "github-link": "View on GitHub",
+        "translate": "translate",
+        "light": "light",
+        "dark": "dark",
+        "system": "system",
+        "ratelimit": "Instance has been ratelimited",
+        "continue-search": "Continue your search with Farside",
+        "all": "All",
+        "images": "Images",
+        "maps": "Maps",
+        "videos": "Videos",
+        "news": "News",
+        "books": "Books",
+        "anon-view": "Ανώνυμη Προβολή",
+        "qdr:h": "Τελευταία ώρα",
+        "qdr:d": "Τελευταίες 24 ώρες",
+        "qdr:w": "Τελευταία Βδομάδα",
+        "qdr:m": "Τελευταίος Μήνας",
+        "qdr:y": "Τελευταίος Χρόνος"
     }
 }

app/utils/misc.py

@@ -2,6 +2,7 @@ from bs4 import BeautifulSoup as bsoup
 from flask import Request
 import hashlib
 import os
+import re
 from requests import exceptions, get
 from urllib.parse import urlparse
 
@@ -40,8 +41,16 @@ def get_request_url(url: str) -> str:
 def get_proxy_host_url(r: Request, default: str, root=False) -> str:
     scheme = r.headers.get('X-Forwarded-Proto', 'https')
     http_host = r.headers.get('X-Forwarded-Host')
+
+    full_path = r.full_path if not root else ''
+    if full_path.startswith('/'):
+        full_path = f'/{full_path}'
+
     if http_host:
-        return f'{scheme}://{http_host}{r.full_path if not root else "/"}'
+        prefix = os.environ.get('WHOOGLE_URL_PREFIX', '')
+        if prefix:
+            prefix = f'/{re.sub("[^0-9a-zA-Z]+", "", prefix)}'
+        return f'{scheme}://{http_host}{prefix}{full_path}'
 
     return default
 

misc/instances.txt

@@ -6,6 +6,7 @@ https://search.sethforprivacy.com
 https://whoogle.dcs0.hu
 https://whoogle.esmailelbob.xyz
 https://whoogle.lunar.icu
+https://whoogle.rhyshl.live
 https://gowogle.voring.me
 https://whoogle.privacydev.net
 https://whoogle.hostux.net