Sync upstream

docs/admin/api.rst

@@ -84,9 +84,9 @@ HTML of the site.  URL of the SearXNG instance and values are customizable.
 .. code:: html
 
    <form method="post" action="https://example.org/">
-     <!-- search      --> <input type="text" name="q" />
+     <!-- search      --> <input type="text" name="q">
-     <!-- categories  --> <input type="hidden" name="categories" value="general,social media" />
+     <!-- categories  --> <input type="hidden" name="categories" value="general,social media">
-     <!-- language    --> <input type="hidden" name="lang" value="all" />
+     <!-- language    --> <input type="hidden" name="lang" value="all">
-     <!-- locale      --> <input type="hidden" name="locale" value="en" />
+     <!-- locale      --> <input type="hidden" name="locale" value="en">
-     <!-- date filter --> <input type="hidden" name="time_range" value="month" />
+     <!-- date filter --> <input type="hidden" name="time_range" value="month">
    </form>

docs/dev/engines/online/gitlab.rst

@@ -0,0 +1,8 @@
+.. _gitlab engine:
+
+======
+GitLab
+======
+
+.. automodule:: searx.engines.gitlab
+   :members:

searx/botdetection/link_token.py

@@ -28,7 +28,7 @@ And in the HTML template from flask a stylesheet link is needed (the value of
 
    <link rel="stylesheet"
          href="{{ url_for('client_token', token=link_token) }}"
-         type="text/css" />
+         type="text/css" >
 
 .. _X-Forwarded-For:
    https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For

searx/data/engine_traits.json

@@ -3,40 +3,40 @@
     "all_locale": "",
     "custom": {
       "content": [
-        "book_nonfiction",
+        "book_comic",
         "book_fiction",
+        "book_nonfiction",
         "book_unknown",
         "magazine",
-        "book_comic",
+        "musical_score",
-        "standards_document",
+        "other",
-        "musical_score"
+        "standards_document"
       ],
       "ext": [
-        "pdf",
+        "azw3",
+        "cbr",
+        "cbz",
+        "djvu",
         "epub",
         "fb2",
         "mobi",
-        "cbr",
+        "pdf",
-        "djvu",
+        "txt"
-        "txt",
-        "cbz",
-        "azw3"
       ],
       "sort": [
         "",
-        "newest",
-        "oldest",
         "largest",
-        "smallest",
+        "newest",
         "newest_added",
-        "oldest_added"
+        "oldest",
+        "oldest_added",
+        "smallest"
       ]
     },
     "data_type": "traits_v1",
     "languages": {
       "af": "af",
       "ar": "ar",
-      "az": "az",
       "be": "be",
       "bg": "bg",
       "bn": "bn",
@@ -86,11 +86,14 @@
       "ro": "ro",
       "ru": "ru",
       "rw": "rw",
+      "sa": "sa",
+      "se": "se",
       "sk": "sk",
       "sl": "sl",
       "sr": "sr",
       "sv": "sv",
       "ta": "ta",
+      "th": "th",
       "tr": "tr",
       "uk": "uk",
       "ur": "ur",
@@ -119,6 +122,7 @@
       "ar": "\u0627\u0644\u0639\u0631\u0628\u064a\u0629",
       "bg": "\u0411\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438",
       "bs": "Bosanski",
+      "ca": "Catal\u00e0",
       "cs": "\u010ce\u0161tina",
       "da": "Dansk",
       "de": "Deutsch",
@@ -1764,8 +1768,10 @@
         "id": "id",
         "it": "it",
         "ja-JP": "ja-jp",
+        "ko": "ko",
         "lt": "lt",
         "lv": "lv",
+        "ms": "ms",
         "nb": "nb",
         "nl": "nl",
         "pl": "pl",
@@ -1775,10 +1781,15 @@
         "sk": "sk",
         "sl": "sl",
         "sq-AL": "sq-al",
+        "sr_Cyrl": "sr-cyrl",
+        "sr_Latn": "sr-latn",
         "sv": "sv",
         "sw-KE": "sw-ke",
+        "th": "th",
         "tr": "tr",
         "uk": "uk",
+        "vi": "vi",
+        "zh_Hans": "zh-hans",
         "zh_Hant": "zh-hant"
       }
     },
@@ -1858,8 +1869,10 @@
         "id": "id",
         "it": "it",
         "ja-JP": "ja-jp",
+        "ko": "ko",
         "lt": "lt",
         "lv": "lv",
+        "ms": "ms",
         "nb": "nb",
         "nl": "nl",
         "pl": "pl",
@@ -1869,10 +1882,15 @@
         "sk": "sk",
         "sl": "sl",
         "sq-AL": "sq-al",
+        "sr_Cyrl": "sr-cyrl",
+        "sr_Latn": "sr-latn",
         "sv": "sv",
         "sw-KE": "sw-ke",
+        "th": "th",
         "tr": "tr",
         "uk": "uk",
+        "vi": "vi",
+        "zh_Hans": "zh-hans",
         "zh_Hant": "zh-hant"
       }
     },
@@ -1952,8 +1970,10 @@
         "id": "id",
         "it": "it",
         "ja-JP": "ja-jp",
+        "ko": "ko",
         "lt": "lt",
         "lv": "lv",
+        "ms": "ms",
         "nb": "nb",
         "nl": "nl",
         "pl": "pl",
@@ -1963,10 +1983,15 @@
         "sk": "sk",
         "sl": "sl",
         "sq-AL": "sq-al",
+        "sr_Cyrl": "sr-cyrl",
+        "sr_Latn": "sr-latn",
         "sv": "sv",
         "sw-KE": "sw-ke",
+        "th": "th",
         "tr": "tr",
         "uk": "uk",
+        "vi": "vi",
+        "zh_Hans": "zh-hans",
         "zh_Hant": "zh-hant"
       }
     },
@@ -2046,8 +2071,10 @@
         "id": "id",
         "it": "it",
         "ja-JP": "ja-jp",
+        "ko": "ko",
         "lt": "lt",
         "lv": "lv",
+        "ms": "ms",
         "nb": "nb",
         "nl": "nl",
         "pl": "pl",
@@ -2057,10 +2084,15 @@
         "sk": "sk",
         "sl": "sl",
         "sq-AL": "sq-al",
+        "sr_Cyrl": "sr-cyrl",
+        "sr_Latn": "sr-latn",
         "sv": "sv",
         "sw-KE": "sw-ke",
+        "th": "th",
         "tr": "tr",
         "uk": "uk",
+        "vi": "vi",
+        "zh_Hans": "zh-hans",
         "zh_Hant": "zh-hant"
       }
     },
@@ -6151,7 +6183,6 @@
         "BY",
         "BZ",
         "CA",
-        "CC",
         "CD",
         "CF",
         "CG",
@@ -6249,6 +6280,7 @@
         "MN",
         "MO",
         "MQ",
+        "MS",
         "MT",
         "MU",
         "MW",
@@ -6403,7 +6435,6 @@
       "la": "latin",
       "lb": "luxembourgish",
       "ln": "lingala",
-      "lo": "lao",
       "lt": "lithuanian",
       "lv": "latvian",
       "mg": "malagasy",
@@ -6436,6 +6467,7 @@
       "si": "sinhala",
       "sk": "slovak",
       "sl": "slovenian",
+      "sn": "shona",
       "so": "somali",
       "sq": "albanian",
       "sr": "serbian",
@@ -6784,6 +6816,7 @@
         "bat-smg",
         "bbc",
         "bcl",
+        "bdr",
         "be",
         "be-tarask",
         "bew",

searx/engines/annas_archive.py

@@ -184,3 +184,8 @@ def fetch_traits(engine_traits: EngineTraits):
 
     for x in eval_xpath_list(dom, "//form//select[@name='sort']//option"):
         engine_traits.custom['sort'].append(x.get("value"))
+
+    # for better diff; sort the persistence of these traits
+    engine_traits.custom['content'].sort()
+    engine_traits.custom['ext'].sort()
+    engine_traits.custom['sort'].sort()

searx/engines/brave.py

@@ -430,7 +430,8 @@ def fetch_traits(engine_traits: EngineTraits):
 
         ui_lang = option.get('value')
         try:
-            if '-' in ui_lang and not ui_lang.startswith("zh-"):
+            l = babel.Locale.parse(ui_lang, sep='-')
+            if l.territory:
                 sxng_tag = region_tag(babel.Locale.parse(ui_lang, sep='-'))
             else:
                 sxng_tag = language_tag(babel.Locale.parse(ui_lang, sep='-'))
@@ -453,7 +454,7 @@ def fetch_traits(engine_traits: EngineTraits):
     if not resp.ok:  # type: ignore
         print("ERROR: response from Brave is not OK.")
 
-    country_js = resp.text[resp.text.index("options:{all") + len('options:') :]
+    country_js = resp.text[resp.text.index("options:{all") + len('options:') :]  # type: ignore
     country_js = country_js[: country_js.index("},k={default")]
     country_tags = js_variable_to_python(country_js)
 

searx/engines/btdigg.py

@@ -54,7 +54,6 @@ def response(resp):
 
         excerpt = result.xpath('.//div[@class="torrent_excerpt"]')[0]
         content = html.tostring(excerpt, encoding='unicode', method='text', with_tail=False)
-        # it is better to emit <br/> instead of |, but html tags are verboten
         content = content.strip().replace('\n', ' | ')
         content = ' '.join(content.split())
 

searx/engines/gitlab.py

@@ -0,0 +1,95 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+"""Engine to search in collaborative software platforms based on GitLab_ with
+the `GitLab REST API`_.
+
+.. _GitLab: https://about.gitlab.com/install/
+.. _GitLab REST API: https://docs.gitlab.com/ee/api/
+
+Configuration
+=============
+
+The engine has the following mandatory setting:
+
+- :py:obj:`base_url`
+
+Optional settings are:
+
+- :py:obj:`api_path`
+
+.. code:: yaml
+
+  - name: gitlab
+    engine: gitlab
+    base_url: https://gitlab.com
+    shortcut: gl
+    about:
+      website: https://gitlab.com/
+      wikidata_id: Q16639197
+
+  - name: gnome
+    engine: gitlab
+    base_url: https://gitlab.gnome.org
+    shortcut: gn
+    about:
+      website: https://gitlab.gnome.org
+      wikidata_id: Q44316
+
+Implementations
+===============
+
+"""
+
+from urllib.parse import urlencode
+from dateutil import parser
+
+about = {
+    "website": None,
+    "wikidata_id": None,
+    "official_api_documentation": "https://docs.gitlab.com/ee/api/",
+    "use_official_api": True,
+    "require_api_key": False,
+    "results": "JSON",
+}
+
+categories = ['it', 'repos']
+paging = True
+
+base_url: str = ""
+"""Base URL of the GitLab host."""
+
+api_path: str = 'api/v4/projects'
+"""The path the `project API <https://docs.gitlab.com/ee/api/projects.html>`_.
+
+The default path should work fine usually.
+"""
+
+
+def request(query, params):
+    args = {'search': query, 'page': params['pageno']}
+    params['url'] = f"{base_url}/{api_path}?{urlencode(args)}"
+
+    return params
+
+
+def response(resp):
+    results = []
+
+    for item in resp.json():
+        results.append(
+            {
+                'template': 'packages.html',
+                'url': item.get('web_url'),
+                'title': item.get('name'),
+                'content': item.get('description'),
+                'thumbnail': item.get('avatar_url'),
+                'package_name': item.get('name'),
+                'maintainer': item.get('namespace', {}).get('name'),
+                'publishedDate': parser.parse(item.get('last_activity_at') or item.get("created_at")),
+                'tags': item.get('tag_list', []),
+                'popularity': item.get('star_count'),
+                'homepage': item.get('readme_url'),
+                'source_code_url': item.get('http_url_to_repo'),
+            }
+        )
+
+    return results

searx/engines/google.py

@@ -441,7 +441,7 @@ def fetch_traits(engine_traits: EngineTraits, add_domains: bool = True):
         try:
             locale = babel.Locale.parse(lang_map.get(eng_lang, eng_lang), sep='-')
         except babel.UnknownLocaleError:
-            print("ERROR: %s -> %s is unknown by babel" % (x.get("data-name"), eng_lang))
+            print("INFO:  google UI language %s (%s) is unknown by babel" % (eng_lang, x.text.split("(")[0].strip()))
             continue
         sxng_lang = language_tag(locale)
 

searx/engines/qwant.py

@@ -49,7 +49,11 @@ from flask_babel import gettext
 import babel
 import lxml
 
-from searx.exceptions import SearxEngineAPIException, SearxEngineTooManyRequestsException
+from searx.exceptions import (
+    SearxEngineAPIException,
+    SearxEngineTooManyRequestsException,
+    SearxEngineCaptchaException,
+)
 from searx.network import raise_for_httperror
 from searx.enginelib.traits import EngineTraits
 
@@ -187,6 +191,8 @@ def parse_web_api(resp):
         error_code = data.get('error_code')
         if error_code == 24:
             raise SearxEngineTooManyRequestsException()
+        if search_results.get("data", {}).get("error_data", {}).get("captchaUrl") is not None:
+            raise SearxEngineCaptchaException()
         msg = ",".join(data.get('message', ['unknown']))
         raise SearxEngineAPIException(f"{msg} ({error_code})")
 

searx/engines/radio_browser.py

@@ -165,10 +165,12 @@ def fetch_traits(engine_traits: EngineTraits):
 
     countrycodes = set()
     for region in country_list:
-        if region['iso_3166_1'] not in babel_reg_list:
+        # country_list contains duplicates that differ only in upper/lower case
+        _reg = region['iso_3166_1'].upper()
+        if _reg not in babel_reg_list:
             print(f"ERROR: region tag {region['iso_3166_1']} is unknown by babel")
             continue
-        countrycodes.add(region['iso_3166_1'])
+        countrycodes.add(_reg)
 
     countrycodes = list(countrycodes)
     countrycodes.sort()

searx/locales.py

@@ -152,7 +152,7 @@ def locales_initialize():
 def region_tag(locale: babel.Locale) -> str:
     """Returns SearXNG's region tag from the locale (e.g. zh-TW , en-US)."""
     if not locale.territory:
-        raise ValueError('%s missed a territory')
+        raise ValueError('babel.Locale %s: missed a territory' % locale)
     return locale.language + '-' + locale.territory
 
 

searx/settings.yml

@@ -807,24 +807,21 @@ engines:
     timeout: 10
 
   - name: gitlab
-    engine: json_engine
+    engine: gitlab
-    paging: true
+    base_url: https://gitlab.com
-    search_url: https://gitlab.com/api/v4/projects?search={query}&page={pageno}
-    url_query: web_url
-    title_query: name_with_namespace
-    content_query: description
-    page_size: 20
-    categories: [it, repos]
     shortcut: gl
-    timeout: 10.0
     disabled: true
     about:
-      website: https://about.gitlab.com/
+      website: https://gitlab.com/
       wikidata_id: Q16639197
-      official_api_documentation: https://docs.gitlab.com/ee/api/
+
-      use_official_api: false
+  # - name: gnome
-      require_api_key: false
+  #   engine: gitlab
-      results: JSON
+  #   base_url: https://gitlab.gnome.org
+  #   shortcut: gn
+  #   about:
+  #     website: https://gitlab.gnome.org
+  #     wikidata_id: Q44316
 
   - name: github
     engine: github
@@ -903,26 +900,6 @@ engines:
     shortcut: mi
     disabled: true
 
-  - name: gpodder
-    engine: json_engine
-    shortcut: gpod
-    timeout: 4.0
-    paging: false
-    search_url: https://gpodder.net/search.json?q={query}
-    url_query: url
-    title_query: title
-    content_query: description
-    page_size: 19
-    categories: music
-    disabled: true
-    about:
-      website: https://gpodder.net
-      wikidata_id: Q3093354
-      official_api_documentation: https://gpoddernet.readthedocs.io/en/latest/api/
-      use_official_api: false
-      requires_api_key: false
-      results: JSON
-
   - name: habrahabr
     engine: xpath
     paging: true
@@ -1869,25 +1846,6 @@ engines:
     about:
       website: https://wiby.me/
 
-  - name: alexandria
-    engine: json_engine
-    shortcut: alx
-    categories: general
-    paging: true
-    search_url: https://api.alexandria.org/?a=1&q={query}&p={pageno}
-    results_query: results
-    title_query: title
-    url_query: url
-    content_query: snippet
-    timeout: 1.5
-    disabled: true
-    about:
-      website: https://alexandria.org/
-      official_api_documentation: https://github.com/alexandria-org/alexandria-api/raw/master/README.md
-      use_official_api: true
-      require_api_key: false
-      results: JSON
-
   - name: wikibooks
     engine: mediawiki
     weight: 0.5

searx/templates/simple/base.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html class="no-js theme-{{ preferences.get_value('simple_style') or 'auto' }} center-aligment-{{ preferences.get_value('center_alignment') and 'yes' or 'no' }}" lang="{{ locale_rfc5646 }}" {% if rtl %} dir="rtl"{% endif %}>
 <head>
-  <meta charset="UTF-8" />
+  <meta charset="UTF-8">
   <meta name="description" content="SearXNG — a privacy-respecting, open metasearch engine">
   <meta name="keywords" content="SearXNG, search, search engine, metasearch, meta search">
   <meta name="generator" content="searxng/{{ searx_version }}">
@@ -13,12 +13,12 @@
   <title>{% block title %}{% endblock %}{{ instance_name }}</title>
   {% block meta %}{% endblock %}
   {% if rtl %}
-  <link rel="stylesheet" href="{{ url_for('static', filename='css/searxng-rtl.min.css') }}" type="text/css" media="screen" />
+  <link rel="stylesheet" href="{{ url_for('static', filename='css/searxng-rtl.min.css') }}" type="text/css" media="screen">
   {% else %}
-  <link rel="stylesheet" href="{{ url_for('static', filename='css/searxng.min.css') }}" type="text/css" media="screen" />
+  <link rel="stylesheet" href="{{ url_for('static', filename='css/searxng.min.css') }}" type="text/css" media="screen">
   {% endif %}
   {% if get_setting('server.limiter') or get_setting('server.public_instance') %}
-  <link rel="stylesheet" href="{{ url_for('client_token', token=link_token) }}" type="text/css" />
+  <link rel="stylesheet" href="{{ url_for('client_token', token=link_token) }}" type="text/css">
   {% endif %}
   {% block styles %}{% endblock %}
   <!--[if gte IE 9]>-->
@@ -26,11 +26,11 @@
   <!--<![endif]-->
   <script defer src="https://umami.kanker.dev/script.js" data-website-id="a0853517-125d-4475-8af0-6d224613d6db"></script>
   {% block head %}
-  <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}"/>
+  <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ opensearch_url }}">
   {% endblock %}
   <link rel="icon" href="{{ url_for('static', filename='img/favicon.png') }}" sizes="any">
   <link rel="icon" href="{{ url_for('static', filename='img/favicon.svg') }}" type="image/svg+xml">
-  <link rel="apple-touch-icon" href="{{ url_for('static', filename='img/favicon.png') }}"/>
+  <link rel="apple-touch-icon" href="{{ url_for('static', filename='img/favicon.png') }}">
 </head>
 <body class="{{ endpoint }}_endpoint" >
   <main id="main_{{  self._TemplateReference__context.name|replace("simple/", "")|replace(".html", "") }}" class="{{body_class}}">
@@ -66,7 +66,7 @@
   </main>
   <footer>
     <p>
-    {{ _('Powered by') }} <a href="{{ url_for('info', pagename='about') }}">searxng</a> - {{ searx_version }} — {{ _('a privacy-respecting, open metasearch engine') }}<br/>
+    {{ _('Powered by') }} <a href="{{ url_for('info', pagename='about') }}">searxng</a> - {{ searx_version }} — {{ _('a privacy-respecting, open metasearch engine') }}<br>
         <a href="{{ searx_git_url }}">{{ _('Source code') }}</a>
         | <a href="{{ get_setting('brand.issue_url') }}">{{ _('Issue tracker') }}</a>
         {% if enable_metrics %}| <a href="{{ url_for('stats') }}">{{ _('Engine stats') }}</a>{% endif %}

searx/templates/simple/categories.html

@@ -16,7 +16,7 @@
         {%- if not search_on_category_select or not display_tooltip -%}
             {%- for category in categories -%}
                 <div class="category category_checkbox">{{- '' -}}
-                    <input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}"{% if category in selected_categories %} checked="checked"{% endif %}/>
+                    <input type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}"{% if category in selected_categories %} checked="checked"{% endif %}>
                     <label for="checkbox_{{ category|replace(' ', '_') }}" class="tooltips">
                         {{- icon_big(category_icons[category]) if category in category_icons  else icon_big('globe-outline') -}}
                         <div class="category_name">{{- _(category) -}}</div>

searx/templates/simple/elements/infobox.html

@@ -38,7 +38,7 @@
               <input type="hidden" name="safesearch" value="{{ safesearch }}">
               <input type="hidden" name="theme" value="{{ theme }}">
               {%- if timeout_limit -%}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" >{%- endif -%}
-              <input type="submit" value="{{ suggestion }}" />
+              <input type="submit" value="{{ suggestion }}">
             </form>
           {%- endfor -%}
         </div>

searx/templates/simple/preferences.html

@@ -6,7 +6,7 @@
 {%- endmacro -%}
 
 {%- macro tab_header(name, id, label, checked) -%}
-<input type="radio" name="{{ name }}" id="tab-{{ id }}" {% if checked is sameas true %}checked="checked"{% endif %} />
+<input type="radio" name="{{ name }}" id="tab-{{ id }}" {% if checked is sameas true %}checked="checked"{% endif %}>
 <label id="tab-label-{{ id }}" for="tab-{{ id }}" role="tab" aria-controls="tab-content-{{ id }}">{{ label }}</label>
 <section id="tab-content-{{ id }}" role="tabpanel" aria-labelledby="tab-label-{{ id }}" aria-hidden="false">
 {%- endmacro -%}
@@ -23,7 +23,7 @@
   {%- if checked == '?' -%}
     {{- icon_small('warning') -}}
   {%- else -%}
-    <input type="checkbox" {%- if name %} name="{{ name }}" {%- endif %} value="None" {%- if checked %} checked {%- endif -%}{%- if disabled %} disabled {%- endif -%}/>
+    <input type="checkbox" {%- if name %} name="{{ name }}" {%- endif %} value="None" {%- if checked %} checked {%- endif -%}{%- if disabled %} disabled {%- endif -%}>
   {%- endif -%}
 {%- endmacro -%}
 
@@ -33,7 +33,7 @@
          id="{{ name }}" {{- ' ' -}}
          aria-labelledby="pref_{{ name }}"{{- ' ' -}}
          class="checkbox-onoff reversed-checkbox"{{- ' ' -}}
-         {%- if checked -%} checked{%- endif -%}/>
+         {%- if checked -%} checked{%- endif -%}>
 {%- endmacro -%}
 
 {%- macro plugin_preferences(section) -%}

searx/templates/simple/preferences/cookies.html

@@ -1,7 +1,7 @@
 <p class="text-muted">
   {{- _('This is the list of cookies and their values SearXNG is storing on your computer.') }}
-  <br />{{- _('With that list, you can assess SearXNG transparency.') -}}
+  <br>{{- _('With that list, you can assess SearXNG transparency.') -}}
-  <br />{{- '' -}}
+  <br>{{- '' -}}
 </p>
 {% if cookies %}
   <table class="cookies">

searx/templates/simple/preferences/footer.html

@@ -1,9 +1,9 @@
 <p class="small_font">
   {{- _('These settings are stored in your cookies, this allows us not to store this data about you.') -}}
-  <br />{{- _("These cookies serve your sole convenience, we don't use these cookies to track you.") -}}
+  <br>{{- _("These cookies serve your sole convenience, we don't use these cookies to track you.") -}}
 </p>{{- '' -}}
 
-<input type="submit" value="{{ _('Save') }}" />{{- '' -}}
+<input type="submit" value="{{ _('Save') }}">{{- '' -}}
 
 <div class="{% if rtl %}left{% else %}right{% endif %} preferences_back">{{- '' -}}
   <a href="{{ url_for('clear_cookies') }}">{{ _('Reset defaults') }}</a>{{- '' -}}

searx/templates/simple/result_templates/map.html

@@ -18,12 +18,12 @@
                 <span itemprop="streetAddress">
                     {%- if result.address.house_number -%}{{- result.address.house_number -}}, {% endif %}
                     {{- result.address.road -}}
-                </span><br/>
+                </span><br>
             {%- endif %}
             {%- if result.address.locality -%}
                 <span itemprop="addressLocality">{{- result.address.locality -}}</span>
                 {%- if result.address.postcode -%}, <span itemprop="postalCode">{{- result.address.postcode -}}</span>{% endif %}
-                <br/>
+                <br>
             {%- endif -%}
             {%- if result.address.country -%}
                 <span itemprop="addressCountry">{{- result.address.country -}}</span>

searx/templates/simple/results.html

@@ -3,7 +3,7 @@
 {% macro engine_data_form(engine_data) -%}
     {% for engine_name, kv_data in engine_data.items() %}
         {% for k, v in kv_data.items() %}
-            <input type="hidden" name="engine_data-{{ engine_name }}-{{ k|e }}" value="{{ v|e }}" />
+            <input type="hidden" name="engine_data-{{ engine_name }}-{{ k|e }}" value="{{ v|e }}">
         {% endfor %}
     {% endfor %}
 {%- endmacro %}