From eadd90431e625d2f7d50f2a4e042b67e47bf0577 Mon Sep 17 00:00:00 2001
From: Marnanel Thurman <marnanel@thurman.org.uk>
Date: Mon, 23 Mar 2020 00:59:28 +0000
Subject: [PATCH] intermediate

---
 kepi/trilby_api/models.py                 |  4 ++++
 kepi/trilby_api/serializers.py            |  8 ++------
 kepi/trilby_api/tests/test_integration.py | 10 ++++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/kepi/trilby_api/models.py b/kepi/trilby_api/models.py
index c8a37ce..c3ed5fe 100644
--- a/kepi/trilby_api/models.py
+++ b/kepi/trilby_api/models.py
@@ -321,6 +321,10 @@ class Status(models.Model):
     def application(self):
         return None # FIXME
 
+    @property
+    def in_reply_to_account_id(self):
+        return None # FIXME
+
 ###################
 
 class Notification(models.Model):
diff --git a/kepi/trilby_api/serializers.py b/kepi/trilby_api/serializers.py
index fd330e3..5717ad1 100644
--- a/kepi/trilby_api/serializers.py
+++ b/kepi/trilby_api/serializers.py
@@ -153,7 +153,7 @@ class StatusSerializer(serializers.ModelSerializer):
             required = False)
 
     in_reply_to_account_id = serializers.PrimaryKeyRelatedField(
-            queryset=Status.objects.all,
+            queryset=Person.objects.all,
             required = False)
 
     reblog = serializers.URLField(
@@ -163,17 +163,13 @@ class StatusSerializer(serializers.ModelSerializer):
     # "content" is read-only for HTML;
     # "status" is write-only for text (or Markdown)
     content = serializers.CharField(
-            source='html',
-            required = False,
             read_only = True)
 
     status = serializers.CharField(
-            source='content',
-            required = False,
+            source='source_text',
             write_only = True)
 
     created_at = serializers.DateTimeField(
-            source='published',
             required = False,
             read_only = True)
 
diff --git a/kepi/trilby_api/tests/test_integration.py b/kepi/trilby_api/tests/test_integration.py
index 0c530fa..fab82e5 100644
--- a/kepi/trilby_api/tests/test_integration.py
+++ b/kepi/trilby_api/tests/test_integration.py
@@ -40,9 +40,11 @@ class TestIntegration(TestCase):
         content = json.loads(result.content.decode())
 
         self.assertEqual(
-                [
+                sorted([
                 'id', 'uri', 'url',
-                'account', 'in_reply_to_account_id',
+                'account',
+                'in_reply_to_id',
+                'in_reply_to_account_id',
                 'content', 'created_at',
                 'emojis', 'reblogs_count',
                 'favourites_count', 'reblogged',
@@ -58,8 +60,8 @@ class TestIntegration(TestCase):
                 'application',
                 'language',
                 'pinned',
-                ],
-                list(content.keys()),
+                ]),
+                sorted(list(content.keys())),
                 )
 
     def test_post_to_own_timeline(self):