Receive and save incoming images

bookwyrm/activitypub/__init__.py

@@ -5,7 +5,8 @@ import sys
 from .base_activity import ActivityEncoder, Image, PublicKey, Signature
 from .base_activity import Link, Mention
 from .base_activity import ActivitySerializerError
-from .base_activity import tag_formatter, image_formatter
+from .base_activity import tag_formatter
+from .base_activity import image_formatter, image_attachments_formatter
 from .note import Note, GeneratedNote, Article, Comment, Review, Quotation
 from .note import Tombstone
 from .interaction import Boost, Like

bookwyrm/activitypub/base_activity.py

@@ -5,7 +5,8 @@ from uuid import uuid4
 
 from django.core.files.base import ContentFile
 from django.db.models.fields.related_descriptors \
-        import ForwardManyToOneDescriptor, ManyToManyDescriptor
+        import ForwardManyToOneDescriptor, ManyToManyDescriptor, \
+        ReverseManyToOneDescriptor
 from django.db.models.fields.files import ImageFileDescriptor
 import requests
 
@@ -95,6 +96,7 @@ class ActivityObject:
         model_fields = [m.name for m in model._meta.get_fields()]
         mapped_fields = {}
         many_to_many_fields = {}
+        one_to_many_fields = {}
         image_fields = {}
 
         for mapping in model.activity_mappings:
@@ -107,15 +109,20 @@ class ActivityObject:
                 value = getattr(self, mapping.activity_key)
             model_field = getattr(model, mapping.model_key)
 
-            # remote_id -> foreign key resolver
-            if isinstance(model_field, ForwardManyToOneDescriptor) and value:
-                fk_model = model_field.field.related_model
-                value = resolve_foreign_key(fk_model, value)
-
             formatted_value = mapping.model_formatter(value)
-            if isinstance(model_field, ManyToManyDescriptor):
+            if isinstance(model_field, ForwardManyToOneDescriptor) and \
+                    formatted_value:
+                # foreign key remote id reolver
+                fk_model = model_field.field.related_model
+                reference = resolve_foreign_key(fk_model, formatted_value)
+                mapped_fields[mapping.model_key] = reference
+            elif isinstance(model_field, ManyToManyDescriptor):
                 many_to_many_fields[mapping.model_key] = formatted_value
+            elif isinstance(model_field, ReverseManyToOneDescriptor):
+                # attachments on statuses, for example
+                one_to_many_fields[mapping.model_key] = formatted_value
             elif isinstance(model_field, ImageFileDescriptor):
+                # image fields need custom handling
                 image_fields[mapping.model_key] = formatted_value
             else:
                 mapped_fields[mapping.model_key] = formatted_value
@@ -137,6 +144,18 @@ class ActivityObject:
         # add images
         for (model_key, value) in image_fields.items():
             getattr(instance, model_key).save(*value, save=True)
+
+        # add one to many fields
+        for (model_key, values) in one_to_many_fields.items():
+            items = []
+            for item in values:
+                # the reference id wasn't available at creation time
+                setattr(item, instance.__class__.__name__.lower(), instance)
+                item.save()
+                items.append(item)
+            if items:
+                getattr(instance, model_key).set(items)
+                instance.save()
         return instance
 
 
@@ -167,15 +186,14 @@ def resolve_foreign_key(model, remote_id):
     return result
 
 
-def tag_formatter(tags):
+def tag_formatter(tags, tag_type):
     ''' helper function to extract foreign keys from tag activity json '''
     items = []
     types = {
         'Book': models.Book,
         'Mention': models.User,
     }
-    for tag in tags:
-        tag_type = tag.get('type')
+    for tag in [t for t in tags if t.get('type') == tag_type]:
         if not tag_type in types:
             continue
         remote_id = tag.get('href')
@@ -203,3 +221,14 @@ def image_formatter(image_json):
     image_name = str(uuid4()) + '.' + url.split('.')[-1]
     image_content = ContentFile(response.content)
     return [image_name, image_content]
+
+
+def image_attachments_formatter(images_json):
+    ''' deserialize a list of images '''
+    attachments = []
+    for image in images_json:
+        attachment = models.Attachment()
+        image_field = image_formatter(image)
+        attachment.image.save(*image_field, save=False)
+        attachments.append(attachment)
+    return attachments