Merge branch 'main' into misc/add_signatures_to_requests_for_masto_compat

bookwyrm/activitypub/base_activity.py

@@ -232,7 +232,7 @@ def set_related_field(
     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()
+    item = activity.to_model(model=model)
 
     # if the related field isn't serialized (attachments on Status), then
     # we have to set it post-creation
@@ -348,6 +348,7 @@ class Link(ActivityObject):
     mediaType: str = None
     id: str = None
     attributedTo: str = None
+    availability: str = None
     type: str = "Link"
 
     def serialize(self, **kwargs):

bookwyrm/activitypub/book.py

@@ -16,6 +16,9 @@ class BookData(ActivityObject):
     librarythingKey: str = None
     goodreadsKey: str = None
     bnfId: str = None
+    viaf: str = None
+    wikidata: str = None
+    asin: str = None
     lastEditedBy: str = None
     links: List[str] = field(default_factory=lambda: [])
     fileLinks: List[str] = field(default_factory=lambda: [])
@@ -27,8 +30,8 @@ class Book(BookData):
     """serializes an edition or work, abstract"""
 
     title: str
-    sortTitle: str = ""
-    subtitle: str = ""
+    sortTitle: str = None
+    subtitle: str = None
     description: str = ""
     languages: List[str] = field(default_factory=lambda: [])
     series: str = ""
@@ -53,7 +56,6 @@ class Edition(Book):
     isbn10: str = ""
     isbn13: str = ""
     oclcNumber: str = ""
-    asin: str = ""
     pages: int = None
     physicalFormat: str = ""
     physicalFormatDetail: str = ""

bookwyrm/activitypub/person.py

@@ -39,4 +39,5 @@ class Person(ActivityObject):
     bookwyrmUser: bool = False
     manuallyApprovesFollowers: str = False
     discoverable: str = False
+    hideFollows: str = False
     type: str = "Person"

bookwyrm/activitypub/verbs.py

@@ -38,7 +38,7 @@ class Create(Verb):
 class Delete(Verb):
     """Create activity"""
 
-    to: List[str]
+    to: List[str] = field(default_factory=lambda: [])
     cc: List[str] = field(default_factory=lambda: [])
     type: str = "Delete"
 
@@ -137,8 +137,8 @@ class Accept(Verb):
     type: str = "Accept"
 
     def action(self):
-        """find and remove the activity object"""
-        obj = self.object.to_model(save=False, allow_create=False)
+        """accept a request"""
+        obj = self.object.to_model(save=False, allow_create=True)
         obj.accept()
 
 
@@ -150,7 +150,7 @@ class Reject(Verb):
     type: str = "Reject"
 
     def action(self):
-        """find and remove the activity object"""
+        """reject a follow request"""
         obj = self.object.to_model(save=False, allow_create=False)
         obj.reject()