diff --git a/searx/settings.yml b/searx/settings.yml index b13544b020f149e39b2da3eebe2becda0119feab..ffe92640ae72384b4ba2839344b5c5033d877647 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -1,6 +1,6 @@ general: debug : False # Debug mode, only for development - instance_name : "/e/ spot" # displayed name + instance_name : "Spot" # displayed name contact_url: False # mailto:contact@example.com enable_stats: False # activate /stats page - note: it may leak usage data diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html index 649e66163bc50713807897f589c4fe220c1f8297..122c15c7ee48c38a489d8dea4ffe0b1b0519f323 100644 --- a/searx/templates/__common__/about.html +++ b/searx/templates/__common__/about.html @@ -1,67 +1,67 @@ -

About searx

+

About Spot

- Searx is a metasearch engine, + Spot is a fork of searx which is a metasearch engine, aggregating the results of other search engines while not storing information about its users.

-

More about searx...

+

More about Spot...

-

Why use searx?

+

Why use Spot?

If you do care about privacy, want to be a conscious user, or otherwise - believe in digital freedom, make searx your default search engine or run it + believe in digital freedom, make Spot your default search engine or run it on your own server

Technical details - How does it work?

- Searx is a metasearch engine, + Spot is a metasearch engine, inspired by the seeks project. It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except Chromium-based browsers*). Therefore they show up in neither our logs, nor your url history. In the case of Chromium-based - browser users there is an exception: searx uses the search bar to perform GET + browser users there is an exception: Spot uses the search bar to perform GET requests. - Searx can be added to your browser's search bar; moreover, it can be set as + Spot can be added to your browser's search bar; moreover, it can be set as the default search engine.

How to set as the default search engine?

- Searx supports OpenSearch. + Spot supports OpenSearch. For more information on changing your default search engine, see your browser's documentation:

@@ -71,32 +71,16 @@
  • Chromium-based browsers only add websites that the user navigates to without a path. -

    Where to find anonymous usage statistics of this instance ?

    - -

    - Stats page contains some useful data about the engines used. -

    How can I make it my own?

    - Searx appreciates your concern regarding logs, so take the - code from the original searx project and + Spot appreciates your concern regarding logs, so take the + code from the original Spot project and run it yourself!

    -

    - Add your searx instance to this list - of public searx instances to help other people reclaim their privacy and - make the Internet freer! The more decentralized the Internet is, the more - freedom we have! -

    - -

    Where are the docs & code of this instance?

    - -

    - See the {{ brand.DOCS_URL }} - and {{ brand.GIT_URL }} -

    + + {% include "__common__/aboutextend.html" ignore missing %} diff --git a/searx/templates/__common__/opensearch.xml b/searx/templates/__common__/opensearch.xml index 230f327a53fc1f71a97b6c1e65d386e07ae85af3..608a90642cbd14e48fa33bb10df84d25bea7b980 100644 --- a/searx/templates/__common__/opensearch.xml +++ b/searx/templates/__common__/opensearch.xml @@ -4,7 +4,7 @@ a privacy-respecting, hackable metasearch engine UTF-8 {{ url_for('static', filename='img/favicon.png', _external=True) }} - searx metasearch + Spot {% if opensearch_method == 'get' %} {% else %} diff --git a/searx/templates/__common__/opensearch_response_rss.xml b/searx/templates/__common__/opensearch_response_rss.xml index 82d3f7c4e156c2f24622aa930c1d16ba90094fa5..1d3b615a5b0e9b23c61f61c518de1029dd9e9b55 100644 --- a/searx/templates/__common__/opensearch_response_rss.xml +++ b/searx/templates/__common__/opensearch_response_rss.xml @@ -3,7 +3,7 @@ xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:atom="http://www.w3.org/2005/Atom"> - Searx search: {{ q|e }} + Spot search: {{ q|e }} {{ url_for('search', _external=True) }}?q={{ q|e }} Search results for "{{ q|e }}" - searx {{ number_of_results }} diff --git a/searx/templates/etheme/base.html b/searx/templates/etheme/base.html index 339057b901d750a06d473301921027656d17c58b..39a1b260142b2853bde2189867687724018f0d9d 100644 --- a/searx/templates/etheme/base.html +++ b/searx/templates/etheme/base.html @@ -94,7 +94,7 @@ {{ _('Powered by') }} Spot {{ version[1] }}
    An open-source metasearch engine forked from Searx {{ version[0] }}. - {{ _('About') }} + {{ _('About') }} {{ _('Privacy') }} diff --git a/searx/templates/etheme/results.html b/searx/templates/etheme/results.html index ba753044657217283056a0c36d707f8241d2af3d..5392e1f14fd66aa152128d9f2bfe6f0214cbccd3 100644 --- a/searx/templates/etheme/results.html +++ b/searx/templates/etheme/results.html @@ -4,7 +4,7 @@ {%- macro search_url() %}{{ base_url }}?q={{ q|urlencode }}{% if selected_categories %}&categories={{ selected_categories|join(",") | replace(' ','+') }}{% endif %}{% if pageno > 1 %}&pageno={{ pageno }}{% endif %}{% if time_range %}&time_range={{ time_range }}{% endif %}{% if current_language != 'all' %}&language={{ current_language }}{% endif %}{% endmacro -%} {% block title %}{{ q|e }} - {% endblock %} -{% block meta %}{% endblock %} +{% block meta %}{% endblock %} {% block content %}
    diff --git a/tests/unit/test_webapp.py b/tests/unit/test_webapp.py index b6f56308d746b771ef1cbd4af7ad9720e217b0d0..2762cce203ede95623192675b596d9041a54f87b 100644 --- a/tests/unit/test_webapp.py +++ b/tests/unit/test_webapp.py @@ -100,7 +100,7 @@ class ViewsTestCase(SearxTestCase): def test_search_empty_html(self): result = self.app.post('/search', data={'q': ''}) self.assertEqual(result.status_code, 200) - self.assertIn(b'/e/ spot', result.data) + self.assertIn(b'Spot', result.data) def test_search_empty_json(self): result = self.app.post('/search', data={'q': '', 'format': 'json'}) @@ -190,7 +190,7 @@ class ViewsTestCase(SearxTestCase): def test_about(self): result = self.app.get('/about') self.assertEqual(result.status_code, 200) - self.assertIn(b'

    About searx

    ', result.data) + self.assertIn(b'

    About Spot

    ', result.data) def test_health(self): result = self.app.get('/healthz')