A better way of handling URIs between local/remote

8 files changed, 11 insertions, 11 deletions

diff --git a/templates/activities/_identity.html b/templates/activities/_identity.html
index c48a645..feb3178 100644
--- a/templates/activities/_identity.html
+++ b/templates/activities/_identity.html
@@ -2,7 +2,7 @@
 <div class="post user">
 
     <a href="{{ identity.urls.view }}">
-        <img src="{{ identity.local_icon_url }}" class="icon" alt="Avatar for {{ identity.name_or_handle }}">
+        <img src="{{ identity.local_icon_url.relative }}" class="icon" alt="Avatar for {{ identity.name_or_handle }}">
     </a>
 
     {% if created %}
diff --git a/templates/activities/_image_uploaded.html b/templates/activities/_image_uploaded.html
index 6821328..36bd7fe 100644
--- a/templates/activities/_image_uploaded.html
+++ b/templates/activities/_image_uploaded.html
@@ -1,6 +1,6 @@
 <div class="uploaded-image">
     <input type="hidden" name="attachment" value="{{ attachment.pk }}">
-    <img src="{{ attachment.thumbnail_url }}">
+    <img src="{{ attachment.thumbnail_url.relative }}">
     <p>
         {{ attachment.name|default:"(no description)" }}
     </p>
diff --git a/templates/activities/_mini_post.html b/templates/activities/_mini_post.html
index 19fad76..9f83333 100644
--- a/templates/activities/_mini_post.html
+++ b/templates/activities/_mini_post.html
@@ -3,7 +3,7 @@
 <div class="post mini" data-takahe-id="{{ post.id }}" role="article">
 
     <a href="{{ post.author.urls.view }}" tabindex="-1">
-        <img src="{{ post.author.local_icon_url }}" class="icon">
+        <img src="{{ post.author.local_icon_url.relative }}" class="icon">
     </a>
 
     <a href="{{ post.author.urls.view }}" class="handle">
diff --git a/templates/activities/_post.html b/templates/activities/_post.html
index 099a35f..5802acd 100644
--- a/templates/activities/_post.html
+++ b/templates/activities/_post.html
@@ -3,7 +3,7 @@
 <div class="post {% if reply %}reply{% endif %}" data-takahe-id="{{ post.id }}" role="article" tabindex="0">
 
     <a href="{{ post.author.urls.view }}" tabindex="-1">
-        <img src="{{ post.author.local_icon_url }}" class="icon">
+        <img src="{{ post.author.local_icon_url.relative }}" class="icon">
     </a>
 
     <time _="on click go url {% if link_original %}{{ post.url }}{% else %}{{ post.urls.view }}{% endif %} then halt">
@@ -75,8 +75,8 @@
           <div class="attachments">
             {% for attachment in post.attachments.all %}
               {% if attachment.is_image %}
-                <a href="{{ attachment.full_url }}" class="image">
-                  <img src="{{ attachment.thumbnail_url }}" title="{{ attachment.name }}" alt="{{ attachment.name }}" />
+                <a href="{{ attachment.full_url.relative }}" class="image">
+                  <img src="{{ attachment.thumbnail_url.relative }}" title="{{ attachment.name }}" alt="{{ attachment.name }}" />
                 </a>
               {% endif %}
             {% endfor %}
diff --git a/templates/activities/follows.html b/templates/activities/follows.html
index 6116dd6..27a13d3 100644
--- a/templates/activities/follows.html
+++ b/templates/activities/follows.html
@@ -6,7 +6,7 @@
     <section class="icon-menu">
         {% for identity, details in identities %}
             <a class="option" href="{{ identity.urls.view }}">
-                <img src="{{ identity.local_icon_url }}">
+                <img src="{{ identity.local_icon_url.relative }}">
                 <span class="handle">
                     {{ identity.name_or_handle }}
                     <small>@{{ identity.handle }}</small>
diff --git a/templates/base.html b/templates/base.html
index df8ebdf..4614223 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -48,7 +48,7 @@
                             <img src="{% static "img/unknown-icon-128.png" %}" title="No identity selected">
                         {% else %}
                             {{ request.identity.username }}
-                            <img src="{{ request.identity.local_icon_url }}" title="{{ request.identity.handle }}">
+                            <img src="{{ request.identity.local_icon_url.relative }}" title="{{ request.identity.handle }}">
                         {% endif %}
                     </a>
                 {% else %}
diff --git a/templates/identity/select.html b/templates/identity/select.html
index d63f886..b3fc41d 100644
--- a/templates/identity/select.html
+++ b/templates/identity/select.html
@@ -6,7 +6,7 @@
     <section class="icon-menu">
         {% for identity in identities %}
             <a class="option" href="{{ identity.urls.activate }}">
-                <img src="{{ identity.local_icon_url }}">
+                <img src="{{ identity.local_icon_url.relative }}">
                 <span class="handle">
                     {{ identity.name_or_handle }}
                     <small>@{{ identity.handle }}</small>
diff --git a/templates/identity/view.html b/templates/identity/view.html
index 612e3d2..8d5806f 100644
--- a/templates/identity/view.html
+++ b/templates/identity/view.html
@@ -13,10 +13,10 @@
 {% block content %}
     <h1 class="identity">
         {% if identity.local_image_url %}
-            <img src="{{ identity.local_image_url }}" class="banner">
+            <img src="{{ identity.local_image_url.relative }}" class="banner">
         {% endif %}
 
-        <img src="{{ identity.local_icon_url }}" class="icon">
+        <img src="{{ identity.local_icon_url.relative }}" class="icon">
 
         {% if request.identity %}
             {% if identity == request.identity %}