Merge branch 'main' into misc/add_signatures_to_requests_for_masto_compat

bookwyrm/activitypub/base_activity.py

@@ -25,22 +25,6 @@ class ActivityEncoder(JSONEncoder):
         return o.__dict__
 
 
-@dataclass
-class Link:
-    """for tagging a book in a status"""
-
-    href: str
-    name: str
-    type: str = "Link"
-
-
-@dataclass
-class Mention(Link):
-    """a subtype of Link for mentioning an actor"""
-
-    type: str = "Mention"
-
-
 @dataclass
 # pylint: disable=invalid-name
 class Signature:
@@ -203,8 +187,9 @@ class ActivityObject:
                 )
         return instance
 
-    def serialize(self):
+    def serialize(self, **kwargs):
         """convert to dictionary with context attr"""
+        omit = kwargs.get("omit", ())
         data = self.__dict__.copy()
         # recursively serialize
         for (k, v) in data.items():
@@ -213,8 +198,9 @@ class ActivityObject:
                     data[k] = v.serialize()
             except TypeError:
                 pass
-        data = {k: v for (k, v) in data.items() if v is not None}
-        data["@context"] = "https://www.w3.org/ns/activitystreams"
+        data = {k: v for (k, v) in data.items() if v is not None and k not in omit}
+        if "@context" not in omit:
+            data["@context"] = "https://www.w3.org/ns/activitystreams"
         return data
 
 
@@ -227,35 +213,32 @@ def set_related_field(
     model = apps.get_model(f"bookwyrm.{model_name}", require_ready=True)
     origin_model = apps.get_model(f"bookwyrm.{origin_model_name}", require_ready=True)
 
-    with transaction.atomic():
-        if isinstance(data, str):
-            existing = model.find_existing_by_remote_id(data)
-            if existing:
-                data = existing.to_activity()
-            else:
-                data = get_data(data)
-        activity = model.activity_serializer(**data)
+    if isinstance(data, str):
+        existing = model.find_existing_by_remote_id(data)
+        if existing:
+            data = existing.to_activity()
+        else:
+            data = get_data(data)
+    activity = model.activity_serializer(**data)
 
-        # this must exist because it's the object that triggered this function
-        instance = origin_model.find_existing_by_remote_id(related_remote_id)
-        if not instance:
-            raise ValueError(f"Invalid related remote id: {related_remote_id}")
+    # this must exist because it's the object that triggered this function
+    instance = origin_model.find_existing_by_remote_id(related_remote_id)
+    if not instance:
+        raise ValueError(f"Invalid related remote id: {related_remote_id}")
 
-        # set the origin's remote id on the activity so it will be there when
-        # the model instance is created
-        # edition.parentWork = instance, for example
-        model_field = getattr(model, related_field_name)
-        if hasattr(model_field, "activitypub_field"):
-            setattr(
-                activity, getattr(model_field, "activitypub_field"), instance.remote_id
-            )
-        item = activity.to_model()
+    # set the origin's remote id on the activity so it will be there when
+    # the model instance is created
+    # edition.parentWork = instance, for example
+    model_field = getattr(model, related_field_name)
+    if hasattr(model_field, "activitypub_field"):
+        setattr(activity, getattr(model_field, "activitypub_field"), instance.remote_id)
+    item = activity.to_model()
 
-        # if the related field isn't serialized (attachments on Status), then
-        # we have to set it post-creation
-        if not hasattr(model_field, "activitypub_field"):
-            setattr(item, related_field_name, instance)
-            item.save()
+    # if the related field isn't serialized (attachments on Status), then
+    # we have to set it post-creation
+    if not hasattr(model_field, "activitypub_field"):
+        setattr(item, related_field_name, instance)
+        item.save()
 
 
 def get_model_from_type(activity_type):
@@ -316,6 +299,7 @@ def resolve_remote_id(
     # if we're refreshing, "result" will be set and we'll update it
     return item.to_model(model=model, instance=result, save=save)
 
+
 def get_representative():
     try:
         models.User.objects.get(id=-99)
@@ -324,6 +308,7 @@ def get_representative():
         email = "representative@%s" % (DOMAIN)
         models.User.objects.create_user(id=-99, username=username, email=email, local=True, localname=DOMAIN)
 
+
 def get_activitypub_data(url):
     ''' wrapper for request.get '''
     now = http_date()
@@ -352,3 +337,27 @@ def get_activitypub_data(url):
         raise ConnectorException()
 
     return data
+
+
+@dataclass(init=False)
+class Link(ActivityObject):
+    """for tagging a book in a status"""
+
+    href: str
+    name: str = None
+    mediaType: str = None
+    id: str = None
+    attributedTo: str = None
+    type: str = "Link"
+
+    def serialize(self, **kwargs):
+        """remove fields"""
+        omit = ("id", "type", "@context")
+        return super().serialize(omit=omit)
+
+
+@dataclass(init=False)
+class Mention(Link):
+    """a subtype of Link for mentioning an actor"""
+
+    type: str = "Mention"

bookwyrm/activitypub/book.py

@@ -17,6 +17,8 @@ class BookData(ActivityObject):
     goodreadsKey: str = None
     bnfId: str = None
     lastEditedBy: str = None
+    links: List[str] = field(default_factory=lambda: [])
+    fileLinks: List[str] = field(default_factory=lambda: [])
 
 
 # pylint: disable=invalid-name

bookwyrm/activitypub/person.py

@@ -15,6 +15,11 @@ class PublicKey(ActivityObject):
     publicKeyPem: str
     type: str = "PublicKey"
 
+    def serialize(self, **kwargs):
+        """remove fields"""
+        omit = ("type", "@context")
+        return super().serialize(omit=omit)
+
 
 # pylint: disable=invalid-name
 @dataclass(init=False)