Use farside.link for frontend alternatives in results (#560)
* Integrate Farside into Whoogle When instances are ratelimited (when a captcha is returned instead of the user's search results) the user can now hop to a new instance via Farside, a new backend service that redirects users to working instances of a particular frontend. In this case, it presents a user with a Farside link to a new Whoogle (or Searx) instance instead, so that the user can resume their search. For the generated Farside->Whoogle link, the generated link includes the user's current Whoogle configuration settings as URL params, to ensure a more seamless transition between instances. This doesn't translate to the Farside->Searx link, but potentially could with some changes. * Expand conversion of config<->url params Config settings can now be translated to and from URL params using a predetermined set of "safe" keys (i.e. config settings that easily translate to URL params). * Allow jumping instances via Farside when ratelimited When instances are ratelimited (when a captcha is returned instead of the user's search results) the user can now hop to a new instance via Farside, a new backend service that redirects users to working instances of a particular frontend. In this case, it presents a user with a Farside link to a new Whoogle (or Searx) instance instead, so that the user can resume their search. For the generated Farside->Whoogle link, the generated link includes the user's current Whoogle configuration settings as URL params, to ensure a more seamless transition between instances. This doesn't translate to the Farside->Searx link, but potentially could with some changes. Closes #554 Closes #559pull/570/head
Ben Busby
3 years ago
committed by
GitHub
parent
7bea6349a0
commit
634d179568
@ -0,0 +1,9 @@
|
|||||||
|
html {
|
||||||
|
font-size: 1.3rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 1000px) {
|
||||||
|
html {
|
||||||
|
font-size: 3rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,6 +1,40 @@
|
|||||||
<h1>Error</h1>
|
{% if config.theme %}
|
||||||
<hr>
|
{% if config.theme == 'system' %}
|
||||||
<p>
|
<style>
|
||||||
Error: "{{ error_message|safe }}"
|
@import "{{ cb_url('light-theme.css') }}" screen;
|
||||||
</p>
|
@import "{{ cb_url('dark-theme.css') }}" screen and (prefers-color-scheme: dark);
|
||||||
<a href="/">Return Home</a>
|
</style>
|
||||||
|
{% else %}
|
||||||
|
<link rel="stylesheet" href="{{ cb_url(config.theme + '-theme.css') }}"/>
|
||||||
|
{% endif %}
|
||||||
|
{% else %}
|
||||||
|
<link rel="stylesheet" href="{{ cb_url(('dark' if config.dark else 'light') + '-theme.css') }}"/>
|
||||||
|
{% endif %}
|
||||||
|
<link rel="stylesheet" href="{{ cb_url('main.css') }}">
|
||||||
|
<link rel="stylesheet" href="{{ cb_url('error.css') }}">
|
||||||
|
<style>{{ config.style }}</style>
|
||||||
|
<div>
|
||||||
|
<h1>Error</h1>
|
||||||
|
<p>
|
||||||
|
{{ error_message|safe }}
|
||||||
|
</p>
|
||||||
|
<hr>
|
||||||
|
<p>
|
||||||
|
{% if blocked is defined %}
|
||||||
|
<h4>{{ translation['continue-search'] }} <a class="link" href="https://github.com/benbusby/farside">Farside</a>!</h4>
|
||||||
|
Whoogle:
|
||||||
|
<br>
|
||||||
|
<a class="link-color" href="{{farside}}/whoogle/search?q={{query}}{{params}}">
|
||||||
|
{{farside}}/whoogle/search?q={{query}}{{params}}
|
||||||
|
</a>
|
||||||
|
<br><br>
|
||||||
|
Searx:
|
||||||
|
<br>
|
||||||
|
<a class="link-color" href="{{farside}}/searx/search?q={{query}}">
|
||||||
|
{{farside}}/searx/search?q={{query}}
|
||||||
|
</a>
|
||||||
|
<hr>
|
||||||
|
{% endif %}
|
||||||
|
</p>
|
||||||
|
<a class="link" href="home">Return Home</a>
|
||||||
|
</div>
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
<footer>
|
<footer>
|
||||||
<p class="footer">
|
<p class="footer">
|
||||||
Whoogle Search v{{ version_number }} ||
|
Whoogle Search v{{ version_number }} ||
|
||||||
<a id="gh-link" href="https://github.com/benbusby/whoogle-search">{{ translation['github-link'] }}</a>
|
<a class="link" href="https://github.com/benbusby/whoogle-search">{{ translation['github-link'] }}</a>
|
||||||
{% if newest_version %}
|
{% if newest_version %}
|
||||||
|| <span class="update_available">Update Available 🟢</span>
|
|| <span class="update_available">Update Available 🟢</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</p>
|
</p>
|
||||||
</footer>
|
</footer>
|
||||||
|
|||||||
Loading…
Reference in New Issue