From 7ea31530269721d7ab2856b3ec5d1186836795da Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 26 May 2021 16:57:28 +0200
Subject: [PATCH] Fix site_path tag

---
 bookwyrm/context_processors.py      | 2 ++
 bookwyrm/templates/book/book.html   | 4 ++--
 bookwyrm/templates/layout.html      | 4 ++--
 bookwyrm/templates/user/layout.html | 4 ++--
 bookwyrm/templatetags/layout.py     | 8 --------
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py
index b77c62b02..29775a0b5 100644
--- a/bookwyrm/context_processors.py
+++ b/bookwyrm/context_processors.py
@@ -1,5 +1,6 @@
 """ customize the info available in context for rendering templates """
 from bookwyrm import models
+from bookwyrm.settings import DOMAIN
 
 
 def site_settings(request):  # pylint: disable=unused-argument
@@ -7,4 +8,5 @@ def site_settings(request):  # pylint: disable=unused-argument
     return {
         "site": models.SiteSettings.objects.get(),
         "active_announcements": models.Announcement.active_announcements(),
+        "site_path": "https://%s" % DOMAIN,
     }
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 09d5634bf..02409b389 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -4,8 +4,8 @@
 {% block title %}{{ book|book_title }}{% endblock %}
 
 {% block opengraph_images %}
-<meta name="twitter:image" content="{{ get_path }}/images/{{ book.preview_image }}">
-<meta name="og:image" content="{{ get_path }}/images/{{ book.preview_image }}">
+<meta name="twitter:image" content="{{ site_path }}/images/{{ book.preview_image }}">
+<meta name="og:image" content="{{ site_path }}/images/{{ book.preview_image }}">
 {% endblock %}
 
 {% block content %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index bd3dbf7c1..47bd434e2 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -17,8 +17,8 @@
     <meta name="og:description" content="{{ site.instance_tagline }}">
 
     {% block opengraph_images %}
-    <meta name="twitter:image" content="{{ get_path }}/images/{{ site.preview_image }}">
-    <meta name="og:image" content="{{ get_path }}/images/{{ site.preview_image }}">
+    <meta name="twitter:image" content="{{ site_path }}/images/{{ site.preview_image }}">
+    <meta name="og:image" content="{{ site_path }}/images/{{ site.preview_image }}">
     {% endblock %}
     <meta name="twitter:image:alt" content="BookWyrm Logo">
 </head>
diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index 5f09b8c27..45b37f763 100644
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -8,8 +8,8 @@
 {% block title %}{{ user.display_name }}{% endblock %}
 
 {% block opengraph_images %}
-<meta name="twitter:image" content="{{ get_path }}/images/{{ user.preview_image }}">
-<meta name="og:image" content="{{ get_path }}/images/{{ user.preview_image }}">
+<meta name="twitter:image" content="{{ site_path }}/images/{{ user.preview_image }}">
+<meta name="og:image" content="{{ site_path }}/images/{{ user.preview_image }}">
 {% endblock %}
 
 {% block content %}
diff --git a/bookwyrm/templatetags/layout.py b/bookwyrm/templatetags/layout.py
index f518808c1..f42f3bda1 100644
--- a/bookwyrm/templatetags/layout.py
+++ b/bookwyrm/templatetags/layout.py
@@ -1,8 +1,6 @@
 """ template filters used for creating the layout"""
 from django import template, utils
 
-from bookwyrm.settings import DOMAIN
-
 register = template.Library()
 
 
@@ -11,9 +9,3 @@ def get_lang():
     """get current language, strip to the first two letters"""
     language = utils.translation.get_language()
     return language[0 : language.find("-")]
-
-
-@register.simple_tag(takes_context=False)
-def get_path():
-    """get protocol and host"""
-    return "https://%s" % DOMAIN