From 2878e0b731b7f6739361980183ae919a4f645c66 Mon Sep 17 00:00:00 2001
From: Marnanel Thurman <marnanel@thurman.org.uk>
Date: Mon, 12 Aug 2019 19:45:35 +0100
Subject: [PATCH] The special case of activity_form for Create is now in Create
 rather than its parent.

---
 django_kepi/models/activity.py | 21 ++++++++-------------
 tests/test_audience.py         |  3 ++-
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/django_kepi/models/activity.py b/django_kepi/models/activity.py
index a431e37..c50fc4b 100644
--- a/django_kepi/models/activity.py
+++ b/django_kepi/models/activity.py
@@ -7,18 +7,6 @@ logger = logging.getLogger(name='django_kepi')
 
 class Activity(thing.Object):
 
-    @property
-    def activity_form(self):
-        result = super().activity_form
-
-        if self.f_type=='"Create"':
-            # Special case. "Create" activities
-            # have the object written out in full.
-
-            result['object'] = self['object__obj'].activity_form
-
-        return result
-
     def go_into_outbox_if_local(self):
 
         from django_kepi.models.collection import Collection
@@ -43,7 +31,14 @@ class Activity(thing.Object):
 ##############################
 
 class Create(Activity):
-    pass
+
+    @property
+    def activity_form(self):
+        result = super().activity_form
+
+        result['object'] = self['object__obj'].activity_form
+
+        return result
 
 class Update(Activity):
     pass
diff --git a/tests/test_audience.py b/tests/test_audience.py
index b0aac77..9d71341 100644
--- a/tests/test_audience.py
+++ b/tests/test_audience.py
@@ -1,5 +1,6 @@
 from django.test import TestCase
-from django_kepi.models import create, Audience
+from django_kepi.models import Audience
+from django_kepi.create import create
 from . import create_local_person, REMOTE_FRED, REMOTE_JIM
 
 class TestAudience(TestCase):