Merge branch 'main' into review-rate

bookwyrm/activitypub/__init__.py

@@ -11,12 +11,13 @@ from .note import Review, Rating
 from .note import Tombstone
 from .interaction import Boost, Like
 from .ordered_collection import OrderedCollection, OrderedCollectionPage
+from .ordered_collection import BookList, Shelf
 from .person import Person, PublicKey
 from .response import ActivitypubResponse
 from .book import Edition, Work, Author
 from .verbs import Create, Delete, Undo, Update
-from .verbs import Follow, Accept, Reject
-from .verbs import Add, AddBook, Remove
+from .verbs import Follow, Accept, Reject, Block
+from .verbs import Add, AddBook, AddListItem, Remove
 
 # this creates a list of all the Activity types that we can serialize,
 # so when an Activity comes in from outside, we can check if it's known

bookwyrm/activitypub/base_activity.py

@@ -65,6 +65,13 @@ class ActivityObject:
 
     def to_model(self, model, instance=None, save=True):
         ''' convert from an activity to a model instance '''
+        if self.type != model.activity_serializer.type:
+            raise ActivitySerializerError(
+                'Wrong activity type "%s" for activity of type "%s"' % \
+                        (model.activity_serializer.type,
+                         self.type)
+            )
+
         if not isinstance(self, model.activity_serializer):
             raise ActivitySerializerError(
                 'Wrong activity type "%s" for model "%s" (expects "%s")' % \
@@ -93,7 +100,10 @@ class ActivityObject:
         with transaction.atomic():
             # we can't set many to many and reverse fields on an unsaved object
             try:
-                instance.save()
+                try:
+                    instance.save(broadcast=False)
+                except TypeError:
+                    instance.save()
             except IntegrityError as e:
                 raise ActivitySerializerError(e)
 
@@ -130,6 +140,7 @@ class ActivityObject:
     def serialize(self):
         ''' convert to dictionary with context attr '''
         data = self.__dict__
+        data = {k:v for (k, v) in data.items() if v is not None}
         data['@context'] = 'https://www.w3.org/ns/activitystreams'
         return data
 

bookwyrm/activitypub/book.py

@@ -41,6 +41,7 @@ class Edition(Book):
     pages: int = None
     physicalFormat: str = ''
     publishers: List[str] = field(default_factory=lambda: [])
+    editionRank: int = 0
 
     type: str = 'Edition'
 

bookwyrm/activitypub/note.py

@@ -18,7 +18,7 @@ class Note(ActivityObject):
     ''' Note activity '''
     published: str
     attributedTo: str
-    content: str
+    content: str = ''
     to: List[str] = field(default_factory=lambda: [])
     cc: List[str] = field(default_factory=lambda: [])
     replies: Dict = field(default_factory=lambda: {})

bookwyrm/activitypub/ordered_collection.py

@@ -1,5 +1,5 @@
 ''' defines activitypub collections (lists) '''
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import List
 
 from .base_activity import ActivityObject
@@ -10,11 +10,28 @@ class OrderedCollection(ActivityObject):
     ''' structure of an ordered collection activity '''
     totalItems: int
     first: str
-    last: str = ''
-    name: str = ''
-    owner: str = ''
+    last: str = None
+    name: str = None
+    owner: str = None
     type: str = 'OrderedCollection'
 
+@dataclass(init=False)
+class OrderedCollectionPrivate(OrderedCollection):
+    to: List[str] = field(default_factory=lambda: [])
+    cc: List[str] = field(default_factory=lambda: [])
+
+@dataclass(init=False)
+class Shelf(OrderedCollectionPrivate):
+    ''' structure of an ordered collection activity '''
+    type: str = 'Shelf'
+
+@dataclass(init=False)
+class BookList(OrderedCollectionPrivate):
+    ''' structure of an ordered collection activity '''
+    summary: str = None
+    curation: str = 'closed'
+    type: str = 'BookList'
+
 
 @dataclass(init=False)
 class OrderedCollectionPage(ActivityObject):

bookwyrm/activitypub/verbs.py

@@ -18,7 +18,7 @@ class Create(Verb):
     ''' Create activity '''
     to: List
     cc: List
-    signature: Signature
+    signature: Signature = None
     type: str = 'Create'
 
 
@@ -48,6 +48,10 @@ class Follow(Verb):
     ''' Follow activity '''
     type: str = 'Follow'
 
+@dataclass(init=False)
+class Block(Verb):
+    ''' Block activity '''
+    type: str = 'Block'
 
 @dataclass(init=False)
 class Accept(Verb):
@@ -66,17 +70,26 @@ class Reject(Verb):
 @dataclass(init=False)
 class Add(Verb):
     '''Add activity '''
-    target: ActivityObject
+    target: str
+    object: ActivityObject
     type: str = 'Add'
 
 
 @dataclass(init=False)
-class AddBook(Verb):
+class AddBook(Add):
     '''Add activity that's aware of the book obj '''
-    target: Edition
+    object: Edition
     type: str = 'Add'
 
 
+@dataclass(init=False)
+class AddListItem(AddBook):
+    '''Add activity that's aware of the book obj '''
+    notes: str = None
+    order: int = 0
+    approved: bool = True
+
+
 @dataclass(init=False)
 class Remove(Verb):
     '''Remove activity '''