Updates migrations

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

Author: mouse-reeve

README.md

@@ -66,13 +66,13 @@ You will need postgres installed and running on your computer.
 python3 -m venv venv
 source venv/bin/activate
 pip install -r requirements.txt
-createdb fedireads
+createdb bookwyrm
 ```
 
-Create the psql user in `psql fedireads`:
+Create the psql user in `psql bookwyrm`:
 ``` psql
-CREATE ROLE fedireads WITH LOGIN PASSWORD 'fedireads';
-GRANT ALL PRIVILEGES ON DATABASE fedireads TO fedireads;
+CREATE ROLE bookwyrm WITH LOGIN PASSWORD 'bookwyrm';
+GRANT ALL PRIVILEGES ON DATABASE bookwyrm TO bookwyrm;
 ```
 
 Initialize the database (or, more specifically, delete the existing database, run migrations, and start fresh):

bookwyrm/activitypub/person.py

@@ -16,7 +16,7 @@ class Person(ActivityObject):
     publicKey: PublicKey
     endpoints: Dict
     icon: Image = field(default=lambda: {})
-    fedireadsUser: str = False
+    bookwyrmUser: str = False
     manuallyApprovesFollowers: str = False
     discoverable: str = True
     type: str = 'Person'

bookwyrm/books_manager.py

@@ -4,8 +4,8 @@
 
 from requests import HTTPError
 
-from fedireads import models
-from fedireads.tasks import app
+from bookwyrm import models
+from bookwyrm.tasks import app
 
 
 def get_edition(book_id):
@@ -43,7 +43,7 @@ def get_or_create_connector(remote_id):
     except models.Connector.DoesNotExist:
         connector_info = models.Connector.objects.create(
             identifier=identifier,
-            connector_file='fedireads_connector',
+            connector_file='bookwyrm_connector',
             base_url='https://%s' % identifier,
             books_url='https://%s/book' % identifier,
             covers_url='https://%s/images/covers' % identifier,
@@ -115,6 +115,6 @@ def get_connectors():
 def load_connector(connector_info):
     ''' instantiate the connector class '''
     connector = importlib.import_module(
-        'fedireads.connectors.%s' % connector_info.connector_file
+        'bookwyrm.connectors.%s' % connector_info.connector_file
     )
     return connector.Connector(connector_info.identifier)

bookwyrm/broadcast.py

@@ -3,18 +3,18 @@
 from django.utils.http import http_date
 import requests
 
-from fedireads import models
-from fedireads.activitypub import ActivityEncoder
-from fedireads.tasks import app
-from fedireads.signatures import make_signature, make_digest
+from bookwyrm import models
+from bookwyrm.activitypub import ActivityEncoder
+from bookwyrm.tasks import app
+from bookwyrm.signatures import make_signature, make_digest
 
 
 def get_public_recipients(user, software=None):
     ''' everybody and their public inboxes '''
     followers = user.followers.filter(local=False)
     if software:
         # TODO: eventually we may want to handle particular software differently
-        followers = followers.filter(fedireads_user=(software == 'fedireads'))
+        followers = followers.filter(bookwyrm_user=(software == 'bookwyrm'))
 
     # we want shared inboxes when available
     shared = followers.filter(

bookwyrm/connectors/abstract_connector.py

@@ -6,7 +6,7 @@
 
 from django.db import transaction
 
-from fedireads import models
+from bookwyrm import models
 
 
 class AbstractConnector(ABC):

bookwyrm/connectors/fedireads_connector.py bookwyrm/connectors/bookwyrm_connector.py

@@ -1,11 +1,11 @@
-''' using another fedireads instance as a source of book data '''
+''' using another bookwyrm instance as a source of book data '''
 from uuid import uuid4
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.files.base import ContentFile
 import requests
 
-from fedireads import models
+from bookwyrm import models
 from .abstract_connector import AbstractConnector, SearchResult, Mapping
 from .abstract_connector import update_from_mappings, get_date, get_data
 

bookwyrm/connectors/openlibrary.py

@@ -4,7 +4,7 @@
 
 from django.core.files.base import ContentFile
 
-from fedireads import models
+from bookwyrm import models
 from .abstract_connector import AbstractConnector, SearchResult, Mapping
 from .abstract_connector import update_from_mappings
 from .abstract_connector import get_date, get_data

bookwyrm/connectors/self_connector.py

@@ -1,7 +1,7 @@
-''' using a fedireads instance as a source of book data '''
+''' using a bookwyrm instance as a source of book data '''
 from django.contrib.postgres.search import SearchRank, SearchVector
 
-from fedireads import models
+from bookwyrm import models
 from .abstract_connector import AbstractConnector, SearchResult
 
 
@@ -12,7 +12,7 @@ def __init__(self, identifier):
 
 
     def search(self, query):
-        ''' right now you can't search fedireads sorry, but when
+        ''' right now you can't search bookwyrm sorry, but when
         that gets implemented it will totally rule '''
         vector = SearchVector('title', weight='A') +\
             SearchVector('subtitle', weight='B') +\

bookwyrm/connectors/settings.py

@@ -1,3 +1,3 @@
 ''' settings book data connectors '''
 
-CONNECTORS = ['openlibrary', 'self_connector', 'fedireads_connector']
+CONNECTORS = ['openlibrary', 'self_connector', 'bookwyrm_connector']

bookwyrm/forms.py

@@ -5,7 +5,7 @@
 from django.forms import ModelForm, PasswordInput, widgets
 from django import forms
 
-from fedireads import models
+from bookwyrm import models
 
 
 class LoginForm(ModelForm):

bookwyrm/goodreads_import.py

@@ -2,10 +2,10 @@
 import csv
 from requests import HTTPError
 
-from fedireads import outgoing
-from fedireads.tasks import app
-from fedireads.models import ImportJob, ImportItem
-from fedireads.status import create_notification
+from bookwyrm import outgoing
+from bookwyrm.tasks import app
+from bookwyrm.models import ImportJob, ImportItem
+from bookwyrm.status import create_notification
 
 # TODO: remove or increase once we're confident it's not causing problems.
 MAX_ENTRIES = 500

bookwyrm/incoming.py

@@ -8,11 +8,11 @@
 from django.views.decorators.csrf import csrf_exempt
 import requests
 
-from fedireads import activitypub, books_manager, models, outgoing
-from fedireads import status as status_builder
-from fedireads.remote_user import get_or_create_remote_user, refresh_remote_user
-from fedireads.tasks import app
-from fedireads.signatures import Signature
+from bookwyrm import activitypub, books_manager, models, outgoing
+from bookwyrm import status as status_builder
+from bookwyrm.remote_user import get_or_create_remote_user, refresh_remote_user
+from bookwyrm.tasks import app
+from bookwyrm.signatures import Signature
 
 
 @csrf_exempt

bookwyrm/migrations/0001_initial.py

@@ -7,7 +7,7 @@
 from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
-import fedireads.utils.fields
+import bookwyrm.utils.fields
 
 
 class Migration(migrations.Migration):
@@ -62,7 +62,7 @@ class Migration(migrations.Migration):
                 ('content', models.TextField(blank=True, null=True)),
                 ('created_date', models.DateTimeField(auto_now_add=True)),
                 ('openlibrary_key', models.CharField(max_length=255)),
-                ('data', fedireads.utils.fields.JSONField()),
+                ('data', bookwyrm.utils.fields.JSONField()),
             ],
             options={
                 'abstract': False,
@@ -75,10 +75,10 @@ class Migration(migrations.Migration):
                 ('content', models.TextField(blank=True, null=True)),
                 ('created_date', models.DateTimeField(auto_now_add=True)),
                 ('openlibrary_key', models.CharField(max_length=255, unique=True)),
-                ('data', fedireads.utils.fields.JSONField()),
+                ('data', bookwyrm.utils.fields.JSONField()),
                 ('cover', models.ImageField(blank=True, null=True, upload_to='covers/')),
                 ('added_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
-                ('authors', models.ManyToManyField(to='fedireads.Author')),
+                ('authors', models.ManyToManyField(to='bookwyrm.Author')),
             ],
             options={
                 'abstract': False,
@@ -120,9 +120,9 @@ class Migration(migrations.Migration):
                 ('local', models.BooleanField(default=True)),
                 ('privacy', models.CharField(default='public', max_length=255)),
                 ('sensitive', models.BooleanField(default=False)),
-                ('mention_books', models.ManyToManyField(related_name='mention_book', to='fedireads.Book')),
+                ('mention_books', models.ManyToManyField(related_name='mention_book', to='bookwyrm.Book')),
                 ('mention_users', models.ManyToManyField(related_name='mention_user', to=settings.AUTH_USER_MODEL)),
-                ('reply_parent', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='fedireads.Status')),
+                ('reply_parent', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Status')),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
             ],
             options={
@@ -151,8 +151,8 @@ class Migration(migrations.Migration):
                 ('content', models.TextField(blank=True, null=True)),
                 ('created_date', models.DateTimeField(auto_now_add=True)),
                 ('added_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
-                ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='fedireads.Book')),
-                ('shelf', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='fedireads.Shelf')),
+                ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')),
+                ('shelf', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Shelf')),
             ],
             options={
                 'unique_together': {('book', 'shelf')},
@@ -161,7 +161,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='shelf',
             name='books',
-            field=models.ManyToManyField(through='fedireads.ShelfBook', to='fedireads.Book'),
+            field=models.ManyToManyField(through='bookwyrm.ShelfBook', to='bookwyrm.Book'),
         ),
         migrations.AddField(
             model_name='shelf',
@@ -171,17 +171,17 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='book',
             name='shelves',
-            field=models.ManyToManyField(through='fedireads.ShelfBook', to='fedireads.Shelf'),
+            field=models.ManyToManyField(through='bookwyrm.ShelfBook', to='bookwyrm.Shelf'),
         ),
         migrations.AddField(
             model_name='user',
             name='federated_server',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='fedireads.FederatedServer'),
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.FederatedServer'),
         ),
         migrations.AddField(
             model_name='user',
             name='followers',
-            field=models.ManyToManyField(through='fedireads.UserRelationship', to=settings.AUTH_USER_MODEL),
+            field=models.ManyToManyField(through='bookwyrm.UserRelationship', to=settings.AUTH_USER_MODEL),
         ),
         migrations.AddField(
             model_name='user',
@@ -200,14 +200,14 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='Review',
             fields=[
-                ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='fedireads.Status')),
+                ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Status')),
                 ('name', models.CharField(max_length=255)),
                 ('rating', models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5)])),
-                ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='fedireads.Book')),
+                ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')),
             ],
             options={
                 'abstract': False,
             },
-            bases=('fedireads.status',),
+            bases=('bookwyrm.status',),
         ),
     ]

bookwyrm/migrations/0002_auto_20200219_0816.py

@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('fedireads', '0001_initial'),
+        ('bookwyrm', '0001_initial'),
     ]
 
     operations = [
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('content', models.TextField(blank=True, null=True)),
                 ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('status', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='fedireads.Status')),
+                ('status', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Status')),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
             ],
             options={
@@ -28,11 +28,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='status',
             name='favorites',
-            field=models.ManyToManyField(related_name='user_favorites', through='fedireads.Favorite', to=settings.AUTH_USER_MODEL),
+            field=models.ManyToManyField(related_name='user_favorites', through='bookwyrm.Favorite', to=settings.AUTH_USER_MODEL),
         ),
         migrations.AddField(
             model_name='user',
             name='favorites',
-            field=models.ManyToManyField(related_name='favorite_statuses', through='fedireads.Favorite', to='fedireads.Status'),
+            field=models.ManyToManyField(related_name='favorite_statuses', through='bookwyrm.Favorite', to='bookwyrm.Status'),
         ),
     ]

bookwyrm/migrations/0003_auto_20200221_0131.py

@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('fedireads', '0002_auto_20200219_0816'),
+        ('bookwyrm', '0002_auto_20200219_0816'),
     ]
 
     operations = [

bookwyrm/migrations/0004_tag.py

@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('fedireads', '0003_auto_20200221_0131'),
+        ('bookwyrm', '0003_auto_20200221_0131'),
     ]
 
     operations = [
@@ -19,7 +19,7 @@ class Migration(migrations.Migration):
                 ('created_date', models.DateTimeField(auto_now_add=True)),
                 ('updated_date', models.DateTimeField(auto_now=True)),
                 ('name', models.CharField(max_length=140)),
-                ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='fedireads.Book')),
+                ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
             ],
             options={

bookwyrm/migrations/0005_auto_20200221_1645.py

@@ -5,7 +5,7 @@
 
 def populate_identifiers(app_registry, schema_editor):
     db_alias = schema_editor.connection.alias
-    tags = app_registry.get_model('fedireads', 'Tag')
+    tags = app_registry.get_model('bookwyrm', 'Tag')
     for tag in tags.objects.using(db_alias):
         tag.identifier = re.sub(r'\W+', '-', tag.name).lower()
         tag.save()
@@ -14,7 +14,7 @@ def populate_identifiers(app_registry, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('fedireads', '0004_tag'),
+        ('bookwyrm', '0004_tag'),
     ]
 
     operations = [

bookwyrm/migrations/0006_auto_20200221_1702.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('fedireads', '0005_auto_20200221_1645'),
+        ('bookwyrm', '0005_auto_20200221_1645'),
     ]
 
     operations = [

bookwyrm/migrations/0007_auto_20200223_0902.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('fedireads', '0006_auto_20200221_1702'),
+        ('bookwyrm', '0006_auto_20200221_1702'),
     ]
 
     operations = [

bookwyrm/migrations/0008_auto_20200224_1504.py

@@ -7,13 +7,13 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('fedireads', '0007_auto_20200223_0902'),
+        ('bookwyrm', '0007_auto_20200223_0902'),
     ]
 
     operations = [
         migrations.AlterField(
             model_name='user',
             name='followers',
-            field=models.ManyToManyField(related_name='following', through='fedireads.UserRelationship', to=settings.AUTH_USER_MODEL),
+            field=models.ManyToManyField(related_name='following', through='bookwyrm.UserRelationship', to=settings.AUTH_USER_MODEL),
         ),
     ]

bookwyrm/migrations/0009_status_published_date.py

@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('fedireads', '0008_auto_20200224_1504'),
+        ('bookwyrm', '0008_auto_20200224_1504'),
     ]
 
     operations = [