[upd] pypi: Update docutils requirement from >=0.21.2 to >=0.23

Updates the requirements on [docutils](https://github.com/rtfd/recommonmark) to permit the latest version.
- [Changelog](https://github.com/readthedocs/recommonmark/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rtfd/recommonmark/commits)

---
updated-dependencies:
- dependency-name: docutils
  dependency-version: '0.23'
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

.dockerignore

@@ -1,6 +1,5 @@
 *
 
-!container/*.template.*
 !container/entrypoint.sh
 !searx/**
 !requirements*.txt

.github/workflows/container.yml

@@ -78,7 +78,7 @@ jobs:
           python-version: "${{ env.PYTHON_VERSION }}"
 
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
         with:
           persist-credentials: "false"
           fetch-depth: "0"
@@ -141,7 +141,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
         with:
           persist-credentials: "false"
 
@@ -175,7 +175,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
         with:
           persist-credentials: "false"
 

.github/workflows/data-update.yml

@@ -46,7 +46,7 @@ jobs:
           python-version: "${{ env.PYTHON_VERSION }}"
 
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
         with:
           persist-credentials: "false"
 

.github/workflows/documentation.yml

@@ -37,7 +37,7 @@ jobs:
           python-version: "${{ env.PYTHON_VERSION }}"
 
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
         with:
           persist-credentials: "false"
           fetch-depth: "0"

.github/workflows/integration.yml

@@ -39,7 +39,7 @@ jobs:
           python-version: "${{ matrix.python-version }}"
 
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
         with:
           persist-credentials: "false"
 
@@ -67,7 +67,7 @@ jobs:
           python-version: "${{ env.PYTHON_VERSION }}"
 
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
         with:
           persist-credentials: "false"
 

.github/workflows/l10n.yml

@@ -40,7 +40,7 @@ jobs:
           python-version: "${{ env.PYTHON_VERSION }}"
 
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
         with:
           token: "${{ secrets.WEBLATE_GITHUB_TOKEN }}"
           fetch-depth: "0"
@@ -88,7 +88,7 @@ jobs:
           python-version: "${{ env.PYTHON_VERSION }}"
 
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
         with:
           token: "${{ secrets.WEBLATE_GITHUB_TOKEN }}"
           fetch-depth: "0"

.github/workflows/security.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0  # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10  # v6.0.3
         with:
           persist-credentials: "false"
 

client/simple/package-lock.json

@@ -16,11 +16,11 @@
       },
       "devDependencies": {
         "@biomejs/biome": "2.5.0",
-        "@types/node": "^26.0.0",
+        "@types/node": "^25.9.3",
         "browserslist": "^4.28.2",
         "browserslist-to-esbuild": "^2.1.1",
         "edge.js": "^6.5.1",
-        "less": "^4.6.6",
+        "less": "^4.6.4",
         "mathjs": "^15.2.0",
         "sharp": "~0.35.1",
         "sort-package-json": "^4.0.0",
@@ -1570,13 +1570,13 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.0.0.tgz",
-      "integrity": "sha512-vf2YFi1iY9lHGwNJMs01biZFbKJkrZR1T6/MlzjhJLPdntOHLhTrDSnSVcdtvjihi4VQNlrFRIxLsDBlQpAipA==",
+      "version": "25.9.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.3.tgz",
+      "integrity": "sha512-603BddQMv3pUcr4U2dhujk83N2tTDVr/34wII2B6bJy6g+8WD6yUb11jszNs0gdi4PesVWl7ABt8nYMVpnLUcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~8.3.0"
+        "undici-types": ">=7.24.0 <7.24.7"
       }
     },
     "node_modules/@types/pluralize": {
@@ -2890,9 +2890,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/less": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/less/-/less-4.6.6.tgz",
-      "integrity": "sha512-ooPSwQGQ2sVe8Dh1jVsbKKsRR2gd8lFK72BDkeSzjnD1T5aIHL65hCMfO0GVmtriKgDKrQv6xp9UrihUsWuAzA==",
+      "version": "4.6.4",
+      "resolved": "https://registry.npmjs.org/less/-/less-4.6.4.tgz",
+      "integrity": "sha512-OJmO5+HxZLLw0RLzkqaNHzcgEAQG7C0y3aMbwtCzIUFZsLMNNq/1IdAdHEycQ58CwUO3jPTHmoN+tE5I7FQxNg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2909,7 +2909,7 @@
         "errno": "^0.1.1",
         "graceful-fs": "^4.1.2",
         "image-size": "~0.5.0",
-        "make-dir": "^5.1.0",
+        "make-dir": "^2.1.0",
         "mime": "^1.4.1",
         "needle": "^3.1.0",
         "source-map": "~0.6.0"
@@ -3191,17 +3191,18 @@
       "license": "MIT"
     },
     "node_modules/make-dir": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-5.1.0.tgz",
-      "integrity": "sha512-IfpFq6UM39dUNiphpA6uDezNx/AvWyhwfICWPR3t1VspkgkMZrL+Rk1RbN1bx+aeNYwOrqGJgEgV3yotk+ZUVw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "dev": true,
       "license": "MIT",
       "optional": true,
-      "engines": {
-        "node": ">=18"
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/mathjs": {
@@ -3490,6 +3491,17 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/pluralize": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
@@ -3849,6 +3861,17 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/sharp": {
       "version": "0.35.1",
       "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.35.1.tgz",
@@ -4492,9 +4515,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.3.0.tgz",
-      "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==",
+      "version": "7.24.6",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz",
+      "integrity": "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==",
       "dev": true,
       "license": "MIT"
     },

client/simple/package.json

@@ -30,11 +30,11 @@
   },
   "devDependencies": {
     "@biomejs/biome": "2.5.0",
-    "@types/node": "^26.0.0",
+    "@types/node": "^25.9.3",
     "browserslist": "^4.28.2",
     "browserslist-to-esbuild": "^2.1.1",
     "edge.js": "^6.5.1",
-    "less": "^4.6.6",
+    "less": "^4.6.4",
     "mathjs": "^15.2.0",
     "sharp": "~0.35.1",
     "sort-package-json": "^4.0.0",

client/simple/src/js/plugin/Calculator.ts

@@ -77,9 +77,9 @@ export default class Calculator extends Plugin {
 
   protected async run(): Promise<string | undefined> {
     const searchInput = getElement<HTMLInputElement>("q");
+    const node = Calculator.math.parse(searchInput.value);
 
     try {
-      const node = Calculator.math.parse(searchInput.value);
       return `${node.toString()} = ${node.evaluate()}`;
     } catch {
       // not a compatible math expression

container/builder.dockerfile

@@ -21,6 +21,8 @@ RUN --mount=type=cache,id=uv,target=/root/.cache/uv set -eux -o pipefail; \
 
 COPY --exclude=./searx/version_frozen.py ./searx/ ./searx/
 
+ARG TIMESTAMP_SETTINGS="0"
+
 RUN set -eux -o pipefail; \
     python -m compileall -q -f -j 0 --invalidation-mode=unchecked-hash ./searx/; \
     find ./searx/static/ -type f \
@@ -28,4 +30,5 @@ RUN set -eux -o pipefail; \
     -exec gzip -9 -k {} + \
     -exec brotli -9 -k {} + \
     -exec gzip --test {}.gz + \
-    -exec brotli --test {}.br +
+    -exec brotli --test {}.br +; \
+    touch -c --date="@$TIMESTAMP_SETTINGS" ./searx/settings.yml

container/entrypoint.sh

@@ -77,23 +77,43 @@ volume_handler() {
     setup_ownership "$target" "directory"
 }
 
-setup() {
-    local template_settings="/usr/local/searxng/settings.template.yml"
-    local target_settings="$__SEARXNG_CONFIG_PATH/settings.yml"
+# Handle configuration file updates
+config_handler() {
+    local target="$1"
+    local template="$2"
+    local new_template_target="$target.new"
 
-    if [ ! -f "$target_settings" ]; then
+    # Create/Update the configuration file
+    if [ -f "$target" ]; then
+        setup_ownership "$target" "file"
+
+        if [ "$template" -nt "$target" ]; then
+            cp -pfT "$template" "$new_template_target"
+
+            cat <<EOF
+...
+... INFORMATION
+... Update available for "$target"
+... It is recommended to update the configuration file to ensure proper functionality
+...
+... New version placed at "$new_template_target"
+... Please review and merge changes
+...
+EOF
+        fi
+    else
         cat <<EOF
 ...
 ... INFORMATION
-... "$target_settings" does not exist, creating from template...
+... "$target" does not exist, creating from template...
 ...
 EOF
-        cp -pfT "$template_settings" "$target_settings"
+        cp -pfT "$template" "$target"
 
-        sed -i "s/ultrasecretkey/$(head -c 24 /dev/urandom | base64 | tr -dc 'a-zA-Z0-9')/g" "$target_settings"
+        sed -i "s/ultrasecretkey/$(head -c 24 /dev/urandom | base64 | tr -dc 'a-zA-Z0-9')/g" "$target"
     fi
 
-    check_file "$target_settings"
+    check_file "$target"
 }
 
 cat <<EOF
@@ -104,7 +124,8 @@ EOF
 volume_handler "$__SEARXNG_CONFIG_PATH"
 volume_handler "$__SEARXNG_DATA_PATH"
 
-setup
+# Check for files
+config_handler "$__SEARXNG_SETTINGS_PATH" "/usr/local/searxng/searx/settings.yml"
 
 # root only features
 if [ "$(id -u)" -eq 0 ]; then

container/settings.template.yml

@@ -1,8 +0,0 @@
-# Read the documentation before extending the defaults:
-# https://docs.searxng.org/admin/settings/
-
-use_default_settings: true
-
-server:
-  secret_key: "ultrasecretkey"
-  image_proxy: true

docs/admin/settings/settings_search.rst

@@ -43,7 +43,6 @@
   - ``google``
   - ``mwmbl``
   - ``naver``
-  - ``privacywall``
   - ``quark``
   - ``qwant``
   - ``seznam``

docs/dev/engines/online/aol.rst

@@ -0,0 +1,8 @@
+.. _aol engine:
+
+===
+AOL
+===
+
+.. automodule:: searx.engines.aol
+   :members:

docs/dev/search_api.rst

@@ -87,7 +87,7 @@ Parameters
 
 ``autocomplete`` : default from :ref:`settings search`
   [ ``google``, ``dbpedia``, ``duckduckgo``, ``mwmbl``, ``startpage``,
-  ``privacywall``, ``wikipedia``, ``swisscows``, ``qwant`` ]
+  ``wikipedia``, ``swisscows``, ``qwant`` ]
 
   Service which completes words as you type.
 

docs/user/configured_engines.rst

@@ -58,8 +58,8 @@ Configured Engines
       {% for mod in engines %}
 
       * - `{{mod.name}} <{{mod.about and mod.about.website}}>`_
-          {%- if mod.language %}
-          ({{mod.language | upper}})
+          {%- if mod.about and  mod.about.language %}
+          ({{mod.about.language | upper}})
           {%- endif %}
         - ``!{{mod.shortcut}}``
         - {%- if 'searx.engines.' + mod.__name__ in documented_modules %}

requirements-dev.txt

@@ -2,16 +2,16 @@ mock==5.2.0
 nose2[coverage_plugin]==0.16.0
 cov-core==1.15.0
 black==25.9.0
-pylint==4.0.6
+pylint==4.0.5
 splinter==0.21.0
-selenium==4.45.0
+selenium==4.44.0
 Sphinx==8.2.3;python_version <= "3.11"
 Sphinx==9.1.0; python_version > "3.11"
 sphinx-issues==6.0.0
 sphinx-jinja==2.0.2
 sphinx-tabs==3.5.0
 furo==2025.12.19
-sphinxcontrib-programoutput==0.20
+sphinxcontrib-programoutput==0.19
 sphinx-autobuild==2025.8.25
 sphinx-notfound-page==1.1.0
 myst-parser==5.0.0
@@ -20,9 +20,9 @@ aiounittest==1.5.0
 yamllint==1.38.0
 wlc==2.0.0
 coloredlogs==15.0.1
-docutils>=0.21.2;python_version <= "3.11"
+docutils>=0.23;python_version <= "3.11"
 docutils>=0.22.4; python_version > "3.11"
 parameterized==0.9.0
 granian[reload]==2.7.6
-basedpyright==1.39.8
+basedpyright==1.39.7
 types-lxml==2026.2.16

requirements.txt

@@ -1,4 +1,4 @@
-certifi==2026.6.17
+certifi==2026.5.20
 babel==2.18.0
 flask-babel==4.0.0
 flask==3.1.3

searx/autocomplete.py

@@ -179,23 +179,6 @@ def naver(query: str, _sxng_locale: str) -> list[str]:
     return results
 
 
-def privacywall(query: str, sxng_locale: str) -> list[str]:
-    # Privacywall search autocompleter
-    country = None
-    if "-" in sxng_locale:
-        country = sxng_locale.split("-")[1]
-    args = {'q': query, 'cc': country}
-
-    url = f"https://www.privacywall.org/search/secure/suggestions.php?{urlencode(args)}"
-    response = get(url)
-
-    if not response.ok:
-        return []
-
-    data: list[list[str]] = response.json()
-    return data[1]
-
-
 def qihu360search(query: str, _sxng_locale: str) -> list[str]:
     # 360Search search autocompleter
     url = f"https://sug.so.360.cn/suggest?{urlencode({'format': 'json', 'word': query})}"
@@ -378,7 +361,6 @@ backends: dict[str, t.Callable[[str, str], list[str]]] = {
     'google': google_complete,
     'mwmbl': mwmbl,
     'naver': naver,
-    'privacywall': privacywall,
     'quark': quark,
     'qwant': qwant,
     'seznam': seznam,

searx/data/engine_traits.json

@@ -6634,255 +6634,6 @@
     },
     "regions": {}
   },
-  "privacywall": {
-    "all_locale": null,
-    "custom": {},
-    "data_type": "traits_v1",
-    "languages": {},
-    "regions": {
-      "bg-BG": "BG",
-      "cs-CZ": "CZ",
-      "da-DK": "DK",
-      "de-AT": "AT",
-      "de-BE": "BE",
-      "de-CH": "CH",
-      "de-DE": "DE",
-      "de-LI": "LI",
-      "de-LU": "LU",
-      "el-CY": "CY",
-      "el-GR": "GR",
-      "en-AU": "AU",
-      "en-CA": "CA",
-      "en-GB": "GB",
-      "en-HK": "HK",
-      "en-IE": "IE",
-      "en-IN": "IN",
-      "en-MT": "MT",
-      "en-NZ": "NZ",
-      "en-PH": "PH",
-      "en-SG": "SG",
-      "en-US": "US",
-      "es-AR": "AR",
-      "es-CL": "CL",
-      "es-CO": "CO",
-      "es-ES": "ES",
-      "es-MX": "MX",
-      "es-PE": "PE",
-      "es-VE": "VE",
-      "et-EE": "EE",
-      "fi-FI": "FI",
-      "fil-PH": "PH",
-      "fr-BE": "BE",
-      "fr-CA": "CA",
-      "fr-CH": "CH",
-      "fr-FR": "FR",
-      "fr-LU": "LU",
-      "ga-IE": "IE",
-      "gsw-CH": "CH",
-      "gsw-LI": "LI",
-      "hi-IN": "IN",
-      "hr-HR": "HR",
-      "hu-HU": "HU",
-      "id-ID": "ID",
-      "it-CH": "CH",
-      "it-IT": "IT",
-      "ja-JP": "JP",
-      "ko-KR": "KR",
-      "lb-LU": "LU",
-      "lt-LT": "LT",
-      "lv-LV": "LV",
-      "mi-NZ": "NZ",
-      "ms-MY": "MY",
-      "ms-SG": "SG",
-      "mt-MT": "MT",
-      "nb-NO": "NO",
-      "nl-BE": "BE",
-      "nl-NL": "NL",
-      "nn-NO": "NO",
-      "pl-PL": "PL",
-      "pt-BR": "BR",
-      "pt-PT": "PT",
-      "qu-PE": "PE",
-      "ro-RO": "RO",
-      "sk-SK": "SK",
-      "sl-SI": "SI",
-      "sv-FI": "FI",
-      "sv-SE": "SE",
-      "ta-SG": "SG",
-      "th-TH": "TH",
-      "tr-CY": "CY",
-      "vi-VN": "VN",
-      "zh-HK": "HK",
-      "zh-SG": "SG",
-      "zh-TW": "TW"
-    }
-  },
-  "privacywall images": {
-    "all_locale": null,
-    "custom": {},
-    "data_type": "traits_v1",
-    "languages": {},
-    "regions": {
-      "bg-BG": "BG",
-      "cs-CZ": "CZ",
-      "da-DK": "DK",
-      "de-AT": "AT",
-      "de-BE": "BE",
-      "de-CH": "CH",
-      "de-DE": "DE",
-      "de-LI": "LI",
-      "de-LU": "LU",
-      "el-CY": "CY",
-      "el-GR": "GR",
-      "en-AU": "AU",
-      "en-CA": "CA",
-      "en-GB": "GB",
-      "en-HK": "HK",
-      "en-IE": "IE",
-      "en-IN": "IN",
-      "en-MT": "MT",
-      "en-NZ": "NZ",
-      "en-PH": "PH",
-      "en-SG": "SG",
-      "en-US": "US",
-      "es-AR": "AR",
-      "es-CL": "CL",
-      "es-CO": "CO",
-      "es-ES": "ES",
-      "es-MX": "MX",
-      "es-PE": "PE",
-      "es-VE": "VE",
-      "et-EE": "EE",
-      "fi-FI": "FI",
-      "fil-PH": "PH",
-      "fr-BE": "BE",
-      "fr-CA": "CA",
-      "fr-CH": "CH",
-      "fr-FR": "FR",
-      "fr-LU": "LU",
-      "ga-IE": "IE",
-      "gsw-CH": "CH",
-      "gsw-LI": "LI",
-      "hi-IN": "IN",
-      "hr-HR": "HR",
-      "hu-HU": "HU",
-      "id-ID": "ID",
-      "it-CH": "CH",
-      "it-IT": "IT",
-      "ja-JP": "JP",
-      "ko-KR": "KR",
-      "lb-LU": "LU",
-      "lt-LT": "LT",
-      "lv-LV": "LV",
-      "mi-NZ": "NZ",
-      "ms-MY": "MY",
-      "ms-SG": "SG",
-      "mt-MT": "MT",
-      "nb-NO": "NO",
-      "nl-BE": "BE",
-      "nl-NL": "NL",
-      "nn-NO": "NO",
-      "pl-PL": "PL",
-      "pt-BR": "BR",
-      "pt-PT": "PT",
-      "qu-PE": "PE",
-      "ro-RO": "RO",
-      "sk-SK": "SK",
-      "sl-SI": "SI",
-      "sv-FI": "FI",
-      "sv-SE": "SE",
-      "ta-SG": "SG",
-      "th-TH": "TH",
-      "tr-CY": "CY",
-      "vi-VN": "VN",
-      "zh-HK": "HK",
-      "zh-SG": "SG",
-      "zh-TW": "TW"
-    }
-  },
-  "privacywall videos": {
-    "all_locale": null,
-    "custom": {},
-    "data_type": "traits_v1",
-    "languages": {},
-    "regions": {
-      "bg-BG": "BG",
-      "cs-CZ": "CZ",
-      "da-DK": "DK",
-      "de-AT": "AT",
-      "de-BE": "BE",
-      "de-CH": "CH",
-      "de-DE": "DE",
-      "de-LI": "LI",
-      "de-LU": "LU",
-      "el-CY": "CY",
-      "el-GR": "GR",
-      "en-AU": "AU",
-      "en-CA": "CA",
-      "en-GB": "GB",
-      "en-HK": "HK",
-      "en-IE": "IE",
-      "en-IN": "IN",
-      "en-MT": "MT",
-      "en-NZ": "NZ",
-      "en-PH": "PH",
-      "en-SG": "SG",
-      "en-US": "US",
-      "es-AR": "AR",
-      "es-CL": "CL",
-      "es-CO": "CO",
-      "es-ES": "ES",
-      "es-MX": "MX",
-      "es-PE": "PE",
-      "es-VE": "VE",
-      "et-EE": "EE",
-      "fi-FI": "FI",
-      "fil-PH": "PH",
-      "fr-BE": "BE",
-      "fr-CA": "CA",
-      "fr-CH": "CH",
-      "fr-FR": "FR",
-      "fr-LU": "LU",
-      "ga-IE": "IE",
-      "gsw-CH": "CH",
-      "gsw-LI": "LI",
-      "hi-IN": "IN",
-      "hr-HR": "HR",
-      "hu-HU": "HU",
-      "id-ID": "ID",
-      "it-CH": "CH",
-      "it-IT": "IT",
-      "ja-JP": "JP",
-      "ko-KR": "KR",
-      "lb-LU": "LU",
-      "lt-LT": "LT",
-      "lv-LV": "LV",
-      "mi-NZ": "NZ",
-      "ms-MY": "MY",
-      "ms-SG": "SG",
-      "mt-MT": "MT",
-      "nb-NO": "NO",
-      "nl-BE": "BE",
-      "nl-NL": "NL",
-      "nn-NO": "NO",
-      "pl-PL": "PL",
-      "pt-BR": "BR",
-      "pt-PT": "PT",
-      "qu-PE": "PE",
-      "ro-RO": "RO",
-      "sk-SK": "SK",
-      "sl-SI": "SI",
-      "sv-FI": "FI",
-      "sv-SE": "SE",
-      "ta-SG": "SG",
-      "th-TH": "TH",
-      "tr-CY": "CY",
-      "vi-VN": "VN",
-      "zh-HK": "HK",
-      "zh-SG": "SG",
-      "zh-TW": "TW"
-    }
-  },
   "qwant": {
     "all_locale": null,
     "custom": {},
@@ -7424,222 +7175,6 @@
     },
     "regions": {}
   },
-  "resulthunter": {
-    "all_locale": "all",
-    "custom": {
-      "ui_lang": {
-        "az": "az",
-        "bg": "bg",
-        "br": "br",
-        "ca": "ca",
-        "cs": "cs",
-        "cy": "cy",
-        "da": "da",
-        "de-DE": "de-de",
-        "el": "el",
-        "en-CA": "en-ca",
-        "en-GB": "en-gb",
-        "en-IN": "en-in",
-        "en-US": "en-us",
-        "es": "es",
-        "et": "et",
-        "eu": "eu",
-        "fi-FI": "fi-fi",
-        "fr-CA": "fr-ca",
-        "fr-FR": "fr-fr",
-        "gl": "gl",
-        "hr": "hr",
-        "hu": "hu",
-        "id": "id",
-        "it": "it",
-        "ja-JP": "ja-jp",
-        "ka": "ka",
-        "ko": "ko",
-        "lt": "lt",
-        "lv": "lv",
-        "ms": "ms",
-        "nb": "nb",
-        "nl": "nl",
-        "pl": "pl",
-        "pt-BR": "pt-br",
-        "ro": "ro",
-        "ru": "ru",
-        "sk": "sk",
-        "sl": "sl",
-        "sq-AL": "sq-al",
-        "sr": "sr",
-        "sr_Latn": "sr-latn",
-        "sv": "sv",
-        "sw-KE": "sw-ke",
-        "th": "th",
-        "tr": "tr",
-        "uk": "uk",
-        "vi": "vi",
-        "zh": "zh",
-        "zh-TW": "zh-tw"
-      }
-    },
-    "data_type": "traits_v1",
-    "languages": {},
-    "regions": {
-      "ar-SA": "sa",
-      "da-DK": "dk",
-      "de-AT": "at",
-      "de-BE": "be",
-      "de-CH": "ch",
-      "de-DE": "de",
-      "en-AU": "au",
-      "en-CA": "ca",
-      "en-GB": "gb",
-      "en-HK": "hk",
-      "en-IN": "in",
-      "en-NZ": "nz",
-      "en-PH": "ph",
-      "en-US": "us",
-      "en-ZA": "za",
-      "es-AR": "ar",
-      "es-CL": "cl",
-      "es-ES": "es",
-      "es-MX": "mx",
-      "fi-FI": "fi",
-      "fil-PH": "ph",
-      "fr-BE": "be",
-      "fr-CA": "ca",
-      "fr-CH": "ch",
-      "fr-FR": "fr",
-      "gsw-CH": "ch",
-      "hi-IN": "in",
-      "id-ID": "id",
-      "it-CH": "ch",
-      "it-IT": "it",
-      "ja-JP": "jp",
-      "ko-KR": "kr",
-      "mi-NZ": "nz",
-      "ms-MY": "my",
-      "nb-NO": "no",
-      "nl-BE": "be",
-      "nl-NL": "nl",
-      "nn-NO": "no",
-      "pl-PL": "pl",
-      "pt-BR": "br",
-      "pt-PT": "pt",
-      "ru-RU": "ru",
-      "sv-FI": "fi",
-      "sv-SE": "se",
-      "tr-TR": "tr",
-      "zh-CN": "cn",
-      "zh-HK": "hk",
-      "zh-TW": "tw"
-    }
-  },
-  "resulthunter images": {
-    "all_locale": "all",
-    "custom": {
-      "ui_lang": {
-        "az": "az",
-        "bg": "bg",
-        "br": "br",
-        "ca": "ca",
-        "cs": "cs",
-        "cy": "cy",
-        "da": "da",
-        "de-DE": "de-de",
-        "el": "el",
-        "en-CA": "en-ca",
-        "en-GB": "en-gb",
-        "en-IN": "en-in",
-        "en-US": "en-us",
-        "es": "es",
-        "et": "et",
-        "eu": "eu",
-        "fi-FI": "fi-fi",
-        "fr-CA": "fr-ca",
-        "fr-FR": "fr-fr",
-        "gl": "gl",
-        "hr": "hr",
-        "hu": "hu",
-        "id": "id",
-        "it": "it",
-        "ja-JP": "ja-jp",
-        "ka": "ka",
-        "ko": "ko",
-        "lt": "lt",
-        "lv": "lv",
-        "ms": "ms",
-        "nb": "nb",
-        "nl": "nl",
-        "pl": "pl",
-        "pt-BR": "pt-br",
-        "ro": "ro",
-        "ru": "ru",
-        "sk": "sk",
-        "sl": "sl",
-        "sq-AL": "sq-al",
-        "sr": "sr",
-        "sr_Latn": "sr-latn",
-        "sv": "sv",
-        "sw-KE": "sw-ke",
-        "th": "th",
-        "tr": "tr",
-        "uk": "uk",
-        "vi": "vi",
-        "zh": "zh",
-        "zh-TW": "zh-tw"
-      }
-    },
-    "data_type": "traits_v1",
-    "languages": {},
-    "regions": {
-      "ar-SA": "sa",
-      "da-DK": "dk",
-      "de-AT": "at",
-      "de-BE": "be",
-      "de-CH": "ch",
-      "de-DE": "de",
-      "en-AU": "au",
-      "en-CA": "ca",
-      "en-GB": "gb",
-      "en-HK": "hk",
-      "en-IN": "in",
-      "en-NZ": "nz",
-      "en-PH": "ph",
-      "en-US": "us",
-      "en-ZA": "za",
-      "es-AR": "ar",
-      "es-CL": "cl",
-      "es-ES": "es",
-      "es-MX": "mx",
-      "fi-FI": "fi",
-      "fil-PH": "ph",
-      "fr-BE": "be",
-      "fr-CA": "ca",
-      "fr-CH": "ch",
-      "fr-FR": "fr",
-      "gsw-CH": "ch",
-      "hi-IN": "in",
-      "id-ID": "id",
-      "it-CH": "ch",
-      "it-IT": "it",
-      "ja-JP": "jp",
-      "ko-KR": "kr",
-      "mi-NZ": "nz",
-      "ms-MY": "my",
-      "nb-NO": "no",
-      "nl-BE": "be",
-      "nl-NL": "nl",
-      "nn-NO": "no",
-      "pl-PL": "pl",
-      "pt-BR": "br",
-      "pt-PT": "pt",
-      "ru-RU": "ru",
-      "sv-FI": "fi",
-      "sv-SE": "se",
-      "tr-TR": "tr",
-      "zh-CN": "cn",
-      "zh-HK": "hk",
-      "zh-TW": "tw"
-    }
-  },
   "sepiasearch": {
     "all_locale": null,
     "custom": {},
@@ -9585,4 +9120,4 @@
     },
     "regions": {}
   }
-}
+}

searx/enginelib/__init__.py

@@ -3,7 +3,6 @@
 
 - :py:obj:`searx.enginelib.EngineCache`
 - :py:obj:`searx.enginelib.Engine`
-- :py:obj:`searx.enginelib.EngineAbout`
 - :py:obj:`searx.enginelib.traits`
 
 There is a command line for developer purposes and for deeper analysis.  Here is
@@ -24,7 +23,7 @@ an example in which the command line is called in the development environment::
 
 """
 
-__all__ = ["EngineCache", "Engine", "EngineAbout", "ENGINES_CACHE"]
+__all__ = ["EngineCache", "Engine", "ENGINES_CACHE"]
 
 import typing as t
 import abc
@@ -32,7 +31,6 @@ from collections.abc import Callable
 import logging
 import string
 import typer
-import msgspec
 
 from ..cache import ExpireCacheSQLite, ExpireCacheCfg
 
@@ -41,7 +39,7 @@ if t.TYPE_CHECKING:
     from searx.enginelib.traits import EngineTraits
     from searx.extended_types import SXNG_Response
     from searx.result_types import EngineResults
-    from searx.search.processors import OfflineParamTypes, OnlineParamTypes, ProcessorType
+    from searx.search.processors import OfflineParamTypes, OnlineParamTypes
 
 ENGINES_CACHE: ExpireCacheSQLite = ExpireCacheSQLite.build_cache(
     ExpireCacheCfg(
@@ -180,58 +178,11 @@ class EngineCache:
         return ENGINES_CACHE.secret_hash(name=name)
 
 
-class EngineAbout(msgspec.Struct, kw_only=True):
-    """Additional fields describing the engine.
-
-    .. code:: yaml
-
-       about:
-          website: https://example.com
-          wikidata_id: Q306656
-          official_api_documentation: https://example.com/api-doc
-          use_official_api: true
-          require_api_key: true
-          results: HTML
-    """
-
-    # pylint: disable=too-few-public-methods
-
-    website: str = ""
-    """Official web-site of the origin."""
-
-    wikidata_id: str = ""
-    """`Wikidata ID <https://www.wikidata.org/wiki/Wikidata:Identifiers>`_"""
-
-    official_api_documentation: str = ""
-    """URL of the official API (regardless of whether it is used)"""
-
-    use_official_api: bool = False
-    """SearXNG engine makes use of the official API or not"""
-    require_api_key: bool = False
-    """API requires a key or not."""
-
-    results: str = ""
-    """Data format of the source (online-engines: of the response)."""
-
-    description: str = ""
-    """Brief description of the engine and where it gets its data from.
-
-    This value should only be set as long as no description of the data source
-    is available via a :py:obj:`EngineAbout.wikidata_id`.
-    """
-
-    language: str = ""
-    """Deprecated! Migrate your setting from `engine.about.language` to
-    `engine.language`"""
-
-
 class Engine(abc.ABC):  # pylint: disable=too-few-public-methods
     """Class of engine instances build from YAML settings.
 
     Further documentation see :ref:`general engine configuration`.
 
-    The defaults are taken from :py:obj:`searx.engines.ENGINE_DEFAULT_ARGS`.
-
     .. hint::
 
        This class is currently never initialized and only used for type hinting.
@@ -239,71 +190,39 @@ class Engine(abc.ABC):  # pylint: disable=too-few-public-methods
 
     logger: logging.Logger
 
-    # Common options of the engine module
+    # Common options in the engine module
 
-    engine_type: "ProcessorType" = "online"
+    engine_type: str
     """Type of the engine (:ref:`searx.search.processors`)"""
 
-    paging: bool = False
+    paging: bool
     """Engine supports multiple pages."""
 
     max_page: int = 0
     """If the engine supports paging, then this is the value for the last page
     that is still supported. ``0`` means unlimited numbers of pages."""
 
-    time_range_support: bool = False
+    time_range_support: bool
     """Engine supports search time range."""
 
-    safesearch: bool = False
+    safesearch: bool
     """Engine supports SafeSearch"""
 
-    language_support: bool = False
+    language_support: bool
     """Engine supports languages (locales) search."""
 
-    fetch_traits: "Callable[[EngineTraits, bool], None]"
-    """Function to to fetch engine's traits from origin."""
-
-    traits: "traits.EngineTraits"
-    """Traits of the engine."""
-
-    # settings.yml
-
-    name: str
-    """Name that will be used across SearXNG to define this engine.  In settings, on
-    the result page .."""
-
-    engine: str
-    """Name of the python file used to handle requests and responses to and from
-    this search engine (file name from :origin:`searx/engines` without
-    ``.py``)."""
-
-    categories: list[str] = ["general"]
-    """Specifies to which :ref:`engine categories` the engine should be added."""
-
-    language: str = ""
-    """If the engine supports only one language, this language is specified here
-    (``en``, ``de``, ``"no"`` or ..); otherwise, the value remains empty. For
-    the YAML configuration: think of the `YAML-Norway problem
-    <https://ruuda.nl/2023/the-yaml-document-from-hell#the-norway-problem>`_
+    language: str
+    """For an engine, when there is ``language: ...`` in the YAML settings the engine
+    does support only this one language:
 
     .. code:: yaml
 
-      - name: google norway
+      - name: google french
         engine: google
-        language: "no"
-
-    Depending on ``language_support``, this value has similar but also slightly
-    different meanings.
-
-    - When ``language_support`` is **true**, the map of
-      :py:obj:`traits.EngineTraits.languages` is reduced to the selected
-      language
-
-    - When ``language_support`` is **false**, then the implementation of the
-      engine only supports this one ``language``
+        language: fr
     """
 
-    region: str = ""
+    region: str
     """For an engine, when there is ``region: ...`` in the YAML settings the engine
     does support only this one region::
 
@@ -314,6 +233,26 @@ class Engine(abc.ABC):  # pylint: disable=too-few-public-methods
         region: fr-BE
     """
 
+    fetch_traits: "Callable[[EngineTraits, bool], None]"
+    """Function to to fetch engine's traits from origin."""
+
+    traits: "traits.EngineTraits"
+    """Traits of the engine."""
+
+    # settings.yml
+
+    categories: list[str]
+    """Specifies to which :ref:`engine categories` the engine should be added."""
+
+    name: str
+    """Name that will be used across SearXNG to define this engine.  In settings, on
+    the result page .."""
+
+    engine: str
+    """Name of the python file used to handle requests and responses to and from
+    this search engine (file name from :origin:`searx/engines` without
+    ``.py``)."""
+
     enable_http: bool
     """Enable HTTP (by default only HTTPS is enabled)."""
 
@@ -326,31 +265,6 @@ class Engine(abc.ABC):  # pylint: disable=too-few-public-methods
     display_error_messages: bool
     """Display error messages on the web UI."""
 
-    disabled: bool = False
-    """To disable by default the engine, but not deleting it.  It will allow the
-    user to manually activate it in the settings."""
-
-    inactive: bool = False
-    """Remove the engine from the settings (*disabled & removed*)."""
-
-    about: EngineAbout = EngineAbout()
-    """Additional fields describing the engine."""
-
-    using_tor_proxy: bool = False
-    """Using tor proxy (``true``) or not (``false``) for this engine."""
-
-    send_accept_language_header: bool = True
-    """When this option is activated (default), the language (locale) that is
-    selected by the user is used to build and send a ``Accept-Language`` header
-    in the request to the origin search engine."""
-
-    tokens: list[str] = []
-    """A list of secret tokens to make this engine *private*, more details see
-    :ref:`private engines`."""
-
-    weight: float = 1.0
-    """Weighting of the results of this engine (:ref:`weight <settings engines>`)."""
-
     proxies: dict[str, dict[str, str]]
     """Set proxies for a specific engine (YAML):
 
@@ -361,6 +275,42 @@ class Engine(abc.ABC):  # pylint: disable=too-few-public-methods
          https: socks5://proxy:port
     """
 
+    disabled: bool
+    """To disable by default the engine, but not deleting it.  It will allow the
+    user to manually activate it in the settings."""
+
+    inactive: bool
+    """Remove the engine from the settings (*disabled & removed*)."""
+
+    about: dict[str, dict[str, str]]
+    """Additional fields describing the engine.
+
+    .. code:: yaml
+
+       about:
+          website: https://example.com
+          wikidata_id: Q306656
+          official_api_documentation: https://example.com/api-doc
+          use_official_api: true
+          require_api_key: true
+          results: HTML
+    """
+
+    using_tor_proxy: bool
+    """Using tor proxy (``true``) or not (``false``) for this engine."""
+
+    send_accept_language_header: bool
+    """When this option is activated (default), the language (locale) that is
+    selected by the user is used to build and send a ``Accept-Language`` header
+    in the request to the origin search engine."""
+
+    tokens: list[str]
+    """A list of secret tokens to make this engine *private*, more details see
+    :ref:`private engines`."""
+
+    weight: int
+    """Weighting of the results of this engine (:ref:`weight <settings engines>`)."""
+
     def setup(self, engine_settings: dict[str, t.Any]) -> bool:  # pylint: disable=unused-argument
         """Dynamic setup of the engine settings.
 

searx/enginelib/traits.py

@@ -142,11 +142,11 @@ class EngineTraits:
         """
 
         if self.data_type == "traits_v1":
-            self._set_traits_v1(engine)  # pyright: ignore[reportArgumentType]
+            self._set_traits_v1(engine)
         else:
             raise TypeError("engine traits of type %s is unknown" % self.data_type)
 
-    def _set_traits_v1(self, engine: "Engine") -> None:
+    def _set_traits_v1(self, engine: "Engine | types.ModuleType") -> None:
         # For an engine, when there is `language: ...` in the YAML settings the engine
         # does support only this one language (region)::
         #
@@ -159,25 +159,22 @@ class EngineTraits:
 
         _msg = "settings.yml - engine: '%s' / %s: '%s' not supported"
 
-        if engine.language:
-            if engine.language_support:
-                if not len(traits.languages) > 1:
-                    raise ValueError(
-                        f"engine {engine.name}: activated language_support with just one or less languages"
-                    )
-                if engine.language not in traits.languages:
-                    raise ValueError(_msg % (engine.name, "language", engine.language))
-                traits.languages = {engine.language: traits.languages[engine.language]}
+        languages = traits.languages
+        if hasattr(engine, "language"):
+            if engine.language not in languages:
+                raise ValueError(_msg % (engine.name, "language", engine.language))
+            traits.languages = {engine.language: languages[engine.language]}
 
-        if engine.region:
-            if engine.region not in traits.regions:
+        regions = traits.regions
+        if hasattr(engine, "region"):
+            if engine.region not in regions:
                 raise ValueError(_msg % (engine.name, "region", engine.region))
-            traits.regions = {engine.region: traits.regions[engine.region]}
+            traits.regions = {engine.region: regions[engine.region]}
 
         engine.language_support = bool(traits.languages or traits.regions)
 
         # set the copied & modified traits in engine's namespace
-        engine.traits = traits
+        engine.traits = traits  # pyright: ignore[reportAttributeAccessIssue]
 
 
 class EngineTraitsMap(dict[str, EngineTraits]):

searx/engines/360search.py

@@ -22,8 +22,8 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": "HTML",
+    "language": "zh",
 }
-language = "zh"
 
 # Engine Configuration
 categories = ["general"]

searx/engines/__builtins__.pyi

@@ -5,19 +5,19 @@ intended monkey patching of the engine modules.
 .. attention::
 
    Monkey-patching modules is a practice from the past that shouldn't be
-   expanded upon.  In the long run, engines should be instances of
-   :py:obj:`searx.enginelib.Engine`. However, as long as long as all engine
-   modules aren't converted to this class, these builtin types will still be
-   needed.
+   expanded upon.  In the long run, there should be an engine class that can be
+   inherited.  However, as long as this class doesn't exist, and as long as all
+   engine modules aren't converted to an engine class, these builtin types will
+   still be needed.
 """
 
 import logging
 from searx.enginelib import traits as _traits
 
 logger: logging.Logger
+supported_languages: str
+language_aliases: str
 language_support: bool
-language: str
-region: str
 traits: _traits.EngineTraits
 
 # from searx.engines.ENGINE_DEFAULT_ARGS

searx/engines/__init__.py

@@ -14,48 +14,40 @@ import sys
 import copy
 import os
 from os.path import realpath, dirname
-import warnings
 
 import types
 import inspect
-import msgspec
 
 from searx import logger, settings
 from searx.utils import load_module
-from searx.data import ENGINE_TRAITS
-from searx.enginelib import Engine, EngineAbout
+
+if t.TYPE_CHECKING:
+    from searx.enginelib import Engine
 
 logger = logger.getChild('engines')
 ENGINE_DIR = dirname(realpath(__file__))
 
 # Defaults for the namespace of an engine module, see load_engine()
-ENGINE_DEFAULT_ARGS: dict[str, t.Any] = {
+ENGINE_DEFAULT_ARGS: dict[str, int | str | list[t.Any] | dict[str, t.Any] | bool] = {
     # Common options in the engine module
     "engine_type": "online",
     "paging": False,
-    "max_page": 0,
     "time_range_support": False,
     "safesearch": False,
-    "language_support": False,
     # settings.yml
     "categories": ["general"],
-    "language": "",
-    "region": "",
     "enable_http": False,
     "shortcut": "-",
     "timeout": settings["outgoing"]["request_timeout"],
     "display_error_messages": True,
     "disabled": False,
     "inactive": False,
-    "about": EngineAbout(),
+    "about": {},
     "using_tor_proxy": False,
     "send_accept_language_header": True,
     "tokens": [],
-    "weight": 1.0,
+    "max_page": 0,
 }
-"""Default values that are set in an engine of type *module*, please compare
-with the class :py:obj:`searx.enginelib.Engine`."""
-
 # set automatically when an engine does not have any tab category
 DEFAULT_CATEGORY = 'other'
 
@@ -185,41 +177,14 @@ def set_loggers(engine: "Engine|types.ModuleType", engine_name: str):
 
 
 def update_engine_attributes(engine: "Engine | types.ModuleType", engine_data: dict[str, t.Any]):
-    # pylint: disable=too-many-branches
-
     # set engine attributes from engine_data
-    kvargs: dict[str, t.Any]
-    if isinstance(engine.about, EngineAbout):
-        kvargs = {**msgspec.to_builtins(engine.about), **engine_data.get("about", {})}
-    else:
-        kvargs = {**engine.about, **engine_data.get("about", {})}
-
-    try:
-        engine.about = EngineAbout(**kvargs)
-    except TypeError as exc:
-        raise TypeError(
-            f"engine '{engine_data['name']}' ({engine_data['engine']}) - in the about section --> {exc}"
-        ) from exc
-
-    # warn about deprecated engine settings
-
-    if engine.about.language:
-        if hasattr(engine, "language") and not engine.language:
-            engine.language = engine.about.language
-        warnings.warn(
-            f"engine '{engine_data['name']}' ({engine_data['engine']})"
-            f" - migrate engine.about.language to engine.language!",
-            DeprecationWarning,
-            2,
-        )
-
     for param_name, param_value in engine_data.items():
-        if param_name == "about":
-            continue
         if param_name == 'categories':
             if isinstance(param_value, str):
                 param_value = list(map(str.strip, param_value.split(',')))
             engine.categories = param_value  # type: ignore
+        elif hasattr(engine, 'about') and param_name == 'about':
+            engine.about = {**engine.about, **engine_data['about']}  # type: ignore
         else:
             setattr(engine, param_name, param_value)
 
@@ -228,9 +193,6 @@ def update_engine_attributes(engine: "Engine | types.ModuleType", engine_data: d
         if not hasattr(engine, arg_name):
             setattr(engine, arg_name, copy.deepcopy(arg_value))
 
-    if ENGINE_TRAITS.get(engine.name, {}).get("languages") and not engine.language_support:
-        raise ValueError(f"engine '{engine.name}' ({engine_data['engine']}) language_support should be set to True")
-
 
 def update_attributes_for_tor(engine: "Engine | types.ModuleType"):
     if using_tor_proxy(engine) and hasattr(engine, 'onion_url'):

searx/engines/acfun.py

@@ -16,12 +16,12 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": "HTML",
+    "language": "zh",
 }
 
 # Engine Configuration
 categories = ["videos"]
 paging = True
-language = "zh"
 
 # Base URL
 base_url = "https://www.acfun.cn"

searx/engines/annas_archive.py

@@ -64,7 +64,6 @@ about: dict[str, t.Any] = {
 # engine dependent config
 categories = ["files", "books"]
 paging: bool = True
-language_support = True
 
 # search-url
 base_url: list[str] | str = []

searx/engines/ansa.py

@@ -42,8 +42,8 @@ about = {
     'use_official_api': False,
     'require_api_key': False,
     'results': 'HTML',
+    'language': 'it',
 }
-language = "it"
 
 
 def request(query, params):

searx/engines/aol.py

@@ -0,0 +1,210 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+"""AOL supports WEB, image, and video search.  Internally, it uses the Bing
+index.
+
+AOL doesn't seem to support setting the language via request parameters, instead
+the results are based on the URL.  For example, there is
+
+- `search.aol.com <https://search.aol.com>`_ for English results
+- `suche.aol.de <https://suche.aol.de>`_ for German results
+
+However, AOL offers its services only in a few regions:
+
+- en-US: search.aol.com
+- de-DE: suche.aol.de
+- fr-FR: recherche.aol.fr
+- en-GB: search.aol.co.uk
+- en-CA: search.aol.ca
+
+In order to still offer sufficient support for language and region, the `search
+keywords`_ known from Bing, ``language`` and ``loc`` (region), are added to the
+search term (AOL is basically just a proxy for Bing).
+
+.. _search keywords:
+    https://support.microsoft.com/en-us/topic/advanced-search-keywords-ea595928-5d63-4a0b-9c6b-0b769865e78a
+
+"""
+
+from urllib.parse import urlencode, unquote_plus
+import typing as t
+
+from lxml import html
+from dateutil import parser
+
+from searx.result_types import EngineResults
+from searx.utils import eval_xpath_list, eval_xpath, extract_text
+
+if t.TYPE_CHECKING:
+    from searx.extended_types import SXNG_Response
+    from searx.search.processors import OnlineParams
+
+about = {
+    "website": "https://www.aol.com",
+    "wikidata_id": "Q27585",
+    "official_api_documentation": None,
+    "use_official_api": False,
+    "require_api_key": False,
+    "results": "HTML",
+}
+
+categories = ["general"]
+search_type = "search"  # supported: search, image, video
+
+paging = True
+safesearch = True
+time_range_support = True
+results_per_page = 10
+
+
+base_url = "https://search.aol.com"
+time_range_map = {"day": "1d", "week": "1w", "month": "1m", "year": "1y"}
+safesearch_map = {0: "p", 1: "r", 2: "i"}
+
+enable_http2 = False
+
+
+def init(_):
+    if search_type not in ("search", "image", "video"):
+        raise ValueError(f"unsupported search type {search_type}")
+
+
+def request(query: str, params: "OnlineParams") -> None:
+
+    language, region = (params["searxng_locale"].split("-") + [None])[:2]
+    if language and language != "all":
+        query = f"{query} language:{language}"
+    if region:
+        query = f"{query} loc:{region}"
+
+    args: dict[str, str | int | None] = {
+        "q": query,
+        "b": params["pageno"] * results_per_page + 1,  # page is 1-indexed
+        "pz": results_per_page,
+    }
+
+    if params["time_range"]:
+        args["fr2"] = "time"
+        args["age"] = params["time_range"]
+    else:
+        args["fr2"] = "sb-top-search"
+
+    params["cookies"]["sB"] = f"vm={safesearch_map[params['safesearch']]}"
+    params["url"] = f"{base_url}/aol/{search_type}?{urlencode(args)}"
+    logger.debug(params)
+
+
+def _deobfuscate_url(obfuscated_url: str) -> str | None:
+    # URL looks like "https://search.aol.com/click/_ylt=AwjFSDjd;_ylu=JfsdjDFd/RV=2/RE=1774058166/RO=10/RU=https%3a%2f%2fen.wikipedia.org%2fwiki%2fTree/RK=0/RS=BP2CqeMLjscg4n8cTmuddlEQA2I-"  # pylint: disable=line-too-long
+    if not obfuscated_url:
+        return None
+
+    for part in obfuscated_url.split("/"):
+        if part.startswith("RU="):
+            return unquote_plus(part[3:])
+    # pattern for de-obfuscating URL not found, fall back to Yahoo's tracking link
+    return obfuscated_url
+
+
+def _general_results(doc: html.HtmlElement) -> EngineResults:
+    res = EngineResults()
+
+    for result in eval_xpath_list(doc, "//div[@id='web']//ol/li[not(contains(@class, 'first'))]"):
+        obfuscated_url = extract_text(eval_xpath(result, ".//h3/a/@href"))
+        if not obfuscated_url:
+            continue
+
+        url = _deobfuscate_url(obfuscated_url)
+        if not url:
+            continue
+
+        res.add(
+            res.types.MainResult(
+                url=url,
+                title=extract_text(eval_xpath(result, ".//h3/a")) or "",
+                content=extract_text(eval_xpath(result, ".//div[contains(@class, 'compText')]")) or "",
+                thumbnail=extract_text(eval_xpath(result, ".//a[contains(@class, 'thm')]/img/@data-src")) or "",
+            )
+        )
+    return res
+
+
+def _video_results(doc: html.HtmlElement) -> EngineResults:
+    res = EngineResults()
+
+    for result in eval_xpath_list(doc, "//div[contains(@class, 'results')]//ol/li"):
+        obfuscated_url = extract_text(eval_xpath(result, ".//a/@href"))
+        if not obfuscated_url:
+            continue
+
+        url = _deobfuscate_url(obfuscated_url)
+        if not url:
+            continue
+
+        published_date_raw = extract_text(eval_xpath(result, ".//div[contains(@class, 'v-age')]"))
+        try:
+            published_date = parser.parse(published_date_raw or "")
+        except parser.ParserError:
+            published_date = None
+
+        res.add(
+            res.types.LegacyResult(
+                {
+                    "template": "videos.html",
+                    "url": url,
+                    "title": extract_text(eval_xpath(result, ".//h3")),
+                    "content": extract_text(eval_xpath(result, ".//div[contains(@class, 'compText')]")),
+                    "thumbnail": extract_text(eval_xpath(result, ".//img[contains(@class, 'thm')]/@src")),
+                    "length": extract_text(eval_xpath(result, ".//span[contains(@class, 'v-time')]")),
+                    "publishedDate": published_date,
+                }
+            )
+        )
+
+    return res
+
+
+def _image_results(doc: html.HtmlElement) -> EngineResults:
+    res = EngineResults()
+
+    for result in eval_xpath_list(doc, "//section[@id='results']//ul/li"):
+        obfuscated_url = extract_text(eval_xpath(result, "./a/@href"))
+        if not obfuscated_url:
+            continue
+
+        url = _deobfuscate_url(obfuscated_url)
+        if not url:
+            continue
+
+        res.add(
+            res.types.LegacyResult(
+                {
+                    "template": "images.html",
+                    # results don't have an extra URL, only the image source
+                    "url": url,
+                    "title": extract_text(eval_xpath(result, ".//a/@aria-label")),
+                    "thumbnail_src": extract_text(eval_xpath(result, ".//img/@src")),
+                    "img_src": url,
+                }
+            )
+        )
+
+    return res
+
+
+def response(resp: "SXNG_Response") -> EngineResults:
+    doc = html.fromstring(resp.text)
+
+    match search_type:
+        case "search":
+            results = _general_results(doc)
+        case "image":
+            results = _image_results(doc)
+        case "video":
+            results = _video_results(doc)
+        case _:
+            raise ValueError("unsupported search type")
+
+    for suggestion in eval_xpath_list(doc, ".//ol[contains(@class, 'searchRightBottom')]//table//a"):
+        results.add(results.types.LegacyResult({"suggestion": extract_text(suggestion)}))
+
+    return results

searx/engines/archlinux.py

@@ -35,7 +35,6 @@ about = {
 categories = ["it", "software wikis"]
 paging = True
 main_wiki = "wiki.archlinux.org"
-language_support = True
 
 
 def request(query, params):

searx/engines/azure.py

@@ -54,8 +54,8 @@ about = {
     "use_official_api": True,
     "require_api_key": True,
     "results": "JSON",
+    "language": "en",
 }
-language = "en"
 
 CACHE: EngineCache
 """Persistent (SQLite) key/value cache that deletes its values after ``expire``

searx/engines/baidu.py

@@ -23,8 +23,8 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": "JSON",
+    "language": "zh",
 }
-language = "zh"
 
 paging = True
 categories = []

searx/engines/boardreader.py

@@ -34,7 +34,6 @@ about = {
 categories = ["general", "social media"]
 paging = True
 time_range_support = True
-language_support = True
 
 base_url = "https://boardreader.com"
 time_range_map = {"day": "1", "week": "7", "month": "30", "year": "365"}

searx/engines/bpb.py

@@ -13,8 +13,8 @@ about = {
     'use_official_api': False,
     'require_api_key': False,
     'results': 'JSON',
+    'language': 'de',
 }
-language = "de"
 
 paging = True
 categories = ['general']

searx/engines/chatnoir.py

@@ -1,115 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-or-later
-"""Chatnoir is an open source search engine developed by Webis, a network of
-researchers from the universities of Weimar, Halle and Leipzig. It supports
-different different text corpora as indexes, e.g. CommonCrawl. See its
-`announcement`_ for more information.
-
-.. _announcement : https://groups.google.com/g/common-crawl/c/3o2dOHpeRxo/m/H2Osqz9dAAAJ
-"""
-
-import typing as t
-
-from searx.exceptions import SearxEngineAPIException
-from searx.extended_types import SXNG_Response
-from searx.network import get, post
-from searx.result_types import EngineResults
-from searx.utils import html_to_text
-
-if t.TYPE_CHECKING:
-    from searx.search.processors import OnlineParams
-
-about = {
-    "website": "https://www.chatnoir.eu",
-    "official_api_documentation": "https://www.chatnoir.eu/docs/api-general",
-    "use_official_api": True,
-    "require_api_key": False,
-    "results": "JSON",
-}
-
-base_url = "https://www.chatnoir.eu"
-categories = ["general"]
-
-paging = True
-page_size = 10
-
-api_key = ""
-"""You can optionally provide your own API key here. This one will then be used
-instead of scraping an API key."""
-
-search_index = "cw22"
-"""Search index to browse in. See `the API documentation
-<https://www.chatnoir.eu/docs/api-general>`_ for a full list."""
-
-
-def _obtain_api_key() -> tuple[str, str, str]:
-    home_resp = get(base_url)
-    if not home_resp.ok:
-        raise SearxEngineAPIException("failed to obtain api key")
-    csrf_token = home_resp.cookies["csrftoken"]
-
-    token_resp = post(
-        "https://www.chatnoir.eu/?init",
-        headers={
-            "Referer": f"{base_url}/",
-            "X-Requested-With": "XMLHttpRequest",
-            "X-Csrf-Token": csrf_token,
-        },
-        cookies=home_resp.cookies,
-    )
-    if not token_resp.ok:
-        raise SearxEngineAPIException("failed to obtain api key")
-    session_id = token_resp.cookies["sessionid"]
-    scraped_api_key = token_resp.json()["token"]["token"]
-
-    return csrf_token, session_id, scraped_api_key
-
-
-def request(query: str, params: "OnlineParams"):
-    if api_key:
-        # use user-provided API key instead of scraping one
-        headers = {
-            "Authorization": f"Bearer {api_key}",
-        }
-
-        params["headers"].update(headers)
-    else:
-        csrf_token, session_id, scraped_api_key = _obtain_api_key()
-
-        headers = {
-            "Authorization": f"Bearer {scraped_api_key}",
-            "X-Csrf-Token": csrf_token,
-        }
-
-        params["headers"].update(headers)
-        params["cookies"] = {"csrftoken": session_id, "sessionid": session_id}
-
-    params["url"] = f"{base_url}/api/v1/_search"
-    params["method"] = "POST"
-
-    json_data = {
-        "query": query,
-        "index": [
-            search_index,
-        ],
-        "from": (params["pageno"] - 1) * page_size,
-        "size": page_size,
-        "_extended_meta": True,
-    }
-    params["json"] = json_data
-
-
-def response(resp: "SXNG_Response") -> EngineResults:
-    res = EngineResults()
-
-    results = resp.json()["results"]
-
-    for result in results:
-        res.add(
-            res.types.MainResult(
-                url=result["target_uri"],
-                title=html_to_text(result["title"]),
-                content=html_to_text(result["snippet"]),
-            )
-        )
-
-    return res

searx/engines/chefkoch.py

@@ -10,8 +10,8 @@ about = {
     'use_official_api': False,
     'require_api_key': False,
     'results': 'JSON',
+    'language': 'de',
 }
-language = "de"
 
 paging = True
 categories = []

searx/engines/chinaso.py

@@ -70,13 +70,13 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": "JSON",
+    "language": "zh",
 }
 
 paging = True
 time_range_support = True
 results_per_page = 10
 categories = []
-language = "zh"
 
 ChinasoCategoryType = t.Literal['news', 'videos', 'images']
 """ChinaSo supports news, videos, images search.
@@ -156,13 +156,6 @@ def response(resp):
     except Exception as e:
         raise SearxEngineAPIException(f"Invalid response: {e}") from e
 
-    # Upstream returns {'status': 0, 'msg': 'empty result', 'data': {}} when there
-    # are no results; this is a valid empty result rather than an API error.
-    if not isinstance(data, dict) or "data" not in data:
-        raise SearxEngineAPIException("Invalid response")
-    if not data["data"]:
-        return []
-
     parsers = {'news': parse_news, 'images': parse_images, 'videos': parse_videos}
 
     return parsers[chinaso_category](data)

searx/engines/dailymotion.py

@@ -40,7 +40,6 @@ categories = ["videos"]
 paging = True
 page_size = 10
 
-language_support = True
 time_range_support = True
 time_delta_dict = {
     "day": timedelta(days=1),

searx/engines/demo_offline.py

@@ -24,7 +24,7 @@ import typing as t
 import json
 
 from searx.result_types import EngineResults
-from searx.enginelib import EngineCache, EngineAbout
+from searx.enginelib import EngineCache
 
 if t.TYPE_CHECKING:
     from searx.search.processors import RequestParams
@@ -35,11 +35,13 @@ categories = ["general"]
 disabled = True
 timeout = 2.0
 
-language = "en"
-about = EngineAbout(
-    results="JSON",
-    description="Demo offline engine Engine with results in the English language.",
-)
+about = {
+    "wikidata_id": None,
+    "official_api_documentation": None,
+    "use_official_api": False,
+    "require_api_key": False,
+    "results": "JSON",
+}
 
 # if there is a need for globals, use a leading underline
 _my_offline_engine: str = ""

searx/engines/demo_online.py

@@ -25,7 +25,6 @@ import typing as t
 
 from urllib.parse import urlencode
 from searx.result_types import EngineResults
-from searx.enginelib import EngineAbout
 
 if t.TYPE_CHECKING:
     from searx.extended_types import SXNG_Response
@@ -44,14 +43,14 @@ page_size = 20
 search_api = "https://api.artic.edu/api/v1/artworks/search"
 image_api = "https://www.artic.edu/iiif/2/"
 
-about = EngineAbout(
-    website="https://www.artic.edu",
-    wikidata_id="Q239303",
-    official_api_documentation="http://api.artic.edu/docs/",
-    use_official_api=True,
-    require_api_key=False,
-    results="JSON",
-)
+about = {
+    "website": "https://www.artic.edu",
+    "wikidata_id": "Q239303",
+    "official_api_documentation": "http://api.artic.edu/docs/",
+    "use_official_api": True,
+    "require_api_key": False,
+    "results": "JSON",
+}
 
 
 # if there is a need for globals, use a leading underline

searx/engines/destatis.py

@@ -11,8 +11,8 @@ about = {
     'use_official_api': False,
     'require_api_key': False,
     'results': 'HTML',
+    'language': 'de',
 }
-language = "de"
 
 categories = []
 paging = True

searx/engines/duckduckgo.py

@@ -203,7 +203,6 @@ about: dict[str, str | bool] = {
 categories: list[str] = ["general", "web"]
 paging: bool = True
 time_range_support: bool = True
-language_support = True
 safesearch: bool = True
 """DDG-lite: user can't select but the results are filtered."""
 

searx/engines/duckduckgo_extra.py

@@ -28,7 +28,6 @@ about = {
     "require_api_key": False,
     "results": "JSON (site requires js to get images)",
 }
-language_support = True
 
 # engine dependent config
 categories = []

searx/engines/duckduckgo_weather.py

@@ -26,7 +26,6 @@ about = {
     "require_api_key": False,
     "results": "JSON",
 }
-language_support = True
 
 # engine dependent config
 categories = ["weather"]

searx/engines/duckduckgo_web.py

@@ -140,9 +140,7 @@ def response(resp: "SXNG_Response"):
         if "u" not in result:
             continue
 
-        res.add(
-            res.types.MainResult(url=result["u"], title=html_to_text(result["t"]), content=html_to_text(result["a"]))
-        )
+        res.add(res.types.MainResult(url=result["u"], title=result["t"], content=html_to_text(result["a"])))
 
     # link to next page
     next_page_path = res_json["results"][-1].get("n")

searx/engines/duden.py

@@ -14,8 +14,8 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": 'HTML',
+    "language": 'de',
 }
-language = "de"
 
 categories = ['dictionaries']
 paging = True

searx/engines/elasticsearch.py

@@ -55,7 +55,7 @@ about = {
     'official_api_documentation': 'https://www.elastic.co/guide/en/elasticsearch/reference/current/search-search.html',
     'use_official_api': True,
     'require_api_key': False,
-    "results": "JSON",
+    'format': 'JSON',
 }
 
 base_url = 'http://localhost:9200'

searx/engines/flaticon.py

@@ -63,7 +63,6 @@ def response(resp: "SXNG_Response"):
                 url=_fix_url(result["slug"]),
                 thumbnail_src=_fix_url(result["png"]),
                 img_src=_fix_url(result["png512"]),
-                img_format="PNG",
                 author=result["team_name"],
             )
         )

searx/engines/geizhals.py

@@ -27,8 +27,8 @@ about = {
     'official_api_documentation': None,
     'require_api_key': False,
     'results': 'HTML',
+    'language': 'de',
 }
-language = "de"
 paging = True
 categories = ['shopping']
 

searx/engines/google.py

@@ -57,7 +57,6 @@ max_page = 50
 .. _Google max 50 pages: https://github.com/searxng/searxng/issues/2982
 """
 time_range_support = True
-language_support = True
 safesearch = True
 
 time_range_dict = {"day": "d", "week": "w", "month": "m", "year": "y"}

searx/engines/google_images.py

@@ -43,7 +43,6 @@ max_page = 50
 """
 
 time_range_support = True
-language_support = True
 safesearch = True
 
 filter_mapping = {0: 'images', 1: 'active', 2: 'active'}

searx/engines/google_news.py

@@ -66,7 +66,6 @@ about = {
 categories = ["news"]
 paging = False
 time_range_support = False
-language_support = True
 
 # Google-News results are always *SafeSearch*. Option 'safesearch' is set to
 # False here.

searx/engines/il_post.py

@@ -34,8 +34,8 @@ about = {
     "use_official_api": True,
     "require_api_key": False,
     "results": "JSON",
+    "language": "it",
 }
-language = "it"
 
 
 def request(query, params):

searx/engines/ina.py

@@ -16,8 +16,8 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": 'HTML',
+    "language": 'fr',
 }
-language = "fr"
 
 # engine dependent config
 categories = ['videos']

searx/engines/iqiyi.py

@@ -14,9 +14,9 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": "JSON",
+    "language": "zh",
 }
 
-language = "zh"
 paging = True
 time_range_support = True
 categories = ["videos"]

searx/engines/jisho.py

@@ -13,8 +13,8 @@ about = {
     "use_official_api": True,
     "require_api_key": False,
     "results": 'JSON',
+    "language": 'ja',
 }
-language = "ja"
 
 categories = ['dictionaries']
 paging = False
@@ -110,8 +110,8 @@ def get_infobox(alt_forms, result_url, definitions):
     # definitions
     infobox_content.append(
         '''
-        <small><a href="https://www.edrdg.org/wiki/index.php/JMdict-EDICT_Dictionary_Project">JMdict</a>
-        and <a href="https://www.edrdg.org/enamdict/enamdict_doc.html">JMnedict</a>
+        <small><a href="https://www.edrdg.org/wiki/index.php/JMdict-EDICT_Dictionary_Project">JMdict</a> 
+        and <a href="https://www.edrdg.org/enamdict/enamdict_doc.html">JMnedict</a> 
         by <a href="https://www.edrdg.org/edrdg/licence.html">EDRDG</a>, CC BY-SA 3.0.</small>
         <ul>
     '''

searx/engines/json_engine.py

@@ -79,9 +79,6 @@ from json import loads
 from urllib.parse import urlencode
 from searx.utils import to_string, html_to_text
 from searx.network import raise_for_httperror
-from searx.enginelib import EngineAbout
-
-about = EngineAbout()
 
 search_url = None
 """

searx/engines/luxxle.py

@@ -1,210 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-or-later
-"""Luxxle_ is an American search engine focusing on providing "unbiased"
-results.
-
-.. _Luxxle: https://luxxle.com
-"""
-
-from json import dumps
-from urllib.parse import quote_plus, unquote_plus
-
-import typing as t
-from lxml import html
-
-from searx.result_types import EngineResults
-from searx.network import get
-from searx.utils import (
-    extr,
-    gen_useragent,
-    eval_xpath_list,
-    extract_text,
-    eval_xpath,
-    parse_duration_string,
-    ElementType,
-)
-
-if t.TYPE_CHECKING:
-    from searx.search.processors import OnlineParams
-    from searx.extended_types import SXNG_Response
-
-
-about = {
-    "website": "https://luxxle.com",
-    "official_api_documentation": None,
-    "use_official_api": False,
-    "require_api_key": False,
-    "results": "HTML",
-}
-
-categories = []
-safeseach = True
-
-base_url = "https://luxxle.com"
-
-luxxle_categ = "search"
-"""Supported categories: "search", "news", "images", "videos"."""
-
-# otherwise all requests get blocked (http2-fingerprinted probably)
-enable_http2 = False
-
-
-safe_search_map = {0: "Off", 1: "Moderate", 2: "Strict"}
-
-
-def init(_):
-    if luxxle_categ not in ("search", "images", "videos", "news"):
-        raise ValueError("invalid luxxle category: %s" % luxxle_categ)
-
-
-def _obtain_telemetry_data(query: str) -> dict[str, str]:
-    """This data is required for sending search queries.
-
-    The luxsearch page (for general results) has a JS dict called ``telemetryData``
-    that contains all the important info, but the others don't, so we don't use it
-    here. But it's useful to understand which info is needed.
-
-    .. code-block:: javascript
-
-        var telemetryData = {
-            errorInformation: errorInformation,
-            query: "youapps club",
-            ip: "10.10.10.10",
-            timeOf: "1781119224",
-            authorization: "db889e0ae67d3c320858ad97f51cc4f0a4d8e1913c4f5ebe5d2eafef606521dd",
-        };
-
-    This data is only valid for very short times
-    """
-    resp = get(
-        f"{base_url}/lux{luxxle_categ}?q={quote_plus(query)}", headers={"User-Agent": gen_useragent(), "Sec-GPC": "1"}
-    )
-
-    def extr_js_variable(name: str) -> str:
-        val = extr(resp.text, f"var {name} = \"", "\";")
-        if not val:
-            val = extr(resp.text, f"var {name} = '", "';")
-        return val
-
-    return {
-        "ip": extr_js_variable("ip"),
-        "timeOf": extr_js_variable("timeOf"),
-        "authorization": extr_js_variable("authorization"),
-        "preferencesCookie": extr_js_variable("preferencesCookie"),
-    }
-
-
-def request(query: str, params: "OnlineParams") -> None:
-    telemetry_data = _obtain_telemetry_data(query)
-
-    market = params["searxng_locale"]
-    if market == "all":
-        market = "en-US"
-
-    params["url"] = f"{base_url}/load_{luxxle_categ}.php"
-    search_data = {
-        **telemetry_data,
-        "query": query,
-        "market": market,
-        "safeSearch": safe_search_map[params["safesearch"]],
-        "freshness": "",
-        "language": "english",  # UI language
-    }
-    if luxxle_categ == "images":
-        # for some reason this is sent as form data
-        params["data"] = {"searchData": dumps(search_data)}
-    else:
-        params["json"] = {"searchData": search_data}
-    params["method"] = "POST"
-
-
-def _extract_url_from_redirect(url: str):
-    # urls usually look like "/redirect?url=<url>"
-    query_start_idx = url.find("?url=")
-    if query_start_idx < 0:
-        return url
-
-    url_start_idx = query_start_idx + len("?url=")
-    return unquote_plus(url[url_start_idx:])
-
-
-def _general_results(doc: ElementType, res: EngineResults):
-    for result in eval_xpath_list(doc, "//div[@id='mainResults']/div[contains(@class, 'resultsContainer')]"):
-        res.add(
-            res.types.MainResult(
-                url=_extract_url_from_redirect(
-                    extract_text(eval_xpath(result, "./div[contains(@class, 'urlAddressLink')]/a/@href")) or ""
-                ),
-                title=extract_text(eval_xpath(result, "./div[contains(@class, 'urlname')]")) or "",
-                content=extract_text(eval_xpath(result, "./div[contains(@class, 'urlSnippet')]")) or "",
-            )
-        )
-
-
-def _news_results(doc: ElementType, res: EngineResults):
-    for result in eval_xpath_list(
-        doc, "//div[contains(@class, 'newsResults')]/div[contains(@class, 'mediaResultNewsPage')]"
-    ):
-        res.add(
-            res.types.MainResult(
-                url=_extract_url_from_redirect(
-                    extract_text(eval_xpath(result, ".//div[contains(@class, 'mediaResultNewsPageTitle')]/a/@href"))
-                    or ""
-                ),
-                title=extract_text(eval_xpath(result, ".//div[contains(@class, 'mediaResultNewsPageTitle')]/a")) or "",
-                content=extract_text(eval_xpath(result, ".//div[contains(@class, 'mediaResultNewsPageDescription')]"))
-                or "",
-                thumbnail=extract_text(eval_xpath(result, ".//div[contains(@class, 'mediaResultThumbnail')]//img/@src"))
-                or "",
-            )
-        )
-
-
-def _video_results(doc: ElementType, res: EngineResults):
-    for result in eval_xpath_list(doc, "//div[@id='mainResults']/div[contains(@class, 'mediaResult')]"):
-        res.add(
-            res.types.MainResult(
-                template="videos.html",
-                url=extract_text(eval_xpath(result, "./@data-url")) or "",
-                title=extract_text(eval_xpath(result, ".//div[contains(@class, 'mediaResultTitleVideo')]/a")) or "",
-                content=extract_text(eval_xpath(result, ".//div[contains(@class, 'mediaResultDescription')]")) or "",
-                thumbnail=extract_text(eval_xpath(result, ".//img[contains(@class, 'videoThumbnail')]/@src")) or "",
-                author=extract_text(eval_xpath(result, ".//div[contains(@class, 'videoCreator')]")) or "",
-                length=parse_duration_string(
-                    extract_text(eval_xpath(result, ".//span[contains(@class, 'mediaResultDuration')]")) or ""
-                ),
-            )
-        )
-
-
-def _image_results(doc: ElementType, res: EngineResults):
-    for result in eval_xpath_list(doc, "//div[contains(@class, 'imageResultsWrapper')]/div"):
-        res.add(
-            res.types.Image(
-                url=_extract_url_from_redirect(
-                    extract_text(eval_xpath(result, ".//a[contains(@class, 'imageResultSource')]/@href")) or ""
-                ),
-                title=extract_text(eval_xpath(result, ".//a[contains(@class, 'imageResultTitle')]")) or "",
-                source=extract_text(eval_xpath(result, ".//div[contains(@class, 'imageResultSource')]")) or "",
-                thumbnail_src=extract_text(eval_xpath(result, "./@data-thumbnail-src")) or "",
-                img_src=extract_text(eval_xpath(result, "./@data-image-src")) or "",
-            )
-        )
-
-
-def response(resp: "SXNG_Response") -> EngineResults:
-    doc = html.fromstring(resp.text)
-    res = EngineResults()
-
-    match luxxle_categ:
-        case "search":
-            _general_results(doc, res)
-        case "images":
-            _image_results(doc, res)
-        case "videos":
-            _video_results(doc, res)
-        case "news":
-            _news_results(doc, res)
-        case _:
-            raise ValueError("unsupported category: %s" % luxxle_categ)
-
-    return res

searx/engines/mediathekviewweb.py

@@ -11,9 +11,9 @@ about = {
     "use_official_api": True,
     "require_api_key": False,
     "results": 'JSON',
+    "language": "de",
 }
 
-language = "de"
 categories = ['videos']
 paging = True
 time_range_support = False

searx/engines/mojeek.py

@@ -20,7 +20,6 @@ about = {
 }
 paging = True  # paging is only supported for general search
 safesearch = True
-language_support = True
 time_range_support = True  # time range search is supported for general and news
 max_page = 10
 

searx/engines/moviepilot.py

@@ -35,9 +35,8 @@ about = {
     'use_official_api': False,
     'require_api_key': False,
     'results': 'JSON',
+    'language': 'de',
 }
-language = "de"
-
 paging = True
 categories = ["movies"]
 

searx/engines/naver.py

@@ -26,8 +26,8 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": "HTML",
+    "language": "ko",
 }
-language = "ko"
 
 categories = []
 paging = True

searx/engines/niconico.py

@@ -13,8 +13,8 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": "HTML",
+    "language": "ja",
 }
-language = "ja"
 
 categories = ["videos"]
 paging = True

searx/engines/odysee.py

@@ -26,7 +26,6 @@ about = {
 # Engine configuration
 paging = True
 time_range_support = True
-language_support = True
 results_per_page = 20
 categories = ["videos"]
 

searx/engines/peertube.py

@@ -25,7 +25,6 @@ about = {
     "require_api_key": False,
     "results": "JSON",
 }
-language_support = True
 
 # engine dependent config
 categories = ["videos"]

searx/engines/photon.py

@@ -28,7 +28,7 @@ search_string = 'api/?{query}&limit={limit}'
 result_base_url = 'https://openstreetmap.org/{osm_type}/{osm_id}'
 
 # list of supported languages
-photon_supported_languages = ["de", "en", "fr", "it"]
+supported_languages = ['de', 'en', 'fr', 'it']
 
 
 # do search-request
@@ -37,7 +37,7 @@ def request(query, params):
 
     if params['language'] != 'all':
         language = params['language'].split('_')[0]
-        if language in photon_supported_languages:
+        if language in supported_languages:
             params['url'] = params['url'] + "&lang=" + language
 
     # using SearXNG User-Agent

searx/engines/podchaser.py

@@ -1,62 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-or-later
-"""Podchaser (podcasts)"""
-
-import typing as t
-
-from datetime import datetime
-from urllib.parse import urlencode
-
-from searx.result_types import EngineResults
-
-if t.TYPE_CHECKING:
-    from searx.extended_types import SXNG_Response
-    from searx.search.processors import OnlineParams
-
-about = {
-    "website": "https://www.podchaser.com",
-    "official_api_documentation": "https://www.podchaser.com/api",
-    "use_official_api": False,
-    "require_api_key": False,
-    "results": "JSON",
-}
-categories = []
-paging = True
-
-base_url = "https://api.podchaser.com"
-page_size = 25
-
-
-def request(query: str, params: "OnlineParams") -> None:
-    args = {
-        "filters[term]": query,
-        "limit": page_size,
-        "offset": (params["pageno"] - 1) * page_size,
-        "sort_direction": "desc",
-        "sort_order": "SORT_ORDER_RELEVANCE",
-    }
-    params["url"] = f"{base_url}/podcasts?{urlencode(args)}"
-    params["headers"]["Accept"] = "application/prs.podchaser.v2+json"
-
-
-def response(resp: "SXNG_Response"):
-    res = EngineResults()
-
-    json_results: list[dict[str, str]] = resp.json()["entities"]  # pyright: ignore[reportAny]
-
-    for result in json_results:
-        metadata = [f"{result['number_of_episodes']} episodes"]
-        if result["categories"]:
-            metadata.append(", ".join(c["text"] for c in result["categories"]))  # pyright: ignore[reportArgumentType]
-
-        res.add(
-            res.types.MainResult(
-                url=result["feed_url"],
-                title=result["title"],
-                content=result["description"],
-                thumbnail=result["image_url"],
-                publishedDate=datetime.strptime(result["created_at"], "%Y-%m-%d %H:%M:%S"),
-                metadata=" | ".join(metadata),
-            )
-        )
-
-    return res

searx/engines/presearch.py

@@ -77,7 +77,7 @@ from searx.utils import gen_useragent, html_to_text, parse_duration_string
 
 about = {
     "website": "https://presearch.io",
-    "wikidata_id": "Q7240905",
+    "wikidiata_id": "Q7240905",
     "official_api_documentation": "https://docs.presearch.io/nodes/api",
     "use_official_api": False,
     "require_api_key": False,

searx/engines/privacywall.py

@@ -1,217 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-or-later
-"""Privacywall_ claims to be a "privacy-friendly" search engine,
-but according to a `Privacyguides discussion`_ it's sharing private
-user information with Microsoft and Amazon.
-
-.. _Privacywall : https://www.privacywall.org
-.. _`Privacyguides discussion` : https://discuss.privacyguides.net/t/how-is-privacy-wall-search-engine/29486
-"""
-
-import typing as t
-from urllib.parse import urlencode, unquote_plus
-
-from lxml import html
-import babel
-
-from searx.enginelib.traits import EngineTraits
-from searx.utils import eval_xpath_list, eval_xpath, extract_text, get_embeded_stream_url, extr
-from searx.locales import region_tag
-from searx.result_types import EngineResults
-
-
-if t.TYPE_CHECKING:
-    from lxml.etree import ElementBase
-    from searx.extended_types import SXNG_Response
-    from searx.search.processors import OnlineParams
-
-about = {
-    "website": "https://privacywall.org",
-    "wikidata_id": None,
-    "official_api_documentation": None,
-    "use_official_api": False,
-    "require_api_key": False,
-    "results": "HTML",
-}
-
-paging = True
-safesearch = True
-time_range_support = True
-
-base_url = "https://www.privacywall.org"
-privacywall_category = "general"
-"""Supported categories are ``general``, ``videos`` and ``images``."""
-
-
-# corresponds to the "k" query param
-safesearch_map = {0: "off", 1: "on", 2: "on"}
-
-# page number sent for videos (is independent of the query) - certainly there's
-# a pattern in this, but for our use case it's enough to just support the first
-# 10 pages by hardcoding the page "numbers"
-video_page_map = {
-    2: "CAoQAA",
-    3: "CBQQAA",
-    4: "CB4QAA",
-    5: "CCgQAA",
-    6: "CDIQAA",
-    7: "CDwQAA",
-    8: "CEYQAA",
-    9: "CFAQAA",
-    10: "CFoQAA",
-}
-
-
-def init(_):
-    if privacywall_category not in ("general", "images", "videos"):
-        raise ValueError("invalid category: %s" % privacywall_category)
-
-
-def request(query: str, params: "OnlineParams") -> None:
-    if params["pageno"] > 10:
-        params["url"] = None
-        return
-
-    args = {"q": query, "safesearch": safesearch_map[params["safesearch"]]}
-    if params["searxng_locale"] != "all":
-        args["cc"] = traits.get_region(params["searxng_locale"]) or "US"
-    if params["time_range"]:
-        # time range uses the same "day", "week", "month", "year" naming scheme as SearXNG
-        args["time"] = params["time_range"]
-
-    if params["pageno"] > 1:
-        if privacywall_category == "images":
-            args["page"] = str(params["pageno"])
-        elif privacywall_category == "videos":
-            args["page"] = video_page_map[params["pageno"]]
-        else:
-            raise ValueError("general engine does not support pagination")
-
-    if privacywall_category == "general":
-        params["url"] = f"{base_url}/search/secure/?{urlencode(args)}"
-    else:
-        params["url"] = f"{base_url}/{privacywall_category}/?{urlencode(args)}"
-
-
-def _general_results(doc: "ElementBase") -> EngineResults:
-    res = EngineResults()
-    for result in eval_xpath_list(doc, "//div[@id='pw-results-main']/div[contains(@class, 'result-card')]"):
-        (
-            res.add(
-                res.types.MainResult(
-                    url=extract_text(eval_xpath(result, ".//a[contains(@class, 'result-url-anchor')]/@href")) or "",
-                    title=extract_text(eval_xpath(result, ".//div[contains(@class, 'result_title')]")) or "",
-                    content=extract_text(eval_xpath(result, ".//div[contains(@class, 'result-description')]")) or "",
-                ),
-            )
-        )
-    return res
-
-
-def _extract_thumbnail_url(url: str) -> str:
-    """
-    Get the URL from strings like "/videos/video.php?id=<urlencoded-urlhere>".
-    """
-    url_start = url.find("?id=") + len("?id=")
-    thumbnail = unquote_plus(url[url_start:])
-    return thumbnail
-
-
-def _image_results(doc: "ElementBase") -> EngineResults:
-    res = EngineResults()
-    for result in eval_xpath_list(doc, "//div[@id='container']/div[contains(@class, 'imgcontainer')]"):
-        (
-            res.add(
-                res.types.Image(
-                    url=extract_text(eval_xpath(result, "./a/@href")) or "",
-                    content=extract_text(eval_xpath(result, "./a/@alt")) or "",
-                    thumbnail_src=_extract_thumbnail_url(extract_text(eval_xpath(result, ".//img/@src")) or ""),
-                    source=extract_text(eval_xpath(result, ".//div[contains(@class, 'image-source-badge')]")) or "",
-                ),
-            )
-        )
-    return res
-
-
-def _video_results(doc: "ElementBase") -> EngineResults:
-    res = EngineResults()
-    for result in eval_xpath_list(
-        doc, "//div[contains(@class, 'video-container')]/div[contains(@class, 'video-card')]"
-    ):
-        url = extract_text(eval_xpath(result, "./a/@href")) or ""
-        if not url:
-            continue
-
-        thumbnail = None
-        # looks like <div style="background-image:url(/videos/video.php?id=<urlencoded-urlhere>);position:relative">
-        thumbnail_style = extract_text(eval_xpath(result, ".//div[contains(@class, 'video-img')]/@style"))
-        if thumbnail_style:
-            thumbnail = _extract_thumbnail_url(extr(thumbnail_style, ":url(", ")"))
-
-        res.add(
-            res.types.LegacyResult(
-                template="videos.html",
-                url=url,
-                title=extract_text(eval_xpath(result, ".//h2[contains(@class, 'video-card-title')]")) or "",
-                content=extract_text(eval_xpath(result, ".//p")) or "",
-                thumbnail=thumbnail or "",
-                iframe_src=get_embeded_stream_url(url) or "",
-            )
-        )
-
-    return res
-
-
-def response(resp: "SXNG_Response") -> EngineResults:
-    doc = html.fromstring(resp.text)
-    match privacywall_category:
-        case "general":
-            return _general_results(doc)
-        case "images":
-            return _image_results(doc)
-        case "videos":
-            return _video_results(doc)
-        case _:
-            raise ValueError("invalid category: %s" % privacywall_category)
-
-
-def fetch_traits(engine_traits: EngineTraits) -> None:
-    """Fetch regions from Bing-Web."""
-    # pylint: disable=import-outside-toplevel
-
-    from searx.network import get  # see https://github.com/searxng/searxng/issues/762
-    from searx.utils import gen_useragent
-
-    headers = {
-        "User-Agent": gen_useragent(),
-    }
-
-    resp = get(base_url, headers=headers)
-    if not resp.ok:
-        raise RuntimeError("Response from Privacywall is not OK.")
-
-    dom = html.fromstring(resp.text)
-
-    # <div class="dropdown-option" onclick="changeMenuLanguage(&quot;CZ&quot;)"></div>
-    for onclick_listener in eval_xpath(
-        dom, "//div[contains(@class, 'lang-menu')]//div[contains(@class, 'dropdown-option')]/@onclick"
-    ):
-        # this is either a normal lang-country tag (e.g. cs-cz) or only a country code (e.g. de, at, ...)
-        country_tag = extr(onclick_listener, "(\"", "\")")
-
-        # the locale tag is only a country tag, so we get languages the from the list of official languages
-        # of the country
-        lang_tag: str
-        for lang_tag in babel.languages.get_official_languages(country_tag, de_facto=True):  # pyright: ignore
-            try:
-                sxng_tag = region_tag(babel.Locale.parse(f"{lang_tag}_{country_tag.upper()}"))
-            except babel.UnknownLocaleError:
-                # silently ignore unknown languages
-                continue
-
-            conflict = engine_traits.regions.get(sxng_tag)
-            if conflict:
-                if conflict != sxng_tag:
-                    print("CONFLICT: babel %s --> %s" % (sxng_tag, conflict))
-                continue
-
-            engine_traits.regions[sxng_tag] = country_tag

searx/engines/quark.py

@@ -16,8 +16,8 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": "HTML",
+    "language": "zh",
 }
-language = "zh"
 
 # Engine Configuration
 categories = []

searx/engines/radio_browser.py

@@ -26,7 +26,6 @@ about = {
     "require_api_key": False,
     "results": "JSON",
 }
-language_support = True
 paging = True
 categories = ["music", "radio"]
 

searx/engines/resulthunter.py

@@ -1,120 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-or-later
-"""Resulthunter_ is an American search engine with results from Brave.
-
-.. _Resulthunter : https://resulthunter.com
-"""
-
-import typing as t
-from urllib.parse import urlencode
-
-from lxml import html
-
-from searx import locales
-from searx.result_types import EngineResults
-from searx.utils import eval_xpath_list, eval_xpath, extract_text
-
-# as it uses brave internally, it has the same locales and timerange/safesearch types
-from searx.engines.brave import safesearch_map, time_range_map, fetch_traits  # pylint: disable=unused-import
-
-if t.TYPE_CHECKING:
-    from lxml.etree import ElementBase
-    from searx.extended_types import SXNG_Response
-    from searx.search.processors import OnlineParams
-    from searx.enginelib.traits import EngineTraits
-
-    traits: EngineTraits
-
-about = {
-    "website": "https://resulthunter.com",
-    "wikidata_id": None,
-    "official_api_documentation": None,
-    "use_official_api": False,
-    "require_api_key": False,
-    "results": "HTML",
-}
-
-paging = True
-safesearch = True
-time_range_support = True
-
-base_url = "https://resulthunter.com"
-resulthunter_categ = "web"
-"""Supported categories are ``web`` and ``images``."""
-
-
-def init(_):
-    if resulthunter_categ not in ("web", "images"):
-        raise ValueError("invalid category: %s" % resulthunter_categ)
-
-
-def request(query: str, params: "OnlineParams") -> None:
-    args = {
-        "q": query,
-        "search_type": resulthunter_categ,
-        "offset": params["pageno"] - 1,
-    }
-
-    # uses Brave's engine traits
-    ui_lang = locales.get_engine_locale(params["searxng_locale"], traits.custom["ui_lang"], "all")
-    if ui_lang and ui_lang != "all":
-        args["search_lang"] = ui_lang.split("-")[0]
-
-    engine_region = traits.get_region(params["searxng_locale"], "all")
-    if engine_region and engine_region != "all":
-        args["country"] = engine_region
-
-    if params["time_range"]:
-        args["freshness"] = time_range_map[params["time_range"]]
-
-    params["cookies"]["safesearch"] = safesearch_map[params["safesearch"]]
-
-    params["url"] = f"{base_url}/search?{urlencode(args)}"
-
-
-def _general_results(doc: "ElementBase") -> EngineResults:
-    res = EngineResults()
-    for result in eval_xpath_list(
-        doc, "//div[contains(@class, 'organic-results-container')]/div/div[contains(@class, 'group')]"
-    ):
-        url = extract_text(eval_xpath(result, ".//a/@href"))
-        if not url:
-            continue
-        (
-            res.add(
-                res.types.MainResult(
-                    url=url,
-                    title=extract_text(eval_xpath(result, ".//a/h3")) or "",
-                    content=extract_text(eval_xpath(result, ".//p")) or "",
-                ),
-            )
-        )
-    return res
-
-
-def _image_results(doc: "ElementBase") -> EngineResults:
-    res = EngineResults()
-    for result in eval_xpath_list(
-        doc, "//div[contains(@class, 'organic-results-container')]//a[contains(@class, 'group')]"
-    ):
-        (
-            res.add(
-                res.types.Image(
-                    url=extract_text(eval_xpath(result, "./@href")) or "",
-                    title=extract_text(eval_xpath(result, "./img/@alt")) or "",
-                    thumbnail_src=extract_text(eval_xpath(result, "./img/@src")) or "",
-                ),
-            )
-        )
-    return res
-
-
-def response(resp: "SXNG_Response") -> EngineResults:
-    doc = html.fromstring(resp.text)
-
-    match resulthunter_categ:
-        case "web":
-            return _general_results(doc)
-        case "images":
-            return _image_results(doc)
-        case _:
-            raise ValueError("invalid resulthunter category: %s" % resulthunter_categ)

searx/engines/s1search.py

@@ -1,98 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-or-later
-"""Search engines by System1 (general).
-
-System1 is an advertising company, and provides all its search engines as a
-subdomain of ``s1search.co``.  As a result, it has more than 1000 subdomains, of
-which some work, and some don't.
-
-Some of the engines get their results from Google, others get them from Yahoo.
-"""
-
-import typing as t
-from urllib.parse import urlencode, urlparse, parse_qs
-
-from lxml import html
-
-from searx.result_types import EngineResults
-from searx.enginelib import EngineCache
-from searx.utils import eval_xpath_list, eval_xpath, extract_text
-
-if t.TYPE_CHECKING:
-    from searx.search.processors import OnlineParams
-    from searx.extended_types import SXNG_Response
-
-about = {
-    "website": "https://s1search.co",
-    "official_api_documentation": None,
-    "use_official_api": False,
-    "require_api_key": False,
-    "results": "HTML",
-}
-
-base_url = ""  # alternatively: search.gmx.net
-categories = ["general"]
-
-paging = True
-
-CACHE: EngineCache
-"""Cache to store verification tokens for pagination."""
-
-
-def init(_):
-    if not base_url:
-        raise ValueError("base_url must be set")
-
-
-def setup(engine_settings: dict[str, t.Any]) -> bool:
-    global CACHE  # pylint: disable=global-statement
-    CACHE = EngineCache(engine_settings["name"])
-    return True
-
-
-def _cache_key(query: str, pageno: int) -> str:
-    return f"{query}|{pageno}"
-
-
-def request(query: str, params: "OnlineParams"):
-    args = {"q": query, "page": params["pageno"]}
-    if params["pageno"] > 1:
-        sc = CACHE.get(_cache_key(query, params["pageno"]))
-        # sc is required for pagination to avoid rate-limits
-        if not sc:
-            params["url"] = None
-            return
-
-        args["sc"] = sc
-
-    params["url"] = f"{base_url}/serp?{urlencode(args)}"
-
-
-def response(resp: "SXNG_Response") -> EngineResults:
-    res = EngineResults()
-
-    doc = html.fromstring(resp.text)
-
-    for suggestion in eval_xpath_list(doc, "//div[@class='aylf-yahoo-bottom' or @class='aylf-yahoo-sidebar']/div"):
-        res.add(res.types.LegacyResult({"suggestion": extract_text(suggestion)}))
-
-    for result in eval_xpath_list(
-        doc, "//div[contains(@class, 'web-yahoo') or contains(@class, 'web-google')]/div[contains(@class, '__result')]"
-    ):
-        res.add(
-            res.types.MainResult(
-                url=extract_text(eval_xpath(result, ".//a[contains(@class, 'title')]/@href")),
-                title=extract_text(eval_xpath(result, ".//a[contains(@class, 'title')]")),
-                content=extract_text(eval_xpath(result, ".//span[contains(@class, 'description') or @class='']")),
-            )
-        )
-
-    # store pagination keys to be able to access next pages
-    for page_href in eval_xpath_list(doc, "//a[contains(@class, 'pagination__num')]"):
-        # target_url looks like "/serp?q=test&page=2&sc=RVlBPMDPVhWR20"
-        target_url = extract_text(eval_xpath(page_href, "./@href"))
-        target_url = parse_qs(urlparse(target_url).query)
-        pageno = int(target_url["page"][0])
-        sc = target_url["sc"][0]
-        CACHE.set(_cache_key(resp.search_params["query"], pageno), sc)
-
-    return res

searx/engines/senscritique.py

@@ -13,8 +13,8 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": 'JSON',
+    'language': 'fr',
 }
-language = "fr"
 
 categories = ['movies']
 paging = True

searx/engines/sepiasearch.py

@@ -25,7 +25,6 @@ about = {
     "require_api_key": False,
     "results": 'JSON',
 }
-language_support = True
 
 # engine dependent config
 categories = ['videos']

searx/engines/seznam.py

@@ -19,8 +19,8 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": "HTML",
+    "language": "cz",
 }
-language = "cz"
 
 categories = ['general', 'web']
 base_url = 'https://search.seznam.cz/'

searx/engines/sogou.py

@@ -16,8 +16,8 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": "HTML",
+    "language": "zh",
 }
-language = "zh"
 
 # Engine Configuration
 categories = ["general"]

searx/engines/sogou_videos.py

@@ -11,8 +11,8 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": "JSON",
+    "language": "zh",
 }
-language = "zh"
 
 categories = ["videos"]
 paging = True

searx/engines/sogou_wechat.py

@@ -14,8 +14,8 @@ about = {
     "use_official_api": False,
     "require_api_key": False,
     "results": "HTML",
+    "language": "zh",
 }
-language = "zh"
 
 # Engine Configuration
 categories = ["news"]

searx/engines/startpage.py

@@ -131,7 +131,6 @@ max_page = 18
 """Tested 18 pages maximum (argument ``page``), to be save max is set to 20."""
 
 time_range_support = True
-language_support = True
 safesearch = True
 
 time_range_dict = {"day": "d", "week": "w", "month": "m", "year": "y"}
@@ -383,9 +382,6 @@ def _get_image_result(result) -> dict[str, t.Any] | None:
         size_str = "".join(filter(str.isdigit, result["filesize"]))
         filesize = humanize_bytes(int(size_str))
 
-    img_format = result.get("format").upper()
-    if img_format == "UNKNOWN":
-        img_format = ""
     return {
         "template": "images.html",
         "url": url,
@@ -394,7 +390,7 @@ def _get_image_result(result) -> dict[str, t.Any] | None:
         "img_src": result.get("rawImageUrl"),
         "thumbnail_src": thumbnailUrl,
         "resolution": resolution,
-        "img_format": img_format,
+        "img_format": result.get("format"),
         "filesize": filesize,
     }
 

searx/engines/tagesschau.py

@@ -27,9 +27,8 @@ about = {
     'use_official_api': True,
     'require_api_key': False,
     'results': 'JSON',
+    'language': 'de',
 }
-language = "de"
-
 categories = ['general', 'news']
 paging = True
 

searx/engines/tiger.py

@@ -134,12 +134,9 @@ def response(resp: "SXNG_Response") -> EngineResults:
 
     if tiger_category == "Websuche":
         for result in eval_xpath_list(doc, "//div[@id='mainContainer']//table/tr"):
-            url = extract_text(eval_xpath(result, ".//a[contains(@class, 'weblink')]/@href"))
-            if not url:
-                continue
             res.add(
                 res.types.MainResult(
-                    url=url,
+                    url=extract_text(eval_xpath(result, ".//a[contains(@class, 'weblink')]/@href")),
                     title=extract_text(eval_xpath(result, ".//a[contains(@class, 'weblink')]")) or "",
                     content=extract_text(eval_xpath(result, ".//*[contains(@class, 'webbodynopic')]")) or "",
                 )

searx/engines/tonline.py

@@ -1,148 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-or-later
-"""T-Online_ is a German news portal, which is powered by Ströer, a German
-advertising company, not by Deutsche Telekom (contrary to its name).
-
-It gets its web results from Google, image results from Flickr and videos
-results from YouTube.
-
-.. _T-Online: https://www.t-online.de/
-
-"""
-
-import typing as t
-from urllib.parse import urlencode
-
-from lxml import html
-
-from searx.utils import eval_xpath_list, eval_xpath, extract_text, get_embeded_stream_url, ElementType
-from searx.result_types import EngineResults
-from searx.enginelib import EngineAbout
-
-if t.TYPE_CHECKING:
-    from searx.extended_types import SXNG_Response
-    from searx.search.processors import OnlineParams
-
-about = EngineAbout(
-    website="https://www.t-online.de",
-    wikidata_id="Q590940",
-    results="HTML",
-)
-
-paging = True
-time_range_support = True
-
-base_url = "https://suche.t-online.de"
-tonline_categ = "web"
-"""Supported categories are ``web``, ``videos``, ``news`` and ``images``."""
-
-time_range_map = {"day": "d", "week": "w", "month": "m", "year": "y"}
-
-# result provider has to be specified during pagination, pagination can alternatively
-# use "tonline" to only search for results from t-online news articles
-tonline_channel_map = {"images": "flickr", "videos": "yt"}
-
-language = "de"
-
-
-def init(_):
-    if tonline_categ not in ("web", "images", "videos", "news"):
-        raise ValueError("invalid category: %s" % tonline_categ)
-
-
-def request(query: str, params: "OnlineParams") -> None:
-    # "mandant", "dia" and "ptl" are not needed, but this might reduce changes of captchas
-    args = {"q": query, "mandant": "toi", "dia": "suche", "ptl": "std"}
-    if params["time_range"]:
-        args["age"] = time_range_map[params["time_range"]]
-
-    if params["pageno"] > 1 and tonline_categ in tonline_channel_map:
-        ch = tonline_channel_map[tonline_categ]
-        args["ch"] = ch
-        args[f"{ch}_page"] = str(params["pageno"])
-    else:
-        args["page"] = str(params["pageno"])
-
-    params["url"] = f"{base_url}/{tonline_categ}?{urlencode(args)}"
-
-
-def _general_results(doc: ElementType, res: EngineResults):
-    result: ElementType
-    for result in eval_xpath_list(doc, "//div[@id='google_re']/div[contains(@class, 'doc')]"):
-        (
-            res.add(
-                res.types.MainResult(
-                    url=extract_text(eval_xpath(result, "./a/@href") or ""),
-                    title=extract_text(eval_xpath(result, ".//span[contains(@class, 'tMMReshl')]") or "") or "",
-                    content=extract_text(eval_xpath(result, ".//div[contains(@class, 'tMMRest')]") or "") or "",
-                ),
-            )
-        )
-    suggestion: ElementType
-    for suggestion in eval_xpath_list(doc, "//div[starts-with(@class, 'rsbl')]/a"):
-        res.add(res.types.LegacyResult({"suggestion": extract_text(suggestion)}))
-
-
-def _image_results(doc: ElementType, res: EngineResults):
-    result: ElementType
-    for result in eval_xpath_list(doc, "//div[@class='doc']"):
-        (
-            res.add(
-                res.types.Image(
-                    url=extract_text(eval_xpath(result, "./a/@href") or ""),
-                    title=extract_text(eval_xpath(result, ".//div[contains(@class, 'doc_info')]") or "") or "",
-                    thumbnail_src=extract_text(eval_xpath(result, ".//img/@src") or "") or "",
-                ),
-            )
-        )
-
-
-def _news_results(doc: ElementType, res: EngineResults):
-    result: ElementType
-    title_parts: list[ElementType]
-    for result in eval_xpath_list(doc, "//div[@id='portal_re']/div[contains(@class, 'doc')]"):
-        title_parts = eval_xpath(result, ".//a[starts-with(@class, 'tMMReshl')]")
-        (
-            res.add(
-                res.types.MainResult(
-                    url=extract_text(eval_xpath(result, "(./a/@href)[1]") or ""),
-                    title=" - ".join(extract_text(part) or "" for part in title_parts),
-                    content=extract_text(eval_xpath(result, ".//div[contains(@class, 'tMMRest')]") or "") or "",
-                    thumbnail=extract_text(eval_xpath(result, ".//img[contains(@class, 'desk')]/@src") or "") or "",
-                ),
-            )
-        )
-
-
-def _video_results(doc: ElementType, res: EngineResults):
-    result: ElementType
-    for result in eval_xpath_list(doc, "//div[@class='doc']"):
-        url: str | None = extract_text(eval_xpath(result, "./a/@href") or "")
-        if url is None:
-            continue
-        title_parts: list[ElementType] = eval_xpath(result, ".//a[starts-with(@class, 'tMMReshl')]")
-        res.add(
-            res.types.LegacyResult(
-                template="videos.html",
-                url=url,
-                title=" - ".join(extract_text(part) or "" for part in title_parts),
-                thumbnail=extract_text(eval_xpath(result, ".//img/@src") or "") or "",
-                iframe_src=get_embeded_stream_url(url) or "",
-            )
-        )
-
-
-def response(resp: "SXNG_Response") -> EngineResults:
-    doc = html.fromstring(resp.text)
-    res = EngineResults()
-    match tonline_categ:
-        case "web":
-            _general_results(doc, res)
-        case "news":
-            _news_results(doc, res)
-        case "images":
-            _image_results(doc, res)
-        case "videos":
-            _video_results(doc, res)
-        case _:
-            raise ValueError("invalid category: %s" % tonline_categ)
-    return res

searx/engines/vuhuv.py

@@ -1,114 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-or-later
-"""Vuhuv_ is a Turkish search engine, that also provides English results.
-
-.. _Vuhuv : https://vuhuv.com
-"""
-
-import typing as t
-from urllib.parse import urlencode
-
-from lxml import html
-
-from searx.result_types import EngineResults
-from searx.utils import eval_xpath_list, eval_xpath, extract_text
-
-
-if t.TYPE_CHECKING:
-    from lxml.etree import ElementBase
-    from searx.extended_types import SXNG_Response
-    from searx.search.processors import OnlineParams
-
-about = {
-    "website": "https://vuhuv.com",
-    "wikidata_id": None,
-    "official_api_documentation": None,
-    "use_official_api": False,
-    "require_api_key": False,
-    "results": "HTML",
-}
-
-paging = True
-
-base_url = "https://vuhuv.com"
-vuhuv_category = "general"
-"""Supported categories are ``general``, ``videos`` and ``images``."""
-
-
-# corresponds to the "k" query param
-category_map = {"general": 1, "images": 2, "videos": 3}
-
-
-def init(_):
-    if vuhuv_category not in category_map:
-        raise ValueError("invalid category: %s" % vuhuv_category)
-
-
-def request(query: str, params: "OnlineParams") -> None:
-    # the purpose of "d" and "dh" are unknown, but the website
-    # sends them, and without them the results are different
-    args = {"k": category_map[vuhuv_category], "p": params["pageno"], "q": query, "d": 1, "dh": 1}
-    params["url"] = f"{base_url}/veri2/?{urlencode(args)}"
-    params["headers"]["Referer"] = f"{base_url}/"
-
-
-def _general_results(doc: "ElementBase") -> EngineResults:
-    res = EngineResults()
-    for result in eval_xpath_list(doc, "//div[contains(@class, 'sonuc')]/div"):
-        (
-            res.add(
-                res.types.MainResult(
-                    url=extract_text(eval_xpath(result, "./a/@href")) or "",
-                    title=extract_text(eval_xpath(result, "./a/span")) or "",
-                    content=extract_text(eval_xpath(result, "./ins")) or "",
-                ),
-            )
-        )
-    return res
-
-
-def _image_results(doc: "ElementBase") -> EngineResults:
-    res = EngineResults()
-    for result in eval_xpath_list(doc, "//div[contains(@class, 'item gorsel')]"):
-        (
-            res.add(
-                res.types.Image(
-                    url=extract_text(eval_xpath(result, "./a/@href")) or "",
-                    title=extract_text(eval_xpath(result, "./a/@title")) or "",
-                    resolution=extract_text(eval_xpath(result, "div[contains(@class, 'olculeri')]")) or "",
-                    thumbnail_src="https:" + str(extract_text(eval_xpath(result, "./@data-kgorsel"))),
-                    img_src=extract_text(eval_xpath(result, "./@data-resimurl")) or "",
-                ),
-            )
-        )
-    return res
-
-
-def _video_results(doc: "ElementBase") -> EngineResults:
-    res = EngineResults()
-    for result in eval_xpath_list(doc, "//div[contains(@class, 'item video')]"):
-        (
-            res.add(
-                res.types.MainResult(
-                    template="videos.html",
-                    url=extract_text(eval_xpath(result, "./a/@href")) or "",
-                    title=extract_text(eval_xpath(result, "./a/@title")) or "",
-                    content=extract_text(eval_xpath(result, ".//div[contains(@class, 'abaslik')]")) or "",
-                    thumbnail=extract_text(eval_xpath(result, "./@data-kgorsel")) or "",
-                    iframe_src=extract_text(eval_xpath(result, "./@data-embedurl")) or "",
-                ),
-            )
-        )
-    return res
-
-
-def response(resp: "SXNG_Response") -> EngineResults:
-    doc = html.fromstring(resp.text)
-    match vuhuv_category:
-        case "general":
-            return _general_results(doc)
-        case "images":
-            return _image_results(doc)
-        case "videos":
-            return _video_results(doc)
-        case _:
-            raise ValueError("invalid vuhuv category: %s" % vuhuv_category)

searx/engines/wikidata.py

@@ -40,7 +40,6 @@ about = {
     "require_api_key": False,
     "results": 'JSON',
 }
-language_support = True
 
 display_type = ["infobox"]
 """A list of display types composed from ``infobox`` and ``list``.  The latter

searx/engines/wikipedia.py

@@ -72,7 +72,6 @@ about = {
     "require_api_key": False,
     "results": "JSON",
 }
-language_support = True
 
 display_type = ["infobox"]
 """A list of display types composed from ``infobox`` and ``list``.  The latter

searx/engines/xpath.py

@@ -76,9 +76,6 @@ from lxml import html
 from searx.utils import extract_text, extract_url, eval_xpath, eval_xpath_list
 from searx.network import raise_for_httperror
 from searx.result_types import EngineResults
-from searx.enginelib import EngineAbout
-
-about = EngineAbout()
 
 search_url = None
 """
@@ -292,7 +289,7 @@ def response(resp) -> EngineResults:  # pylint: disable=too-many-branches
 
     if results_xpath:
         for result in eval_xpath_list(dom, results_xpath):
-            url = extract_url(eval_xpath(result, url_xpath), search_url)
+            url = extract_url(eval_xpath_list(result, url_xpath, min_len=1), search_url)
             title = extract_text(eval_xpath_list(result, title_xpath, min_len=1))
             content = extract_text(eval_xpath_list(result, content_xpath))
             tmp_result = {'url': url, 'title': title, 'content': content}

searx/engines/yep.py

@@ -22,7 +22,6 @@ about = {
     "require_api_key": False,
     "results": "JSON",
 }
-language_support = True
 
 base_url = "https://api.yep.com"
 web_base_url = "https://yep.com"

searx/engines/zlibrary.py

@@ -61,7 +61,6 @@ about: dict[str, t.Any] = {
 
 categories: list[str] = ["files", "books"]
 paging: bool = True
-language_support = True
 base_url: str = "https://zlibrary-global.se"
 
 zlib_year_from: str = ""

searx/result_types/__init__.py

@@ -24,8 +24,6 @@ __all__ = [
     "Code",
     "Paper",
     "File",
-    "Image",
-    "ImageRef",
 ]
 
 import typing as t
@@ -37,7 +35,7 @@ from .keyvalue import KeyValue
 from .code import Code
 from .paper import Paper
 from .file import File
-from .image import Image, ImageRef
+from .image import Image
 
 
 class ResultList(list[Result | LegacyResult], abc.ABC):

searx/result_types/image.py

@@ -7,51 +7,14 @@ template.
    :members:
    :show-inheritance:
 
-.. autoclass:: ImageRef
-   :members:
-
 """
-# pylint: disable=too-few-public-methods
-__all__ = ["Image", "ImageRef"]
 
-import types
+__all__ = ["Image"]
+
 import typing as t
-from collections.abc import Callable
-
-import msgspec
-
-from ._base import MainResult, Result, log, LegacyResult
-
-MimeSubType = t.Literal["png", "svg+xml", "jpeg", "bmp", "x-icon", "tiff"]
-
-MIMESUB: dict[MimeSubType, str] = {
-    "png": "PNG",
-    "svg+xml": "SVG",
-    "jpeg": "JPG",
-    "bmp": "BMP",
-    "x-icon": "ICO",
-    "tiff": "TIF",
-}
 
 
-class ImageRef(msgspec.Struct, kw_only=True):
-    """Reference to an (alternative) image format"""
-
-    url: str
-    """URL of the image reference."""
-
-    subtype: MimeSubType
-    """Subtype (mimetype) of the image format."""
-
-    label: str = ""
-    """Label of the reference, default is build from the uppercase of
-    :py:obj:`Image.ImageRef.subtype`."""
-
-    mtype: t.Literal["image"] = "image"
-
-    def __post_init__(self):
-        if not self.label:
-            self.label = MIMESUB.get(self.subtype, self.subtype.upper())
+from ._base import MainResult
 
 
 @t.final
@@ -79,29 +42,3 @@ class Image(MainResult, kw_only=True):
     filesize: str = ""
     """Size of bytes in :py:obj:`human readable <searx.humanize_bytes>` notation
     (e.g. ``1MB`` for ``1024*1024`` Bytes filesize)."""
-
-    formats: list[ImageRef] = []
-    """List of links to alternative image formats."""
-
-    def filter_urls(self, filter_func: "Callable[[Result | LegacyResult, str, str], str | bool ]"):
-
-        for _ref in self.formats[:]:
-            _name = f"Image.formats:{_ref.label}"
-            try:
-                _url = filter_func(self, _name, _ref.url)
-            except Exception as exc:  # pylint: disable=broad-exception-caught
-                # pylint: disable=no-member
-                _tb: types.TracebackType = exc.__traceback__.tb_next.tb_next  # type: ignore
-                _fn = _tb.tb_frame.f_code.co_filename
-                _lno = _tb.tb_lineno
-                log.error("filter_urls: [%s] ignore %s from callback %s:%s", _name, repr(exc), _fn, _lno)
-                continue
-
-            if isinstance(_url, str):
-                log.debug("filter_urls: [%s] URL %s -> %s", _name, _ref.url, _url)
-                _ref.url = _url
-            elif not _url:
-                log.debug("filter_urls: [%s] drop ref %s", _name, _ref)
-                self.formats.remove(_ref)
-
-        return super().filter_urls(filter_func)

searx/search/processors/__init__.py

@@ -11,7 +11,6 @@ __all__ = [
     "PROCESSORS",
     "ParamTypes",
     "RequestParams",
-    "ProcessorType",
 ]
 
 import typing as t
@@ -28,14 +27,6 @@ from .online_url_search import OnlineUrlSearchProcessor, OnlineUrlSearchParams
 
 logger = logger.getChild("search.processors")
 
-ProcessorType = t.Literal[
-    "offline",
-    "online",
-    "online_currency",
-    "online_dictionary",
-    "online_url_search",
-]
-
 OnlineParamTypes: t.TypeAlias = OnlineParams | OnlineDictParams | OnlineCurrenciesParams | OnlineUrlSearchParams
 OfflineParamTypes: t.TypeAlias = RequestParams
 ParamTypes: t.TypeAlias = OfflineParamTypes | OnlineParamTypes

searx/settings.yml

@@ -41,8 +41,8 @@ search:
   # Filter results. 0: None, 1: Moderate, 2: Strict
   safe_search: 0
   # Existing autocomplete backends: "360search", "baidu", "bing", "brave", "dbpedia", "duckduckgo", "google",
-  # "yandex", "privacywall", "mwmbl", "naver", "seznam", "sogou", "startpage", "swisscows", "quark", "qwant",
-  # "wikipedia" - leave blank to turn it off by default.
+  # "yandex", "mwmbl", "naver", "seznam", "sogou", "startpage", "swisscows", "quark", "qwant", "wikipedia" -
+  # leave blank to turn it off by default.
   autocomplete: ""
   # minimun characters to type before autocompleter starts
   autocomplete_min: 4
@@ -320,24 +320,6 @@ engines:
     shortcut: 9g
     disabled: true
 
-  - name: abcnyheter
-    engine: xpath
-    categories: general
-    paging: true
-    search_url: https://startsiden.abcnyheter.no/sok/?q={query}&page={pageno}
-    shortcut: abc
-    disabled: true
-    results_xpath: //ul[contains(@class, "results__list")]/li[contains(@class, "result")]
-    url_xpath: ./a/@href
-    title_xpath: ./a/h3
-    content_xpath: ./div
-    language: "no"
-    about:
-      website: https://abcnyheter.no
-      use_official_api: false
-      require_api_key: false
-      results: HTML
-
   - name: acfun
     engine: acfun
     shortcut: acf
@@ -444,6 +426,27 @@ engines:
     shortcut: conda
     disabled: true
 
+  - name: aol
+    engine: aol
+    search_type: search
+    categories: [general]
+    shortcut: aol
+    disabled: true
+
+  - name: aol images
+    engine: aol
+    search_type: image
+    categories: [images]
+    shortcut: aoli
+    disabled: true
+
+  - name: aol videos
+    engine: aol
+    search_type: video
+    categories: [videos]
+    shortcut: aolv
+    disabled: true
+
   - name: arch linux wiki
     engine: archlinux
     shortcut: al
@@ -471,23 +474,6 @@ engines:
     engine: arxiv
     shortcut: arx
 
-  - name: ayo
-    engine: xpath
-    categories: general
-    shortcut: ayo
-    search_url: https://search.ayo.de/search?q={query}
-    results_xpath: //div[contains(@class, 'search-result')]/div
-    url_xpath: .//a/@href
-    title_xpath: .//h3
-    content_xpath: .//p
-    suggestion_xpath: .//a[starts-with(@href, "https://search.ayo.de")]
-    disabled: true
-    about:
-      website: https://serach.ayo.de
-      use_official_api: false
-      require_api_key: false
-      results: HTML
-
   - name: azure
     engine: azure
     shortcut: az
@@ -623,12 +609,6 @@ engines:
     shortcut: ca
     disabled: true
 
-  # - name: chatnoir
-  #   engine: chatnoir
-  #   shortcut: cha
-  #   search_index: cw22
-  #   disabled: true
-
   - name: chefkoch
     engine: chefkoch
     shortcut: chef
@@ -934,24 +914,6 @@ engines:
     timeout: 3.0
     disabled: true
 
-  - name: fastbot
-    engine: xpath
-    search_url: https://fastbot.de/search?q={query}
-    results_xpath: //section[contains(@class, 'organic-results')]/div[contains(@class, 'result-item')]
-    url_xpath: (./a/@href)[last()]
-    title_xpath: (./a)[last()]
-    content_xpath: ./div[contains(@class, 'snippet')]
-    suggestion_xpath: //section[contains(@class, 'related-searches')]//a/span[1]
-    shortcut: fa
-    categories: general
-    disabled: true
-    about:
-      website: https://fastbot.de
-      official_api_documentation:
-      use_official_api: false
-      require_api_key: false
-      results: HTML
-
   - name: fdroid
     engine: fdroid
     shortcut: fd
@@ -1060,7 +1022,6 @@ engines:
 
   - name: gabanza
     engine: xpath
-    categories: general
     search_url: https://www.gabanza.com/search?query={query}
     shortcut: gab
     timeout: 4
@@ -1475,38 +1436,6 @@ engines:
     shortcut: luc
     timeout: 3.0
 
-  - name: luxxle
-    engine: luxxle
-    categories: general
-    luxxle_categ: search
-    shortcut: lux
-    disabled: true
-    inactive: true
-
-  - name: luxxle images
-    engine: luxxle
-    categories: images
-    luxxle_categ: images
-    shortcut: luxi
-    disabled: true
-    inactive: true
-
-  - name: luxxle videos
-    engine: luxxle
-    categories: videos
-    luxxle_categ: videos
-    shortcut: luxv
-    disabled: true
-    inactive: true
-
-  - name: luxxle news
-    engine: luxxle
-    categories: news
-    luxxle_categ: news
-    shortcut: luxn
-    disabled: true
-    inactive: true
-
   - name: marginalia
     engine: marginalia
     shortcut: mar
@@ -1865,11 +1794,6 @@ engines:
   #    query_str: 'SELECT * from my_table WHERE my_column = %(query)s'
   #    shortcut : psql
 
-  - name: podchaser
-    engine: podchaser
-    shortcut: poc
-    disabled: true
-
   - name: presearch
     engine: presearch
     search_type: search
@@ -2009,27 +1933,6 @@ engines:
     engine: radio_browser
     shortcut: rb
 
-  - name: rawweb
-    engine: json_engine
-    shortcut: rw
-    categories: general
-    paging: true
-    search_url: 'https://api.rawweb.org/api/search?keyword={query}&page={pageno}&lang=*'
-    results_query: data
-    url_query: link
-    title_query: title
-    content_query: content
-    title_html_to_text: true
-    content_html_to_text: true
-    disabled: true
-    inactive: true
-    about:
-      website: https://rawweb.org
-      official_api_documentation:
-      use_official_api: false
-      require_api_key: false
-      results: JSON
-
   - name: reddit
     engine: reddit
     shortcut: re
@@ -2150,28 +2053,6 @@ engines:
     base_url: 'https://discourse.pi-hole.net'
     disabled: true
 
-  - name: privacywall
-    engine: privacywall
-    categories: general
-    privacywall_category: general
-    paging: false  # only images and videos support pagination
-    shortcut: pw
-    disabled: true
-
-  - name: privacywall images
-    engine: privacywall
-    categories: images
-    privacywall_category: images
-    shortcut: pwi
-    disabled: true
-
-  - name: privacywall videos
-    engine: privacywall
-    categories: videos
-    privacywall_category: videos
-    shortcut: pwv
-    disabled: true
-
   # - name: searx
   #   engine: searx_engine
   #   shortcut: se
@@ -2311,36 +2192,6 @@ engines:
     shortcut: tm
     disabled: true
 
-  - name: tonline
-    engine: tonline
-    shortcut: tol
-    disabled: true
-    inactive: true
-
-  - name: tonline images
-    engine: tonline
-    categories: images
-    tonline_categ: images
-    shortcut: toli
-    disabled: true
-    inactive: true
-
-  - name: tonline videos
-    engine: tonline
-    categories: videos
-    tonline_categ: videos
-    shortcut: tolv
-    disabled: true
-    inactive: true
-
-  - name: tonline news
-    engine: tonline
-    categories: news
-    tonline_categ: news
-    shortcut: toln
-    disabled: true
-    inactive: true
-
   # Requires Tor
   - name: torch
     engine: xpath
@@ -2779,107 +2630,12 @@ engines:
     categories: videos
     disabled: true
 
-  - name: reloado
-    engine: xpath
-    paging: true
-    search_url: https://reloado.com/search?q={query}&page={pageno}
-    results_xpath: //div[contains(@class, 'result-item')]
-    url_xpath: .//div[contains(@class, 'result-title')]/a/@href
-    title_xpath: .//div[contains(@class, 'result-title')]/a
-    content_xpath: .//div[contains(@class, 'result-excerpt')]
-    shortcut: rel
-    categories: general
-    disabled: true
-    language: de
-    about:
-      website: https://reloado.com
-      official_api_documentation:
-      use_official_api: false
-      require_api_key: false
-      results: HTML
-
   - name: repology
     engine: repology
     shortcut: rep
     disabled: true
     inactive: true
 
-  - name: resulthunter
-    engine: resulthunter
-    resulthunter_categ: web
-    categories: general
-    shortcut: reh
-    disabled: true
-
-  - name: resulthunter images
-    engine: resulthunter
-    resulthunter_categ: images
-    categories: images
-    shortcut: rehi
-    disabled: true
-
-  - name: searchch
-    engine: xpath
-    shortcut: sch
-    paging: true
-    search_url: https://search.ch/web/api/loadmore.html?path=/web/&q={query}&page={pageno}
-    results_xpath: //div[contains(@class, 'www-feed-web-result')]
-    # the URL looks like "//search.ch/web/r/redirect?...result!uffe8997e781e241d/https://example.com"
-    url_xpath: concat('https://', substring-after(.//a[contains(@class, 'sl-gus-result-url')]/@href, '://'))
-    title_xpath: .//a[contains(@class, 'sl-gus-result-title')]
-    content_xpath: .//div[contains(@class, 'sl-gus-result-body')]
-    language: "ch"
-    disabled: true
-    about:
-      website: https://search.ch/web
-      description: "Swiss search engine with its own Swiss index"
-      use_official_api: false
-      require_api_key: false
-      results: HTML
-
-  - name: searchzee
-    engine: json_engine
-    search_url: https://searchzee.com/api/search?q={query}&type=web&offset={pageno}
-    paging: true
-    first_page_num: 0
-    results_query: results
-    url_query: url
-    title_query: title
-    content_query: summary
-    content_html_to_text: true
-    categories: general
-    shortcut: sz
-    disabled: true
-    inactive: true
-    about:
-      website: https://searchzee.com
-      use_official_api: false
-      require_api_key: false
-      results: JSON
-
-  - name: searchzee news
-    engine: json_engine
-    search_url: https://searchzee.com/api/search?q={query}&type=news&offset={pageno}{time_range}
-    paging: true
-    first_page_num: 0
-    time_range_support: true
-    time_range_url: "&freshness={time_range_val}"
-    time_range_map:
-      day: pd
-      week: pw
-      month: pm
-      year: py
-    results_query: results
-    url_query: url
-    title_query: title
-    content_query: summary
-    thumbnail_query: thumbnail
-    content_html_to_text: true
-    categories: news
-    shortcut: sznw
-    disabled: true
-    inactive: true
-
   - name: swisscows
     engine: swisscows
     categories: general
@@ -2928,13 +2684,13 @@ engines:
     content_xpath: //div[@class="synonyms-list-group"]
     title_xpath: //div[@class="upper-synonyms"]/a
     no_result_for_http_status: [404]
-    language: de
     about:
       website: https://www.woxikon.de/
       wikidata_id:  # No Wikidata ID
       use_official_api: false
       require_api_key: false
       results: HTML
+      language: de
 
   - name: tootfinder
     engine: tootfinder
@@ -2950,27 +2706,6 @@ engines:
     shortcut: void
     disabled: true
 
-  - name: vuhuv
-    engine: vuhuv
-    categories: general
-    vuhuv_category: general
-    shortcut: vu
-    disabled: true
-
-  - name: vuhuv images
-    engine: vuhuv
-    categories: images
-    vuhuv_category: images
-    shortcut: vui
-    disabled: true
-
-  - name: vuhuv videos
-    engine: vuhuv
-    categories: videos
-    vuhuv_category: videos
-    shortcut: vuv
-    disabled: true
-
   - name: wallhaven
     engine: wallhaven
     # api_key: abcdefghijklmnopqrstuvwxyz
@@ -2989,13 +2724,13 @@ engines:
     content_xpath: //li/div[@class="searchresult"]
     categories: general
     disabled: true
-    language: fr
     about:
       website: https://wikimini.org/
       wikidata_id: Q3568032
       use_official_api: false
       require_api_key: false
       results: HTML
+      language: fr
 
   - name: wttr.in
     engine: wttr
@@ -3005,7 +2740,6 @@ engines:
   - name: zapmeta
     engine: xpath
     shortcut: zpm
-    categories: general
     search_url: https://www.zapmeta.com/search?q={query}&pg={pageno}
     results_xpath: //article[contains(@class, "organic-results-item")]
     url_xpath: ./h2/a/@href
@@ -3105,38 +2839,6 @@ engines:
       website: https://minecraft.wiki/
       wikidata_id: Q105533483
 
-  # s1search google engines / mirrors
-  - name: searchtoday
-    engine: s1search
-    shortcut: std
-    base_url: https://info.searchtoday.site
-    disabled: true
-
-  # - name: webcrawler
-  #   engine: s1search
-  #   shortcut: wc
-  #   base_url: https://www.webcrawler.com
-  #   disabled: true
-
-  # s1search yahoo engines / mirrors
-  # - name: excite
-  #   engine: s1search
-  #   shortcut: exc
-  #   base_url: https://results.excite.com.s1search.co
-  #   disabled: true
-
-  # - name: metacrawler
-  #   engine: s1search
-  #   shortcut: mec
-  #   base_url: https://search.metacrawler.com
-  #   disabled: true
-
-  - name: infospace
-    engine: s1search
-    shortcut: ifs
-    base_url: https://search.infospace.com
-    disabled: true
-
 # Doku engine lets you access to any Doku wiki instance:
 # A public one or a privete/corporate one.
 #  - name: ubuntuwiki

searx/static/themes/simple/manifest.json

@@ -77,7 +77,7 @@
     ]
   },
   "src/js/plugin/Calculator.ts": {
-    "file": "chunk/CTP0QVHn.min.js",
+    "file": "chunk/DDL5uWMz.min.js",
     "name": "calculator",
     "src": "src/js/plugin/Calculator.ts",
     "isDynamicEntry": true,

searx/static/themes/simple/sxng-core.min.js

@@ -1,3 +1,3 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./chunk/U6YV4Y8e.min.js","./sxng-mapview.min.css","./chunk/DpvWr1cn.min.js","./chunk/DK4yUVpy.min.js","./chunk/DcK-mo-Y.min.js","./chunk/CTP0QVHn.min.js","./chunk/C93hSkpT.min.js","./chunk/5Ako-qGW.min.js","./chunk/DvCYLbJr.min.js","./chunk/B8prKeWj.min.js","./chunk/e2-9fzwE.min.js"])))=>i.map(i=>d[i]);
-var e=class{id;constructor(e){this.id=e,queueMicrotask(()=>this.invoke())}async invoke(){try{console.debug(`[PLUGIN] ${this.id}: Running...`);let e=await this.run();if(!e)return;console.debug(`[PLUGIN] ${this.id}: Running post-exec...`),await this.post(e)}catch(e){console.error(`[PLUGIN] ${this.id}:`,e)}finally{console.debug(`[PLUGIN] ${this.id}: Done.`)}}},t={index:`index`,results:`results`,preferences:`preferences`,unknown:`unknown`},n={closeDetail:void 0,scrollPageToSelected:void 0,selectImage:void 0,selectNext:void 0,selectPrevious:void 0},r=()=>{let e=document.querySelector(`meta[name="endpoint"]`)?.getAttribute(`content`);return e&&e in t?e:t.unknown},i=()=>{let e=document.querySelector(`script[client_settings]`)?.getAttribute(`client_settings`);if(!e)return{};try{return JSON.parse(atob(e))}catch(e){return console.error(`Failed to load client_settings:`,e),{}}},a=async(e,t,n)=>{let r=new AbortController,i=setTimeout(()=>r.abort(),n?.timeout??3e4),a=await fetch(t,{body:n?.body,method:e,signal:r.signal}).finally(()=>clearTimeout(i));if(!a.ok)throw Error(a.statusText);return a},o=(e,t,n,r)=>{if(typeof t!=`string`){t.addEventListener(e,n,r);return}document.addEventListener(e,e=>{for(let r of e.composedPath())if(r instanceof HTMLElement&&r.matches(t)){try{n.call(r,e)}catch(e){console.error(e)}break}},r)},s=(e,t)=>{for(let e of t?.on??[])if(!e)return;document.readyState===`loading`?o(`DOMContentLoaded`,document,e,{once:!0}):e()},c=r(),l=i(),u=(e,t)=>{d(t)&&e()},d=e=>{switch(e.on){case`global`:return!0;case`endpoint`:return!!e.where.includes(c)}},f=`modulepreload`,p=function(e,t){return new URL(e,t).href},m={},h=function(e,t,n){let r=Promise.resolve();if(t&&t.length>0){let e=document.getElementsByTagName(`link`),i=document.querySelector(`meta[property=csp-nonce]`),a=i?.nonce||i?.getAttribute(`nonce`);function o(e){return Promise.all(e.map(e=>Promise.resolve(e).then(e=>({status:`fulfilled`,value:e}),e=>({status:`rejected`,reason:e}))))}r=o(t.map(t=>{if(t=p(t,n),t in m)return;m[t]=!0;let r=t.endsWith(`.css`),i=r?`[rel="stylesheet"]`:``;if(n)for(let n=e.length-1;n>=0;n--){let i=e[n];if(i.href===t&&(!r||i.rel===`stylesheet`))return}else if(document.querySelector(`link[href="${t}"]${i}`))return;let o=document.createElement(`link`);if(o.rel=r?`stylesheet`:f,r||(o.as=`script`),o.crossOrigin=``,o.href=t,a&&o.setAttribute(`nonce`,a),document.head.appendChild(o),r)return new Promise((e,n)=>{o.addEventListener(`load`,e),o.addEventListener(`error`,()=>n(Error(`Unable to preload CSS for ${t}`)))})}))}function i(e){let t=new Event(`vite:preloadError`,{cancelable:!0});if(t.payload=e,window.dispatchEvent(t),!t.defaultPrevented)throw e}return r.then(t=>{for(let e of t||[])e.status===`rejected`&&i(e.reason);return e().catch(i)})};s(()=>{document.documentElement.classList.remove(`no-js`),document.documentElement.classList.add(`js`),o(`click`,`.close`,function(){this.parentNode?.classList.add(`invisible`)}),o(`click`,`.searxng_init_map`,async function(e){e.preventDefault(),this.classList.remove(`searxng_init_map`),u(()=>h(async()=>{let{default:e}=await import(`./chunk/U6YV4Y8e.min.js`);return{default:e}},__vite__mapDeps([0,1]),import.meta.url).then(({default:e})=>new e(this)),{on:`endpoint`,where:[t.results]})}),l.plugins?.includes(`infiniteScroll`)&&u(()=>h(async()=>{let{default:e}=await import(`./chunk/DpvWr1cn.min.js`);return{default:e}},__vite__mapDeps([2,3,4]),import.meta.url).then(({default:e})=>new e),{on:`endpoint`,where:[t.results]}),l.plugins?.includes(`calculator`)&&u(()=>h(async()=>{let{default:e}=await import(`./chunk/CTP0QVHn.min.js`);return{default:e}},__vite__mapDeps([5,4,3]),import.meta.url).then(({default:e})=>new e),{on:`endpoint`,where:[t.results]})}),s(()=>{h(()=>import(`./chunk/C93hSkpT.min.js`),__vite__mapDeps([6,3]),import.meta.url),h(()=>import(`./chunk/5Ako-qGW.min.js`),__vite__mapDeps([7,4,3]),import.meta.url),l.autocomplete&&h(()=>import(`./chunk/DvCYLbJr.min.js`),__vite__mapDeps([8,3]),import.meta.url)},{on:[c===t.index]}),s(()=>{h(()=>import(`./chunk/C93hSkpT.min.js`),__vite__mapDeps([6,3]),import.meta.url),h(()=>import(`./chunk/B8prKeWj.min.js`),__vite__mapDeps([9,3]),import.meta.url),h(()=>import(`./chunk/5Ako-qGW.min.js`),__vite__mapDeps([7,4,3]),import.meta.url),l.autocomplete&&h(()=>import(`./chunk/DvCYLbJr.min.js`),__vite__mapDeps([8,3]),import.meta.url)},{on:[c===t.results]}),s(()=>{h(()=>import(`./chunk/e2-9fzwE.min.js`),__vite__mapDeps([10,3]),import.meta.url)},{on:[c===t.preferences]});export{e as a,l as i,o as n,n as r,a as t};
+const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./chunk/U6YV4Y8e.min.js","./sxng-mapview.min.css","./chunk/DpvWr1cn.min.js","./chunk/DK4yUVpy.min.js","./chunk/DcK-mo-Y.min.js","./chunk/DDL5uWMz.min.js","./chunk/C93hSkpT.min.js","./chunk/5Ako-qGW.min.js","./chunk/DvCYLbJr.min.js","./chunk/B8prKeWj.min.js","./chunk/e2-9fzwE.min.js"])))=>i.map(i=>d[i]);
+var e=class{id;constructor(e){this.id=e,queueMicrotask(()=>this.invoke())}async invoke(){try{console.debug(`[PLUGIN] ${this.id}: Running...`);let e=await this.run();if(!e)return;console.debug(`[PLUGIN] ${this.id}: Running post-exec...`),await this.post(e)}catch(e){console.error(`[PLUGIN] ${this.id}:`,e)}finally{console.debug(`[PLUGIN] ${this.id}: Done.`)}}},t={index:`index`,results:`results`,preferences:`preferences`,unknown:`unknown`},n={closeDetail:void 0,scrollPageToSelected:void 0,selectImage:void 0,selectNext:void 0,selectPrevious:void 0},r=()=>{let e=document.querySelector(`meta[name="endpoint"]`)?.getAttribute(`content`);return e&&e in t?e:t.unknown},i=()=>{let e=document.querySelector(`script[client_settings]`)?.getAttribute(`client_settings`);if(!e)return{};try{return JSON.parse(atob(e))}catch(e){return console.error(`Failed to load client_settings:`,e),{}}},a=async(e,t,n)=>{let r=new AbortController,i=setTimeout(()=>r.abort(),n?.timeout??3e4),a=await fetch(t,{body:n?.body,method:e,signal:r.signal}).finally(()=>clearTimeout(i));if(!a.ok)throw Error(a.statusText);return a},o=(e,t,n,r)=>{if(typeof t!=`string`){t.addEventListener(e,n,r);return}document.addEventListener(e,e=>{for(let r of e.composedPath())if(r instanceof HTMLElement&&r.matches(t)){try{n.call(r,e)}catch(e){console.error(e)}break}},r)},s=(e,t)=>{for(let e of t?.on??[])if(!e)return;document.readyState===`loading`?o(`DOMContentLoaded`,document,e,{once:!0}):e()},c=r(),l=i(),u=(e,t)=>{d(t)&&e()},d=e=>{switch(e.on){case`global`:return!0;case`endpoint`:return!!e.where.includes(c)}},f=`modulepreload`,p=function(e,t){return new URL(e,t).href},m={},h=function(e,t,n){let r=Promise.resolve();if(t&&t.length>0){let e=document.getElementsByTagName(`link`),i=document.querySelector(`meta[property=csp-nonce]`),a=i?.nonce||i?.getAttribute(`nonce`);function o(e){return Promise.all(e.map(e=>Promise.resolve(e).then(e=>({status:`fulfilled`,value:e}),e=>({status:`rejected`,reason:e}))))}r=o(t.map(t=>{if(t=p(t,n),t in m)return;m[t]=!0;let r=t.endsWith(`.css`),i=r?`[rel="stylesheet"]`:``;if(n)for(let n=e.length-1;n>=0;n--){let i=e[n];if(i.href===t&&(!r||i.rel===`stylesheet`))return}else if(document.querySelector(`link[href="${t}"]${i}`))return;let o=document.createElement(`link`);if(o.rel=r?`stylesheet`:f,r||(o.as=`script`),o.crossOrigin=``,o.href=t,a&&o.setAttribute(`nonce`,a),document.head.appendChild(o),r)return new Promise((e,n)=>{o.addEventListener(`load`,e),o.addEventListener(`error`,()=>n(Error(`Unable to preload CSS for ${t}`)))})}))}function i(e){let t=new Event(`vite:preloadError`,{cancelable:!0});if(t.payload=e,window.dispatchEvent(t),!t.defaultPrevented)throw e}return r.then(t=>{for(let e of t||[])e.status===`rejected`&&i(e.reason);return e().catch(i)})};s(()=>{document.documentElement.classList.remove(`no-js`),document.documentElement.classList.add(`js`),o(`click`,`.close`,function(){this.parentNode?.classList.add(`invisible`)}),o(`click`,`.searxng_init_map`,async function(e){e.preventDefault(),this.classList.remove(`searxng_init_map`),u(()=>h(async()=>{let{default:e}=await import(`./chunk/U6YV4Y8e.min.js`);return{default:e}},__vite__mapDeps([0,1]),import.meta.url).then(({default:e})=>new e(this)),{on:`endpoint`,where:[t.results]})}),l.plugins?.includes(`infiniteScroll`)&&u(()=>h(async()=>{let{default:e}=await import(`./chunk/DpvWr1cn.min.js`);return{default:e}},__vite__mapDeps([2,3,4]),import.meta.url).then(({default:e})=>new e),{on:`endpoint`,where:[t.results]}),l.plugins?.includes(`calculator`)&&u(()=>h(async()=>{let{default:e}=await import(`./chunk/DDL5uWMz.min.js`);return{default:e}},__vite__mapDeps([5,4,3]),import.meta.url).then(({default:e})=>new e),{on:`endpoint`,where:[t.results]})}),s(()=>{h(()=>import(`./chunk/C93hSkpT.min.js`),__vite__mapDeps([6,3]),import.meta.url),h(()=>import(`./chunk/5Ako-qGW.min.js`),__vite__mapDeps([7,4,3]),import.meta.url),l.autocomplete&&h(()=>import(`./chunk/DvCYLbJr.min.js`),__vite__mapDeps([8,3]),import.meta.url)},{on:[c===t.index]}),s(()=>{h(()=>import(`./chunk/C93hSkpT.min.js`),__vite__mapDeps([6,3]),import.meta.url),h(()=>import(`./chunk/B8prKeWj.min.js`),__vite__mapDeps([9,3]),import.meta.url),h(()=>import(`./chunk/5Ako-qGW.min.js`),__vite__mapDeps([7,4,3]),import.meta.url),l.autocomplete&&h(()=>import(`./chunk/DvCYLbJr.min.js`),__vite__mapDeps([8,3]),import.meta.url)},{on:[c===t.results]}),s(()=>{h(()=>import(`./chunk/e2-9fzwE.min.js`),__vite__mapDeps([10,3]),import.meta.url)},{on:[c===t.preferences]});export{e as a,l as i,o as n,n as r,a as t};
 //# sourceMappingURL=sxng-core.min.js.map

searx/sxng_locales.py

@@ -21,7 +21,6 @@ sxng_locales = (
     ('da-DK', 'Dansk', 'Danmark', 'Danish', '\U0001f1e9\U0001f1f0'),
     ('de', 'Deutsch', '', 'German', '\U0001f310'),
     ('de-AT', 'Deutsch', 'Österreich', 'German', '\U0001f1e6\U0001f1f9'),
-    ('de-BE', 'Deutsch', 'Belgien', 'German', '\U0001f1e7\U0001f1ea'),
     ('de-CH', 'Deutsch', 'Schweiz', 'German', '\U0001f1e8\U0001f1ed'),
     ('de-DE', 'Deutsch', 'Deutschland', 'German', '\U0001f1e9\U0001f1ea'),
     ('el', 'Ελληνικά', '', 'Greek', '\U0001f310'),
@@ -30,7 +29,6 @@ sxng_locales = (
     ('en-AU', 'English', 'Australia', 'English', '\U0001f1e6\U0001f1fa'),
     ('en-CA', 'English', 'Canada', 'English', '\U0001f1e8\U0001f1e6'),
     ('en-GB', 'English', 'United Kingdom', 'English', '\U0001f1ec\U0001f1e7'),
-    ('en-HK', 'English', 'Hong Kong SAR China', 'English', '\U0001f1ed\U0001f1f0'),
     ('en-IE', 'English', 'Ireland', 'English', '\U0001f1ee\U0001f1ea'),
     ('en-IN', 'English', 'India', 'English', '\U0001f1ee\U0001f1f3'),
     ('en-NZ', 'English', 'New Zealand', 'English', '\U0001f1f3\U0001f1ff'),
@@ -46,23 +44,17 @@ sxng_locales = (
     ('es-ES', 'Español', 'España', 'Spanish', '\U0001f1ea\U0001f1f8'),
     ('es-MX', 'Español', 'México', 'Spanish', '\U0001f1f2\U0001f1fd'),
     ('es-PE', 'Español', 'Perú', 'Spanish', '\U0001f1f5\U0001f1ea'),
-    ('es-VE', 'Español', 'Venezuela', 'Spanish', '\U0001f1fb\U0001f1ea'),
     ('et', 'Eesti', '', 'Estonian', '\U0001f310'),
     ('et-EE', 'Eesti', 'Eesti', 'Estonian', '\U0001f1ea\U0001f1ea'),
     ('fi', 'Suomi', '', 'Finnish', '\U0001f310'),
     ('fi-FI', 'Suomi', 'Suomi', 'Finnish', '\U0001f1eb\U0001f1ee'),
-    ('fil', 'Filipino', '', 'Filipino', '\U0001f310'),
-    ('fil-PH', 'Filipino', 'Pilipinas', 'Filipino', '\U0001f1f5\U0001f1ed'),
     ('fr', 'Français', '', 'French', '\U0001f310'),
     ('fr-BE', 'Français', 'Belgique', 'French', '\U0001f1e7\U0001f1ea'),
     ('fr-CA', 'Français', 'Canada', 'French', '\U0001f1e8\U0001f1e6'),
     ('fr-CH', 'Français', 'Suisse', 'French', '\U0001f1e8\U0001f1ed'),
     ('fr-FR', 'Français', 'France', 'French', '\U0001f1eb\U0001f1f7'),
     ('gl', 'Galego', '', 'Galician', '\U0001f310'),
-    ('hi', 'हिन्दी', '', 'Hindi', '\U0001f310'),
-    ('hi-IN', 'हिन्दी', 'भारत', 'Hindi', '\U0001f1ee\U0001f1f3'),
     ('hr', 'Hrvatski', '', 'Croatian', '\U0001f310'),
-    ('hr-HR', 'Hrvatski', 'Hrvatska', 'Croatian', '\U0001f1ed\U0001f1f7'),
     ('hu', 'Magyar', '', 'Hungarian', '\U0001f310'),
     ('hu-HU', 'Magyar', 'Magyarország', 'Hungarian', '\U0001f1ed\U0001f1fa'),
     ('id', 'Indonesia', '', 'Indonesian', '\U0001f310'),
@@ -79,8 +71,6 @@ sxng_locales = (
     ('nl', 'Nederlands', '', 'Dutch', '\U0001f310'),
     ('nl-BE', 'Nederlands', 'België', 'Dutch', '\U0001f1e7\U0001f1ea'),
     ('nl-NL', 'Nederlands', 'Nederland', 'Dutch', '\U0001f1f3\U0001f1f1'),
-    ('nn', 'Norsk Nynorsk', '', 'Norwegian Nynorsk', '\U0001f310'),
-    ('nn-NO', 'Norsk Nynorsk', 'Noreg', 'Norwegian Nynorsk', '\U0001f1f3\U0001f1f4'),
     ('pl', 'Polski', '', 'Polish', '\U0001f310'),
     ('pl-PL', 'Polski', 'Polska', 'Polish', '\U0001f1f5\U0001f1f1'),
     ('pt', 'Português', '', 'Portuguese', '\U0001f310'),
@@ -93,7 +83,6 @@ sxng_locales = (
     ('sk', 'Slovenčina', '', 'Slovak', '\U0001f310'),
     ('sq', 'Shqip', '', 'Albanian', '\U0001f310'),
     ('sv', 'Svenska', '', 'Swedish', '\U0001f310'),
-    ('sv-FI', 'Svenska', 'Finland', 'Swedish', '\U0001f1eb\U0001f1ee'),
     ('sv-SE', 'Svenska', 'Sverige', 'Swedish', '\U0001f1f8\U0001f1ea'),
     ('th', 'ไทย', '', 'Thai', '\U0001f310'),
     ('th-TH', 'ไทย', 'ไทย', 'Thai', '\U0001f1f9\U0001f1ed'),

searx/templates/simple/preferences/engines.html

@@ -60,8 +60,8 @@
                 {%- endif -%}
                 <label for="{{ engine_id }}">
                   {{- ' ' -}}{{- search_engine.name -}}
-                  {%- if search_engine.language -%}
-                    {{- ' ' -}}({{search_engine.language | upper}})
+                  {%- if search_engine.about and search_engine.about.language -%}
+                    {{- ' ' -}}({{search_engine.about.language | upper}})
                   {%- endif -%}
                   </label>
                   {{- engine_about(search_engine) -}}