Federating lists and shelves

bookwyrm/models/base_model.py

@@ -161,16 +161,18 @@ class ActivitypubMixin:
         ''' returns the object wrapped in a Create activity '''
         activity_object = self.to_activity(**kwargs)
 
-        signer = pkcs1_15.new(RSA.import_key(user.key_pair.private_key))
-        content = activity_object['content']
-        signed_message = signer.sign(SHA256.new(content.encode('utf8')))
+        signature = None
         create_id = self.remote_id + '/activity'
+        if 'content' in activity_object:
+            signer = pkcs1_15.new(RSA.import_key(user.key_pair.private_key))
+            content = activity_object['content']
+            signed_message = signer.sign(SHA256.new(content.encode('utf8')))
 
-        signature = activitypub.Signature(
-            creator='%s#main-key' % user.remote_id,
-            created=activity_object['published'],
-            signatureValue=b64encode(signed_message).decode('utf8')
-        )
+            signature = activitypub.Signature(
+                creator='%s#main-key' % user.remote_id,
+                created=activity_object['published'],
+                signatureValue=b64encode(signed_message).decode('utf8')
+            )
 
         return activitypub.Create(
             id=create_id,

bookwyrm/models/list.py

@@ -19,12 +19,9 @@ class List(OrderedCollectionMixin, BookWyrmModel):
     name = fields.CharField(max_length=100)
     user = fields.ForeignKey(
         'User', on_delete=models.PROTECT, activitypub_field='owner')
-    description = fields.TextField(blank=True, null=True)
-    privacy = fields.CharField(
-        max_length=255,
-        default='public',
-        choices=fields.PrivacyLevels.choices
-    )
+    description = fields.TextField(
+        blank=True, null=True, activitypub_field='summary')
+    privacy = fields.PrivacyField()
     curation = fields.CharField(
         max_length=255,
         default='closed',

bookwyrm/models/shelf.py

@@ -15,11 +15,7 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel):
     user = fields.ForeignKey(
         'User', on_delete=models.PROTECT, activitypub_field='owner')
     editable = models.BooleanField(default=True)
-    privacy = fields.CharField(
-        max_length=255,
-        default='public',
-        choices=fields.PrivacyLevels.choices
-    )
+    privacy = fields.PrivacyField()
     books = models.ManyToManyField(
         'Edition',
         symmetrical=False,