From 9578cfaaac89d2e9c127d21074cfbe7d2599a73c Mon Sep 17 00:00:00 2001 From: Nivesh Krishna Date: Fri, 8 Apr 2022 01:58:40 +0530 Subject: [PATCH 1/7] fix opensearch with relevant content --- searx/templates/__common__/opensearch.xml | 2 +- searx/templates/__common__/opensearch_response_rss.xml | 2 +- searx/templates/etheme/results.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/searx/templates/__common__/opensearch.xml b/searx/templates/__common__/opensearch.xml index 230f327a5..9a3c008c6 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 + /e/ 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 82d3f7c4e..cc4a421b7 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 }} + /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/results.html b/searx/templates/etheme/results.html index ba7530446..5392e1f14 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 %}
-- GitLab From d71c02877d90a56d94f76c7c8a70ea447a381ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnau=20V=C3=A0zquez?= Date: Fri, 8 Apr 2022 07:39:00 +0000 Subject: [PATCH 2/7] Apply 1 suggestion(s) to 1 file(s) --- searx/templates/__common__/opensearch.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/templates/__common__/opensearch.xml b/searx/templates/__common__/opensearch.xml index 9a3c008c6..608a90642 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) }} - /e/ Spot + Spot {% if opensearch_method == 'get' %} {% else %} -- GitLab From 6eae1fa5f2b2a86ddc839c272bc07214ed1589e2 Mon Sep 17 00:00:00 2001 From: Nivesh Krishna Date: Fri, 8 Apr 2022 07:44:03 +0000 Subject: [PATCH 3/7] Apply 1 suggestion(s) to 1 file(s) --- searx/templates/__common__/opensearch_response_rss.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/templates/__common__/opensearch_response_rss.xml b/searx/templates/__common__/opensearch_response_rss.xml index cc4a421b7..1d3b615a5 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"> - /e/ Spot search: {{ q|e }} + Spot search: {{ q|e }} {{ url_for('search', _external=True) }}?q={{ q|e }} Search results for "{{ q|e }}" - searx {{ number_of_results }} -- GitLab From 7d51d3bd8c9b4182612adb5b94ef28dc8b6ae657 Mon Sep 17 00:00:00 2001 From: Nivesh Krishna Date: Fri, 8 Apr 2022 16:32:29 +0530 Subject: [PATCH 4/7] fix references to searx --- searx/settings.yml | 2 +- searx/templates/__common__/about.html | 59 ++++++++++----------------- searx/templates/etheme/base.html | 2 +- tests/unit/test_webapp.py | 2 +- 4 files changed, 24 insertions(+), 41 deletions(-) diff --git a/searx/settings.yml b/searx/settings.yml index b13544b02..ffe92640a 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 649e66163..fb04d418c 100644 --- a/searx/templates/__common__/about.html +++ b/searx/templates/__common__/about.html @@ -1,67 +1,66 @@ -

About searx

+

About Spot

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

-

More about searx...

+

More about spot...

-

Why use searx?

+

Why use Spot?

  • - Searx may not offer you as personalised results as Google, but it doesn't + Spot may not offer you as personalised results as Google, but it doesn't generate a profile about you.
  • - Searx doesn't care about what you search for, never shares anything with a + Spot doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you.
  • - Searx is free software, the code is 100% open and you can help to make it - better. See more on github. + Spot is free software, the code is 100% open and you can help to make it + better. See more on gitlab.

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 +70,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/etheme/base.html b/searx/templates/etheme/base.html index 339057b90..39a1b2601 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/tests/unit/test_webapp.py b/tests/unit/test_webapp.py index b6f56308d..83a926610 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'}) -- GitLab From 714bed845342610c7c176abc45d8164b6bd4cbca Mon Sep 17 00:00:00 2001 From: Nivesh Krishna Date: Fri, 8 Apr 2022 16:45:50 +0530 Subject: [PATCH 5/7] fix about page --- tests/unit/test_webapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/test_webapp.py b/tests/unit/test_webapp.py index 83a926610..2762cce20 100644 --- a/tests/unit/test_webapp.py +++ b/tests/unit/test_webapp.py @@ -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') -- GitLab From 76d3598137c622b893754b38ab79afcaa918e65c Mon Sep 17 00:00:00 2001 From: Nivesh Krishna Date: Mon, 11 Apr 2022 12:40:31 +0530 Subject: [PATCH 6/7] update about page --- searx/templates/__common__/about.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html index fb04d418c..48dd483ce 100644 --- a/searx/templates/__common__/about.html +++ b/searx/templates/__common__/about.html @@ -2,17 +2,18 @@

    About Spot

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

    More about spot...

    -- GitLab From 6a985047df7098460fb5e2e20c0d39691572cfde Mon Sep 17 00:00:00 2001 From: Nivesh Krishna Date: Mon, 11 Apr 2022 22:59:18 +0530 Subject: [PATCH 7/7] use only spot --- searx/templates/__common__/about.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html index 48dd483ce..122c15c7e 100644 --- a/searx/templates/__common__/about.html +++ b/searx/templates/__common__/about.html @@ -2,12 +2,12 @@

    About Spot

    - Spot is /e/'s fork of searx which 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 spot...

    +

    More about Spot...

    • Gitlab
      • @@ -37,21 +37,21 @@

      If you do care about privacy, want to be a conscious user, or otherwise - believe in digital freedom, make spot 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?

      - spot 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: spot uses the search bar to perform GET + browser users there is an exception: Spot uses the search bar to perform GET requests. Spot can be added to your browser's search bar; moreover, it can be set as @@ -76,7 +76,7 @@

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

      -- GitLab