From e09d2ad4a7f7ce101fc8745534b50861d8200860 Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Mon, 28 Mar 2022 15:24:01 -0400
Subject: [PATCH 1/4] [fix] return correct plugin path

closes #1021
---
 searx/templates/oscar/base.html | 2 +-
 searx/webapp.py                 | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index dbc0699df..6a39f0a39 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -103,7 +103,7 @@
             data-infinite-scroll="{% if infinite_scroll %}true{% else %}false{% endif %}"
             data-translations="{{ translations }}"></script>
     {% for script in scripts %}
-    {{""}}<script src="{{ url_for('static', filename=script) }}"></script>
+    {{""}}<script src="{{ url_for('plugins', filename=script) }}"></script>
     {% endfor %}
     <noscript>
       <style>
diff --git a/searx/webapp.py b/searx/webapp.py
index 2f27d0f64..7a07ce513 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -355,6 +355,12 @@ def custom_url_for(endpoint: str, override_theme: Optional[str] = None, **values
             file_hash = static_files.get(filename_with_theme)
             if file_hash:
                 suffix = "?" + file_hash
+    if endpoint == 'plugins' and values.get('filename'):
+        endpoint = 'static'
+        if get_setting('ui.static_use_hash', False):
+            file_hash = static_files.get(values['filename'])
+            if file_hash:
+                suffix = "?" + file_hash
     if endpoint == 'info' and 'locale' not in values:
         locale = request.preferences.get_value('locale')
         if _INFO_PAGES.get_page(values['pagename'], locale) is None:

From f99d109ceb0692d70e473b6f6eb6ab8c53bd5346 Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Mon, 28 Mar 2022 19:27:20 -0400
Subject: [PATCH 2/4] [fix] return correct favicon path

---
 searx/templates/oscar/macros.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html
index 2b27cfd28..ed1499c15 100644
--- a/searx/templates/oscar/macros.html
+++ b/searx/templates/oscar/macros.html
@@ -5,7 +5,7 @@
 
 <!-- Draw favicon -->
 {% macro draw_favicon(favicon) -%}
-    <img width="32" height="32" class="favicon" src="{{ url_for('static', filename='themes/oscar/img/icons/' + favicon + '.png') }}" alt="{{ favicon }}" />
+    <img width="32" height="32" class="favicon" src="{{ url_for('static', filename='img/icons/' + favicon + '.png') }}" alt="{{ favicon }}" />
 {%- endmacro %}
 
 {%- macro result_link(url, title, classes='', id='') -%}

From 6353b850b075bb705698fac899eb3dc305e62063 Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Tue, 29 Mar 2022 13:02:21 -0400
Subject: [PATCH 3/4] [fix] merge fake "plugins" endpoint back to "static"

https: //matrix.to/#/!vxScbLNEAmRvOraXBn:matrix.org/$0zqTtH3s-eVKlMwiAgiEJdetOkRx27EIRs-C0o8FzSg?via=libera.chat&via=matrix.org&via=tchncs.de
Co-Authored-By: Alexandre Flament <alex.andre@al-f.net>
---
 searx/templates/oscar/base.html |  2 +-
 searx/webapp.py                 | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index 6a39f0a39..dbc0699df 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -103,7 +103,7 @@
             data-infinite-scroll="{% if infinite_scroll %}true{% else %}false{% endif %}"
             data-translations="{{ translations }}"></script>
     {% for script in scripts %}
-    {{""}}<script src="{{ url_for('plugins', filename=script) }}"></script>
+    {{""}}<script src="{{ url_for('static', filename=script) }}"></script>
     {% endfor %}
     <noscript>
       <style>
diff --git a/searx/webapp.py b/searx/webapp.py
index 7a07ce513..9b568a668 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -348,19 +348,15 @@ def get_result_template(theme_name: str, template_name: str):
 def custom_url_for(endpoint: str, override_theme: Optional[str] = None, **values):
     suffix = ""
     if endpoint == 'static' and values.get('filename'):
-        theme_name = get_current_theme_name(override=override_theme)
-        filename_with_theme = "themes/{}/{}".format(theme_name, values['filename'])
-        values['filename'] = filename_with_theme
-        if get_setting('ui.static_use_hash', False):
+        file_hash = static_files.get(values['filename'])
+        if not file_hash:
+            # try file in the current theme
+            theme_name = get_current_theme_name(override=override_theme)
+            filename_with_theme = "themes/{}/{}".format(theme_name, values['filename'])
             file_hash = static_files.get(filename_with_theme)
-            if file_hash:
-                suffix = "?" + file_hash
-    if endpoint == 'plugins' and values.get('filename'):
-        endpoint = 'static'
-        if get_setting('ui.static_use_hash', False):
-            file_hash = static_files.get(values['filename'])
-            if file_hash:
-                suffix = "?" + file_hash
+            values['filename'] = filename_with_theme
+        if get_setting('ui.static_use_hash') and file_hash:
+            suffix = "?" + file_hash
     if endpoint == 'info' and 'locale' not in values:
         locale = request.preferences.get_value('locale')
         if _INFO_PAGES.get_page(values['pagename'], locale) is None:

From 96b8aac826703a10591b9a2379829cf9ea1c1c47 Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Tue, 29 Mar 2022 15:17:36 -0400
Subject: [PATCH 4/4] Extra null safety

Co-Authored-By: Alexandre Flament <alex.andre@al-f.net>
---
 searx/webapp.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/searx/webapp.py b/searx/webapp.py
index 9b568a668..47a3c5bd2 100755
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -354,7 +354,8 @@ def custom_url_for(endpoint: str, override_theme: Optional[str] = None, **values
             theme_name = get_current_theme_name(override=override_theme)
             filename_with_theme = "themes/{}/{}".format(theme_name, values['filename'])
             file_hash = static_files.get(filename_with_theme)
-            values['filename'] = filename_with_theme
+            if file_hash:
+                values['filename'] = filename_with_theme
         if get_setting('ui.static_use_hash') and file_hash:
             suffix = "?" + file_hash
     if endpoint == 'info' and 'locale' not in values: