From c33445121629e3f2c22d1715723b34f6fafbd299 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 1 Nov 2020 08:54:10 -0800
Subject: [PATCH] code cleanup

---
 bookwyrm/models/status.py |  5 +++--
 bookwyrm/models/user.py   | 43 ++++++++++++++++++++-------------------
 bookwyrm/urls.py          |  2 +-
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 36dbb06d8..3915dda24 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -59,6 +59,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
 
     @property
     def ap_tag(self):
+        ''' books or (eventually) users tagged in a post '''
         tags = []
         for book in self.mention_books.all():
             tags.append(activitypub.Link(
@@ -117,7 +118,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
             **kwargs
         )
 
-    def to_activity(self, **kwargs):
+    def to_activity(self, pure=False):
         ''' return tombstone if the status is deleted '''
         if self.deleted:
             return activitypub.Tombstone(
@@ -126,7 +127,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
                 deleted=self.deleted_date.isoformat(),
                 published=self.deleted_date.isoformat()
             ).serialize()
-        return ActivitypubMixin.to_activity(self, **kwargs)
+        return ActivitypubMixin.to_activity(self, pure=pure)
 
 
 class GeneratedNote(Status):
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 38442ed75..973d43874 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -167,28 +167,29 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         return activity_object
 
 
-@receiver(models.signals.pre_save, sender=User)
-def execute_before_save(sender, instance, *args, **kwargs):
-    ''' populate fields for new local users '''
-    # this user already exists, no need to poplate fields
-    if instance.id:
-        return
-    if not instance.local:
-        # we need to generate a username that uses the domain (webfinger format)
-        actor_parts = urlparse(instance.remote_id)
-        instance.username = '%s@%s' % (instance.username, actor_parts.netloc)
-        return
+    def save(self, *args, **kwargs):
+        ''' populate fields for new local users '''
+        # this user already exists, no need to populate fields
+        if self.id:
+            return
+        if not self.local:
+            # generate a username that uses the domain (webfinger format)
+            actor_parts = urlparse(self.remote_id)
+            self.username = '%s@%s' % (self.username, actor_parts.netloc)
+            return
 
-    # populate fields for local users
-    instance.remote_id = 'https://%s/user/%s' % (DOMAIN, instance.username)
-    instance.localname = instance.username
-    instance.username = '%s@%s' % (instance.username, DOMAIN)
-    instance.actor = instance.remote_id
-    instance.inbox = '%s/inbox' % instance.remote_id
-    instance.shared_inbox = 'https://%s/inbox' % DOMAIN
-    instance.outbox = '%s/outbox' % instance.remote_id
-    if not instance.private_key:
-        instance.private_key, instance.public_key = create_key_pair()
+        # populate fields for local users
+        self.remote_id = 'https://%s/user/%s' % (DOMAIN, self.username)
+        self.localname = self.username
+        self.username = '%s@%s' % (self.username, DOMAIN)
+        self.actor = self.remote_id
+        self.inbox = '%s/inbox' % self.remote_id
+        self.shared_inbox = 'https://%s/inbox' % DOMAIN
+        self.outbox = '%s/outbox' % self.remote_id
+        if not self.private_key:
+            self.private_key, self.public_key = create_key_pair()
+
+        super().save(*args, **kwargs)
 
 
 @receiver(models.signals.post_save, sender=User)
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 19fdf2e46..78c99ae4a 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -17,7 +17,7 @@ status_types = [
     'comment',
     'quotation',
     'boost',
-    'generatedstatus'
+    'generatednote'
 ]
 status_path = r'%s/(%s)/(?P<status_id>\d+)' % \
         (local_user_path, '|'.join(status_types))