From c32f975a671b44efac8e04e4aaa0be798199227d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 27 Sep 2021 19:28:50 -0700
Subject: [PATCH] Working in firefox

---
 bookwyrm/templates/opensearch.xml | 25 ++++++++-----------------
 bookwyrm/views/wellknown.py       |  5 ++++-
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/bookwyrm/templates/opensearch.xml b/bookwyrm/templates/opensearch.xml
index 9582cdb7..651958ab 100644
--- a/bookwyrm/templates/opensearch.xml
+++ b/bookwyrm/templates/opensearch.xml
@@ -1,25 +1,16 @@
-{% load i18n %}
-{% load static %}
-<?xml version="1.0" encoding="UTF-8"?>
+{% load i18n %}{% load static %}<?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription
     xmlns="http://a9.com/-/spec/opensearch/1.1/"
-    xmlns
-    moz="http://www.mozilla.org/2006/browser/search/"
+    xmlns:moz="http://www.mozilla.org/2006/browser/search/"
 >
     <ShortName>BW</ShortName>
     <Description>{% blocktrans trimmed with site_name=site.name %}
         {{ site_name }} search
     {% endblocktrans %}</Description>
-    <InputEncoding>UTF-8</InputEncoding>
-    <Image
-        width="16"
-        height="16"
-        type="image/x-icon"
-    >{% if site.favicon %}
-        {% get_media_prefix %}{{ site.favicon }}{% else %}{% static "images/favicon.ico" %}
-    {% endif %}</Image>
-    <Url type="text/html" template="{% url 'search' %}">
-        <Param name="q" value="{searchTerms}"/>
-    </Url>
-    <moz:SearchForm>{% url 'search' %}</moz:SearchForm>
+    <Image width="16" height="16" type="image/x-icon">{{ image }}</Image>
+    <Url
+        type="text/html"
+        method="get"
+        template="https://{{ DOMAIN }}{% url 'search' %}?q={searchTerms}"
+    />
 </OpenSearchDescription>
diff --git a/bookwyrm/views/wellknown.py b/bookwyrm/views/wellknown.py
index a30cfb9f..8b55eaa3 100644
--- a/bookwyrm/views/wellknown.py
+++ b/bookwyrm/views/wellknown.py
@@ -135,4 +135,7 @@ def host_meta(request):
 @require_GET
 def opensearch(request):
     """Open Search xml spec"""
-    return TemplateResponse(request, "opensearch.xml")
+    site = models.SiteSettings.get()
+    logo_path = site.favicon or "images/favicon.png"
+    logo = f"{MEDIA_FULL_URL}{logo_path}"
+    return TemplateResponse(request, "opensearch.xml", {"image": logo, "DOMAIN": DOMAIN})