Merge pull request #1247 from joachimesque/image-absolute-url-getter

Add get_absolute_url to ImageField

bookwyrm/models/fields.py

@@ -3,6 +3,7 @@ from dataclasses import MISSING
 import imghdr
 import re
 from uuid import uuid4
+from urllib.parse import urljoin
 
 import dateutil.parser
 from dateutil.parser import ParserError
@@ -13,11 +14,12 @@ from django.db import models
 from django.forms import ClearableFileInput, ImageField as DjangoImageField
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
+from django.utils.encoding import filepath_to_uri
 
 from bookwyrm import activitypub
 from bookwyrm.connectors import get_image
 from bookwyrm.sanitize_html import InputHtmlParser
-from bookwyrm.settings import DOMAIN
+from bookwyrm.settings import MEDIA_FULL_URL
 
 
 def validate_remote_id(value):
@@ -387,8 +389,10 @@ def image_serializer(value, alt):
         url = value.url
     else:
         return None
-    if not url[:4] == "http":
-        url = f"https://{DOMAIN}{url}"
+    if url is not None:
+        url = url.lstrip("/")
+    url = urljoin(MEDIA_FULL_URL, url)
+
     return activitypub.Document(url=url, name=alt)
 
 
@@ -424,7 +428,12 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
         activity[key] = formatted
 
     def field_to_activity(self, value, alt=None):
-        return image_serializer(value, alt)
+        url = self.get_absolute_url(value)
+
+        if not url:
+            return None
+
+        return activitypub.Document(url=url, name=alt)
 
     def field_from_activity(self, value):
         image_slug = value
@@ -460,6 +469,20 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
             }
         )
 
+    # pylint: disable=no-self-use
+    def get_absolute_url(self, value):
+        """returns an absolute URL for the image"""
+        name = getattr(value, "name")
+        if not name:
+            return None
+
+        url = filepath_to_uri(name)
+        if url is not None:
+            url = url.lstrip("/")
+        url = urljoin(MEDIA_FULL_URL, url)
+
+        return url
+
 
 class DateTimeField(ActivitypubFieldMixin, models.DateTimeField):
     """activitypub-aware datetime field"""