diff --git a/README.rst b/README.rst index 82e647fc..dc579a42 100644 --- a/README.rst +++ b/README.rst @@ -85,8 +85,8 @@ of turning it off. What is the difference between searx and SearxNG? ################################################# -TL;DR: If you want to run a public instance, go with SearxNG. If you want to -self host your own instance, choose searx. +TL;DR: SearXNG is for users that want more features and bugs getting fixed quicker. +If you prefer a minimalist software and stable experience, use searx. SearxNG is a fork of searx, created by a former maintainer of searx. The fork was created because the majority of the maintainers at the time did not find diff --git a/manage b/manage index af264cdf..6d98e220 100755 --- a/manage +++ b/manage @@ -284,9 +284,6 @@ node.env() { which npm &> /dev/null || die 1 'node.env - npm is not found!' ( set -e - # shellcheck disable=SC2030 - PATH="$(npm bin):$PATH" - export PATH build_msg INSTALL "npm install $NPM_PACKAGES" # shellcheck disable=SC2086 diff --git a/searx/engines/bing.py b/searx/engines/bing.py index 7d9d8549..46512a56 100644 --- a/searx/engines/bing.py +++ b/searx/engines/bing.py @@ -52,8 +52,7 @@ def request(query, params): offset=offset) params['url'] = base_url + search_path - params['headers']['User-Agent'] = ('Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 ' - '(KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36') + params['headers']['Accept'] = 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8' return params diff --git a/searx/engines/google.py b/searx/engines/google.py index 8d80f297..457365ef 100644 --- a/searx/engines/google.py +++ b/searx/engines/google.py @@ -112,7 +112,7 @@ filter_mapping = { results_xpath = '//div[contains(@class, "MjjYud")]' title_xpath = './/h3[1]' href_xpath = './/a/@href' -content_xpath = './/div[@data-content-feature=1]' +content_xpath = './/div[@data-sncf]' results_xpath_mobile_ui = '//div[contains(@class, "g ")]' # google *sections* are no usual *results*, we ignore them diff --git a/searx/settings.yml b/searx/settings.yml index 4540377b..c1971902 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -1291,7 +1291,7 @@ engines: - name : wiby engine : json_engine paging : True - search_url : https://wiby.me/json/?q={query}&o={pageno}0 + search_url : https://wiby.me/json/?q={query}&p={pageno} url_query : URL title_query : Title content_query : Snippet