diff --git a/Dockerfile b/Dockerfile
index cbfb305..cec9f54 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,18 +47,18 @@ ENV HTTPS_ONLY=$use_https
ARG whoogle_port=5000
ENV EXPOSE_PORT=$whoogle_port
-ARG twitter_alt='farside.link/nitter'
+ARG twitter_alt='nitter.net'
ENV WHOOGLE_ALT_TW=$twitter_alt
-ARG youtube_alt='farside.link/invidious'
+ARG youtube_alt='invidious.snopyta.org'
ENV WHOOGLE_ALT_YT=$youtube_alt
-ARG instagram_alt='farside.link/bibliogram'
+ARG instagram_alt='bibliogram.art/u'
ENV WHOOGLE_ALT_IG=$instagram_alt
-ARG reddit_alt='farside.link/libreddit'
+ARG reddit_alt='libredd.it'
ENV WHOOGLE_ALT_RD=$reddit_alt
-ARG medium_alt='farside.link/scribe'
-ENV WHOOGLE_ALT_MD=$medium_alt
ARG translate_alt='lingva.ml'
ENV WHOOGLE_ALT_TL=$translate_alt
+ARG medium_alt='scribe.rip'
+ENV WHOOGLE_ALT_MD=$medium_alt
WORKDIR /whoogle
diff --git a/README.md b/README.md
index c7b09d9..128b639 100644
--- a/README.md
+++ b/README.md
@@ -197,12 +197,12 @@ Description=Whoogle
# Site alternative configurations, uncomment to enable
# Note: If not set, the feature will still be available
# with default values.
-#Environment=WHOOGLE_ALT_TW=farside.link/nitter
-#Environment=WHOOGLE_ALT_YT=farside.link/invidious
-#Environment=WHOOGLE_ALT_IG=farside.link/bibliogram/u
-#Environment=WHOOGLE_ALT_RD=farside.link/libreddit
-#Environment=WHOOGLE_ALT_MD=farside.link/scribe
+#Environment=WHOOGLE_ALT_TW=nitter.net
+#Environment=WHOOGLE_ALT_YT=invidious.snopyta.org
+#Environment=WHOOGLE_ALT_IG=bibliogram.art/u
+#Environment=WHOOGLE_ALT_RD=libredd.it
#Environment=WHOOGLE_ALT_TL=lingva.ml
+#Environment=WHOOGLE_ALT_MD=scribe.rip
# Load values from dotenv only
#Environment=WHOOGLE_DOTENV=1
Type=simple
diff --git a/app.json b/app.json
index c67d7b7..c3d2dc3 100644
--- a/app.json
+++ b/app.json
@@ -47,27 +47,22 @@
},
"WHOOGLE_ALT_TW": {
"description": "The site to use as a replacement for twitter.com when site alternatives are enabled in the config.",
- "value": "farside.link/nitter",
+ "value": "nitter.net",
"required": false
},
"WHOOGLE_ALT_YT": {
"description": "The site to use as a replacement for youtube.com when site alternatives are enabled in the config.",
- "value": "farside.link/invidious",
+ "value": "invidious.snopyta.org",
"required": false
},
"WHOOGLE_ALT_IG": {
"description": "The site to use as a replacement for instagram.com when site alternatives are enabled in the config.",
- "value": "farside.link/bibliogram/u",
+ "value": "bibliogram.art/u",
"required": false
},
"WHOOGLE_ALT_RD": {
"description": "The site to use as a replacement for reddit.com when site alternatives are enabled in the config.",
- "value": "farside.link/libreddit",
- "required": false
- },
- "WHOOGLE_ALT_MD": {
- "description": "The site to use as a replacement for medium.com when site alternatives are enabled in the config.",
- "value": "farside.link/scribe",
+ "value": "libredd.it",
"required": false
},
"WHOOGLE_ALT_TL": {
@@ -75,6 +70,11 @@
"value": "lingva.ml",
"required": false
},
+ "WHOOGLE_ALT_MD": {
+ "description": "The site to use as a replacement for medium.com when site alternatives are enabled in the config.",
+ "value": "scribe.rip",
+ "required": false
+ },
"WHOOGLE_MINIMAL": {
"description": "Remove everything except basic result cards from all search queries (set to 1 or leave blank)",
"value": "",
diff --git a/app/models/config.py b/app/models/config.py
index 5595002..2419fe0 100644
--- a/app/models/config.py
+++ b/app/models/config.py
@@ -17,7 +17,7 @@ class Config:
self.block = os.getenv('WHOOGLE_CONFIG_BLOCK', '')
self.block_title = os.getenv('WHOOGLE_CONFIG_BLOCK_TITLE', '')
self.block_url = os.getenv('WHOOGLE_CONFIG_BLOCK_URL', '')
- self.country = os.getenv('WHOOGLE_CONFIG_COUNTRY', 'US')
+ self.ctry = os.getenv('WHOOGLE_CONFIG_COUNTRY', 'US')
self.theme = os.getenv('WHOOGLE_CONFIG_THEME', 'system')
self.safe = read_config_bool('WHOOGLE_CONFIG_SAFE')
self.dark = read_config_bool('WHOOGLE_CONFIG_DARK') # deprecated
@@ -33,13 +33,9 @@ class Config:
self.safe_keys = [
'lang_search',
'lang_interface',
- 'country',
- 'theme',
- 'alts',
- 'new_tab',
- 'view_image',
- 'block',
- 'safe'
+ 'ctry',
+ 'dark',
+ 'theme'
]
# Skip setting custom config if there isn't one
@@ -109,26 +105,5 @@ class Config:
for param_key in params.keys():
if not self.is_safe_key(param_key):
continue
- param_val = params.get(param_key)
-
- if param_val == 'off':
- param_val = False
- elif param_val.isdigit():
- param_val = int(param_val)
-
- self[param_key] = param_val
+ self[param_key] = params.get(param_key)
return self
-
- def to_params(self) -> str:
- """Generates a set of safe params for using in Whoogle URLs
-
- Returns:
- str -- a set of URL parameters
- """
- param_str = ''
- for safe_key in self.safe_keys:
- if not self[safe_key]:
- continue
- param_str = param_str + f'&{safe_key}={self[safe_key]}'
-
- return param_str
diff --git a/app/request.py b/app/request.py
index 9850a1b..c1d3902 100644
--- a/app/request.py
+++ b/app/request.py
@@ -120,7 +120,7 @@ def gen_query(query, args, config) -> str:
if 'chips' in args:
param_dict['chips'] = '&chips=' + args.get('chips')
- param_dict['gl'] = ('&gl=' + config.country) if config.country else ''
+ param_dict['gl'] = ('&gl=' + config.ctry) if config.ctry else ''
param_dict['hl'] = '&hl=' + (
config.lang_interface.replace('lang_', '')
if config.lang_interface else ''
diff --git a/app/routes.py b/app/routes.py
index 65f4113..bb15295 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -310,16 +310,7 @@ def search():
translate_to = localization_lang.replace('lang_', '')
# Return 503 if temporarily blocked by captcha
- if has_captcha(str(response)):
- return render_template(
- 'error.html',
- blocked=True,
- error_message=translation['ratelimit'],
- translation=translation,
- farside='https://farside.link',
- config=g.user_config,
- query=urlparse.unquote(query),
- params=g.user_config.to_params()), 503
+ resp_code = 503 if has_captcha(str(response)) else 200
response = bold_search_terms(response, query)
# Feature to display IP address
@@ -360,7 +351,7 @@ def search():
search_type=search_util.search_type,
mobile=g.user_request.mobile)
if 'isch' not in
- search_util.search_type else '')), 200
+ search_util.search_type else '')), resp_code
@app.route(f'/{Endpoint.config}', methods=['GET', 'POST', 'PUT'])
diff --git a/app/static/css/dark-theme.css b/app/static/css/dark-theme.css
index 38df90a..c30b151 100644
--- a/app/static/css/dark-theme.css
+++ b/app/static/css/dark-theme.css
@@ -138,14 +138,10 @@ select {
color: var(--whoogle-dark-contrast-text) !important;
}
-.link {
+#gh-link {
color: var(--whoogle-dark-contrast-text);
}
-.link-color {
- color: var(--whoogle-dark-result-url) !important;
-}
-
.autocomplete-items {
border: 1px solid var(--whoogle-dark-element-bg);
}
diff --git a/app/static/css/error.css b/app/static/css/error.css
deleted file mode 100644
index faea591..0000000
--- a/app/static/css/error.css
+++ /dev/null
@@ -1,9 +0,0 @@
-html {
- font-size: 1.3rem;
-}
-
-@media (max-width: 1000px) {
- html {
- font-size: 3rem;
- }
-}
diff --git a/app/static/css/light-theme.css b/app/static/css/light-theme.css
index 2562555..bc17952 100644
--- a/app/static/css/light-theme.css
+++ b/app/static/css/light-theme.css
@@ -125,14 +125,10 @@ input {
color: var(--whoogle-contrast-text);
}
-.link {
+#gh-link {
color: var(--whoogle-element-bg);
}
-.link-color {
- color: var(--whoogle-result-url) !important;
-}
-
.autocomplete-items {
border: 1px solid var(--whoogle-element-bg);
}
diff --git a/app/static/css/main.css b/app/static/css/main.css
index e84133a..6e60535 100644
--- a/app/static/css/main.css
+++ b/app/static/css/main.css
@@ -177,10 +177,3 @@ details summary {
padding: 10px;
font-weight: bold;
}
-
-/* Mobile styles */
-@media (max-width: 1000px) {
- select {
- width: 100%;
- }
-}
diff --git a/app/static/settings/translations.json b/app/static/settings/translations.json
index 6515af5..eb62744 100644
--- a/app/static/settings/translations.json
+++ b/app/static/settings/translations.json
@@ -33,9 +33,7 @@
"translate": "translate",
"light": "light",
"dark": "dark",
- "system": "system",
- "ratelimit": "Instance has been ratelimited",
- "continue-search": "Continue your search with "
+ "system": "system"
},
"lang_nl": {
"search": "Zoeken",
@@ -71,9 +69,7 @@
"translate": "vertalen",
"light": "helder",
"dark": "donker",
- "system": "systeeminstellingen",
- "ratelimit": "Instantie is beperkt in snelheid",
- "continue-search": "Ga verder met zoeken met "
+ "system": "systeeminstellingen"
},
"lang_de": {
"search": "Suchen",
@@ -109,9 +105,7 @@
"translate": "Übersetzen",
"light": "hell",
"dark": "dunkel",
- "system": "Systemeinstellung",
- "ratelimit": "Instanz wurde ratenbegrenzt",
- "continue-search": "Setzen Sie Ihre Suche fort mit "
+ "system": "Systemeinstellung"
},
"lang_es": {
"search": "Buscar",
@@ -147,9 +141,7 @@
"translate": "traducir",
"light": "brillante",
"dark": "oscuro",
- "system": "configuración del sistema",
- "ratelimit": "La instancia ha sido ratelimited",
- "continue-search": "Continúe su búsqueda con "
+ "system": "configuración del sistema"
},
"lang_it": {
"search": "Cerca",
@@ -185,9 +177,7 @@
"translate": "tradurre",
"light": "luminoso",
"dark": "notte",
- "system": "impostazioni di sistema",
- "ratelimit": "L'istanza è stata limitata alla velocità",
- "continue-search": "Continua la tua ricerca con "
+ "system": "impostazioni di sistema"
},
"lang_pt": {
"search": "Pesquisar",
@@ -223,9 +213,7 @@
"translate": "traduzir",
"light": "brilhante",
"dark": "escuro",
- "system": "configuração de sistema",
- "ratelimit": "A instância foi limitada pela taxa",
- "continue-search": "Continue sua pesquisa com "
+ "system": "configuração de sistema"
},
"lang_ru": {
"search": "Поиск",
@@ -261,9 +249,7 @@
"translate": "перевести",
"light": "светлое",
"dark": "темное",
- "system": "системное",
- "ratelimit": "Число экземпляров ограничено",
- "continue-search": "Продолжайте поиск с "
+ "system": "системное"
},
"lang_zh-CN": {
"search": "搜索",
@@ -299,9 +285,7 @@
"translate": "翻译",
"light": "明亮的",
"dark": "黑暗的",
- "system": "系统设置",
- "ratelimit": "实例已被限速",
- "continue-search": "继续搜索 "
+ "system": "系统设置"
},
"lang_si": {
"search": "සොයන්න",
@@ -337,9 +321,7 @@
"translate": "පරිවර්තනය කරන්න",
"light": "දීප්තිමත්",
"dark": "අඳුරු",
- "system": "පද්ධතිය",
- "ratelimit": "උදාහරණය අනුපාත කර ඇත",
- "continue-search": "සමඟ ඔබේ සෙවීම දිගටම කරගෙන යන්න"
+ "system": "පද්ධතිය"
},
"lang_fr": {
"search": "Chercher",
@@ -375,9 +357,7 @@
"translate": "Traduire",
"light": "clair",
"dark": "sombre",
- "system": "système",
- "ratelimit": "Le débit de l'instance a été limité",
- "continue-search": "Continuez votre recherche avec "
+ "system": "système"
},
"lang_fa": {
"search": "جستجو",
@@ -413,9 +393,7 @@
"translate": "ترجمه",
"light": "روشن",
"dark": "تیره",
- "system": "سیستم",
- "ratelimit": "نمونه با نرخ محدود شده است",
- "continue-search": "جستجوی خود را با "
+ "system": "سیستم"
},
"lang_cs": {
"search": "Hledat",
@@ -451,9 +429,7 @@
"translate": "Přeložit",
"light": "Světlý",
"dark": "Tmavý",
- "system": "Systémový",
- "ratelimit": "Instance byla omezena sazbou",
- "continue-search": "Pokračujte ve vyhledávání pomocí "
+ "system": "Systémový"
},
"lang_zh-TW": {
"search": "搜尋",
@@ -489,9 +465,7 @@
"translate": "翻譯",
"light": "明亮的",
"dark": "黑暗的",
- "system": "依系統",
- "ratelimit": "實例已被限速",
- "continue-search": "繼續搜索 "
+ "system": "依系統"
},
"lang_bg": {
"search": "Търсене",
@@ -527,9 +501,7 @@
"translate": "превод",
"light": "светла",
"dark": "тъмна",
- "system": "системна",
- "ratelimit": "Екземплярът е с ограничена скорост",
- "continue-search": "Продължете търсенето си с "
+ "system": "системна"
},
"lang_hi": {
"search": "खोज",
@@ -565,11 +537,9 @@
"translate": "अनुवाद करना",
"light": "रोशनी",
"dark": "अंधेरा",
- "system": "प्रणाली",
- "ratelimit": "इंस्टेंस को सीमित कर दिया गया है",
- "continue-search": "के साथ अपनी खोज जारी रखें "
+ "system": "प्रणाली"
},
- "lang_ja": {
+ "lang_ja": {
"search": "検索",
"config": "設定",
"config-country": "国を設定する",
@@ -603,8 +573,6 @@
"translate": "翻訳",
"light": "ライト",
"dark": "ダーク",
- "system": "自動",
- "ratelimit": "インスタンスはレート制限されています",
- "continue-search": "で検索を続ける "
- }
+ "system": "自動"
+ }
}
diff --git a/app/templates/error.html b/app/templates/error.html
index 687327f..efa3f79 100644
--- a/app/templates/error.html
+++ b/app/templates/error.html
@@ -1,40 +1,6 @@
-{% if config.theme %}
- {% if config.theme == 'system' %}
-
- {% else %}
-
- {% endif %}
-{% else %}
-
-{% endif %}
-
-
-
-
+Error
+
+
+ Error: "{{ error_message|safe }}"
+
+Return Home
diff --git a/app/templates/footer.html b/app/templates/footer.html
index ed66e42..f018318 100644
--- a/app/templates/footer.html
+++ b/app/templates/footer.html
@@ -1,9 +1,9 @@
+
\ No newline at end of file
diff --git a/app/templates/index.html b/app/templates/index.html
index 785b5a5..a71ea2e 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -86,15 +86,15 @@