diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index a478a41c2..c784c3c17 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -2,12 +2,13 @@
from dataclasses import dataclass, fields, MISSING
from json import JSONEncoder
-from django.db.models.fields.related_descriptors \
- import ForwardManyToOneDescriptor, ManyToManyDescriptor, \
- ReverseManyToOneDescriptor
+from django.apps import apps
+from django.db import transaction
from django.db.models.fields.files import ImageFileDescriptor
+from django.db.models.fields.related_descriptors import ManyToManyDescriptor
from bookwyrm.connectors import ConnectorException, get_data
+from bookwyrm.tasks import app
class ActivitySerializerError(ValueError):
''' routine problems serializing activitypub json '''
@@ -64,7 +65,8 @@ class ActivityObject:
setattr(self, field.name, value)
- def to_model(self, model, instance=None):
+ @transaction.atomic
+ def to_model(self, model, instance=None, save=True):
''' convert from an activity to a model instance '''
if not isinstance(self, model.activity_serializer):
raise ActivitySerializerError(
@@ -97,26 +99,28 @@ class ActivityObject:
many_to_many_fields[field.name] = value
elif isinstance(model_field, ImageFileDescriptor):
# image fields need custom handling
- getattr(instance, field.name).save(*value)
+ getattr(instance, field.name).save(*value, save=save)
else:
# just a good old fashioned model.field = value
setattr(instance, field.name, value)
+ if not save:
+ # we can't set many to many and reverse fields on an unsaved object
+ return instance
+
instance.save()
# add many to many fields, which have to be set post-save
for (model_key, values) in many_to_many_fields.items():
- # mention books, mention users, followers
+ # mention books/users, for example
getattr(instance, model_key).set(values)
- if not hasattr(model, 'deserialize_reverse_fields'):
+ if not save or not hasattr(model, 'deserialize_reverse_fields'):
return instance
# reversed relationships in the models
for (model_field_name, activity_field_name) in \
model.deserialize_reverse_fields:
- if not activity_field_name:
- continue
# attachments on Status, for example
values = getattr(self, activity_field_name)
if values is None or values is MISSING:
@@ -131,15 +135,13 @@ class ActivityObject:
values = [values]
for item in values:
- if isinstance(item, str):
- item = resolve_remote_id(related_model, item)
- else:
- item = related_model.activity_serializer(**item)
- item = item.to_model(related_model)
- related_name = instance.__class__.__name__.lower()
- setattr(item, related_name, instance)
- item.save()
-
+ set_related_field.delay(
+ related_model.__name__,
+ instance.__class__.__name__,
+ instance.__class__.__name__.lower(),
+ instance.remote_id,
+ item
+ )
return instance
@@ -150,6 +152,28 @@ class ActivityObject:
return data
+@app.task
+@transaction.atomic
+def set_related_field(
+ model_name, origin_model_name,
+ related_field_name, related_remote_id, data):
+ ''' load reverse related fields (editions, attachments) without blocking '''
+ model = apps.get_model('bookwyrm.%s' % model_name, require_ready=True)
+ origin_model = apps.get_model(
+ 'bookwyrm.%s' % origin_model_name,
+ require_ready=True
+ )
+
+ if isinstance(data, str):
+ item = resolve_remote_id(model, data, save=False)
+ else:
+ item = model.activity_serializer(**data)
+ item = item.to_model(model, save=False)
+ instance = find_existing_by_remote_id(origin_model, related_remote_id)
+ setattr(item, related_field_name, instance)
+ item.save()
+
+
def find_existing_by_remote_id(model, remote_id):
''' check for an existing instance of this id in the db '''
objects = model.objects
@@ -168,7 +192,7 @@ def find_existing_by_remote_id(model, remote_id):
return result
-def resolve_remote_id(model, remote_id, refresh=False):
+def resolve_remote_id(model, remote_id, refresh=False, save=True):
''' look up the remote_id in the database or load it remotely '''
result = find_existing_by_remote_id(model, remote_id)
if result and not refresh:
@@ -184,4 +208,4 @@ def resolve_remote_id(model, remote_id, refresh=False):
item = model.activity_serializer(**data)
# if we're refreshing, "result" will be set and we'll update it
- return item.to_model(model, instance=result)
+ return item.to_model(model, instance=result, save=save)
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index b4d08b041..f480ab899 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -126,6 +126,15 @@ class ForeignKey(ActivitypubRelatedFieldMixin, models.ForeignKey):
return None
return value.remote_id
+ def field_from_activity(self, value):
+ print(value)
+ try:
+ validate_remote_id(value)
+ except ValidationError:
+ return None
+ return activitypub.resolve_remote_id(self.related_model, value)
+
+
class OneToOneField(ActivitypubRelatedFieldMixin, models.OneToOneField):
''' activitypub-aware foreign key field '''
diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 51fbdafc6..8b21b88ca 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -86,8 +86,8 @@
{% endif %}
- {% if book.parent_work.edition_set.count > 1 %}
- {{ book.parent_work.edition_set.count }} editions
+ {% if book.parent_work.editions.count > 1 %}
+ {{ book.parent_work.editions.count }} editions
{% endif %}
diff --git a/celerywyrm/celery.py b/celerywyrm/celery.py
index a47aad329..efa081ee8 100644
--- a/celerywyrm/celery.py
+++ b/celerywyrm/celery.py
@@ -19,8 +19,9 @@ app.config_from_object('django.conf:settings', namespace='CELERY')
# Load task modules from all registered Django app configs.
app.autodiscover_tasks()
-app.autodiscover_tasks(['bookwyrm'], related_name='broadcast')
+app.autodiscover_tasks(['bookwyrm'], related_name='activitypub.base_activity')
app.autodiscover_tasks(['bookwyrm'], related_name='books_manager')
+app.autodiscover_tasks(['bookwyrm'], related_name='broadcast')
app.autodiscover_tasks(['bookwyrm'], related_name='emailing')
app.autodiscover_tasks(['bookwyrm'], related_name='goodreads_import')
app.autodiscover_tasks(['bookwyrm'], related_name='incoming')