Merge branch 'status-serialisers' into issue-47

kepi/bowler_pub/serializers.py

@@ -17,6 +17,8 @@ from rest_framework_constant.fields import ConstantField
 from kepi.bowler_pub.utils import uri_to_url
 from django.conf import settings
 
+PUBLIC = "https://www.w3.org/ns/activitystreams#Public"
+
 #########################################
 
 class StatusObjectSerializer(serializers.ModelSerializer):
@@ -40,36 +42,63 @@ class StatusObjectSerializer(serializers.ModelSerializer):
                 'replies',
                 )
 
-class CreateActivitySerializer(serializers.ModelSerializer):
+class StatusActivitySerializer(serializers.ModelSerializer):
+
     class Meta:
         model = trilby_models.Status
-        fields = (
-                'type',
-                'actor',
-                'published',
-                'to',
-                'cc',
-                'object',
-                )
 
-    type = ConstantField(
-            value="Create",
-            )
-    actor = serializers.CharField(
-            source = "account",
-            )
-    published = serializers.DateTimeField(
-            source = "created_at",
-            )
-    to = ConstantField(
-            value="FIXME", # FIXME
-            )
-    cc = ConstantField(
-            value="FIXME", # FIXME
-            )
-    object = ConstantField(
-            value="FIXME", # FIXME
-            )
+    def _object_field_for_create(self, status,
+            to, cc, replies):
+        return {
+                'id': status.url,
+                'url': status.url,
+                'type': 'Note',
+                'summary': status.spoiler_text,
+                'inReplyTo': status.in_reply_to,
+                'published': status.created_at,
+                'attributedTo': status.account.url,
+                'to': to,
+                'cc': cc,
+                'sensitive': status.sensitive,
+                'conversation': status.conversation,
+                'content': status.content,
+                'contentMap': {
+                    status.language: status.content,
+                    },
+                'attachment': status.media_attachments,
+                'tag': status.tags,
+                'replies': replies,
+                }
+
+    def _object_field_for_reblog(self, status):
+        return status.reblog_of.url
+
+    def to_representation(self, status):
+
+        to = [PUBLIC] # FIXME
+        cc = [] # FIXME
+
+        replies = [
+                self.to_representation(x)
+                for x in status.replies.all()]
+
+        if status.reblog_of is None:
+            type_field = 'Create'
+            object_field = self._object_field_for_create(status,
+                    to=to, cc=cc, replies=replies)
+        else:
+            type_field = 'Announce'
+            object_field = self._object_field_for_reblog(status)
+
+        return {
+                'id': status.activity_url,
+                'type': type_field,
+                'actor': status.account.url,
+                'published': status.created_at,
+                'to': to,
+                'cc': cc,
+                'object': object_field,
+               }
 
 class ImageField(serializers.Field):
 

kepi/bowler_pub/views/activitypub.py

@@ -435,7 +435,7 @@ class CollectionView(generics.GenericAPIView):
                 )
 
     def _modify_list_item(self, item):
-        serializer = bowler_serializers.CreateActivitySerializer(
+        serializer = bowler_serializers.StatusActivitySerializer(
                 item,
                 )
         return serializer.data

kepi/kepi/settings.py

@@ -43,6 +43,7 @@ KEPI = {
         'USER_LINK': '/users/%(username)s',
         'COLLECTION_LINK': '/users/%(username)s/%(listname)s',
         'STATUS_LINK': '/users/%(username)s/%(id)s',
+        'STATUS_ACTIVITY_LINK': '/users/%(username)s/%(id)s/activity',
         'STATUS_FEED_LINK': '/users/%(username)s/feed/%(id)s',
         'USER_FEED_LINK': '/users/%(username)s/feed',
         'USER_WEBFINGER_LINK': '/.well-known/webfinger?resource=acct:%(username)s@%(hostname)s',

kepi/trilby_api/models/status.py

@@ -193,6 +193,18 @@ class Status(PolymorphicModel):
                 'id': self.id,
                 })
 
+    @property
+    def activity_url(self):
+        if self.remote_url is not None:
+            raise ValueError(
+                    "Activity URL is not stored for remote statuses",
+                    )
+
+        return uri_to_url(settings.KEPI['STATUS_ACTIVITY_LINK'] % {
+                'username': self.account.username,
+                'id': self.id,
+                })
+
     @property
     def ancestors(self):