Updates migrations

To get the app working again I ran resetdb, let it crash in initdb,
then ran the migration, then re-ran initdb

bookwyrm/models/base_model.py

@@ -11,8 +11,8 @@ from Crypto.Hash import SHA256
 from django.db import models
 from django.dispatch import receiver
 
-from fedireads import activitypub
-from fedireads.settings import DOMAIN
+from bookwyrm import activitypub
+from bookwyrm.settings import DOMAIN
 
 class FedireadsModel(models.Model):
     ''' shared fields '''

bookwyrm/models/book.py

@@ -4,9 +4,9 @@ from django.utils import timezone
 from django.utils.http import http_date
 from model_utils.managers import InheritanceManager
 
-from fedireads import activitypub
-from fedireads.settings import DOMAIN
-from fedireads.utils.fields import ArrayField
+from bookwyrm import activitypub
+from bookwyrm.settings import DOMAIN
+from bookwyrm.utils.fields import ArrayField
 
 from .base_model import ActivityMapping, ActivitypubMixin, FedireadsModel
 

bookwyrm/models/connector.py

@@ -1,6 +1,6 @@
 ''' manages interfaces with external sources of book data '''
 from django.db import models
-from fedireads.connectors.settings import CONNECTORS
+from bookwyrm.connectors.settings import CONNECTORS
 
 from .base_model import FedireadsModel
 

bookwyrm/models/federated_server.py

@@ -8,7 +8,7 @@ class FederatedServer(FedireadsModel):
     server_name = models.CharField(max_length=255, unique=True)
     # federated, blocked, whatever else
     status = models.CharField(max_length=255, default='federated')
-    # is it mastodon, fedireads, etc
+    # is it mastodon, bookwyrm, etc
     application_type = models.CharField(max_length=255, null=True)
     application_version = models.CharField(max_length=255, null=True)
 

bookwyrm/models/import_job.py

@@ -5,11 +5,11 @@ import dateutil.parser
 from django.db import models
 from django.utils import timezone
 
-from fedireads import books_manager
-from fedireads.models import ReadThrough, User, Book
-from fedireads.utils.fields import JSONField
+from bookwyrm import books_manager
+from bookwyrm.models import ReadThrough, User, Book
+from bookwyrm.utils.fields import JSONField
 
-# Mapping goodreads -> fedireads shelf titles.
+# Mapping goodreads -> bookwyrm shelf titles.
 GOODREADS_SHELVES = {
     'read': 'read',
     'currently-reading': 'reading',

bookwyrm/models/relationship.py

@@ -1,7 +1,7 @@
 ''' defines relationships between users '''
 from django.db import models
 
-from fedireads import activitypub
+from bookwyrm import activitypub
 from .base_model import FedireadsModel
 
 

bookwyrm/models/shelf.py

@@ -1,7 +1,7 @@
 ''' puttin' books on shelves '''
 from django.db import models
 
-from fedireads import activitypub
+from bookwyrm import activitypub
 from .base_model import FedireadsModel, OrderedCollectionMixin
 
 

bookwyrm/models/site.py

@@ -5,7 +5,7 @@ from django.db import models
 from django.utils import timezone
 import datetime
 
-from fedireads.settings import DOMAIN
+from bookwyrm.settings import DOMAIN
 from .user import User
 
 class SiteSettings(models.Model):

bookwyrm/models/status.py

@@ -5,7 +5,7 @@ from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from model_utils.managers import InheritanceManager
 
-from fedireads import activitypub
+from bookwyrm import activitypub
 from .base_model import ActivitypubMixin, OrderedCollectionPageMixin
 from .base_model import ActivityMapping, FedireadsModel
 
@@ -67,7 +67,7 @@ class Status(OrderedCollectionPageMixin, FedireadsModel):
         ActivityMapping('replies', 'ap_replies'),
     ]
 
-    # serializing to fedireads expanded activitypub
+    # serializing to bookwyrm expanded activitypub
     activity_mappings = shared_mappings + [
         ActivityMapping('name', 'name'),
         ActivityMapping('inReplyToBook', 'book'),

bookwyrm/models/tag.py

@@ -3,8 +3,8 @@ import urllib.parse
 
 from django.db import models
 
-from fedireads import activitypub
-from fedireads.settings import DOMAIN
+from bookwyrm import activitypub
+from bookwyrm.settings import DOMAIN
 from .base_model import OrderedCollectionMixin, FedireadsModel
 
 

bookwyrm/models/user.py

@@ -5,11 +5,11 @@ from django.contrib.auth.models import AbstractUser
 from django.db import models
 from django.dispatch import receiver
 
-from fedireads import activitypub
-from fedireads.models.shelf import Shelf
-from fedireads.models.status import Status
-from fedireads.settings import DOMAIN
-from fedireads.signatures import create_key_pair
+from bookwyrm import activitypub
+from bookwyrm.models.shelf import Shelf
+from bookwyrm.models.status import Status
+from bookwyrm.settings import DOMAIN
+from bookwyrm.signatures import create_key_pair
 from .base_model import OrderedCollectionPageMixin
 from .base_model import ActivityMapping
 
@@ -28,7 +28,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     outbox = models.CharField(max_length=255, unique=True)
     summary = models.TextField(blank=True, null=True)
     local = models.BooleanField(default=True)
-    fedireads_user = models.BooleanField(default=True)
+    bookwyrm_user = models.BooleanField(default=True)
     localname = models.CharField(
         max_length=255,
         null=True,