Merge pull request #198 from mouse-reeve/rename

Rename project files from Fedireads to BookWyrm
This commit is contained in:
Mouse Reeve 2020-09-23 07:36:53 -07:00 committed by GitHub
commit ca4b54f5e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
215 changed files with 366 additions and 338 deletions

View file

@ -13,7 +13,7 @@ OL_URL=https://openlibrary.org
## Database backend to use. ## Database backend to use.
## Default is postgres, sqlite is for dev quickstart only (NOT production!!!) ## Default is postgres, sqlite is for dev quickstart only (NOT production!!!)
FEDIREADS_DATABASE_BACKEND=postgres BOOKWYRM_DATABASE_BACKEND=postgres
MEDIA_ROOT=images/ MEDIA_ROOT=images/

2
.gitignore vendored
View file

@ -10,6 +10,6 @@
*.db *.db
*.db-journal *.db-journal
# Fedireads # BookWyrm
.env .env
/images/ /images/

View file

@ -6,5 +6,5 @@ RUN mkdir /app/images
WORKDIR /app WORKDIR /app
COPY requirements.txt /app/ COPY requirements.txt /app/
RUN pip install -r requirements.txt RUN pip install -r requirements.txt
COPY ./fedireads /app COPY ./bookwyrm /app
COPY ./fr_celery /app COPY ./celerywyrm /app

View file

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

View file

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

View file

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

View file

@ -3,10 +3,10 @@ import json
from django.utils.http import http_date from django.utils.http import http_date
import requests import requests
from fedireads import models from bookwyrm import models
from fedireads.activitypub import ActivityEncoder from bookwyrm.activitypub import ActivityEncoder
from fedireads.tasks import app from bookwyrm.tasks import app
from fedireads.signatures import make_signature, make_digest from bookwyrm.signatures import make_signature, make_digest
def get_public_recipients(user, software=None): def get_public_recipients(user, software=None):
@ -14,7 +14,7 @@ def get_public_recipients(user, software=None):
followers = user.followers.filter(local=False) followers = user.followers.filter(local=False)
if software: if software:
# TODO: eventually we may want to handle particular software differently # 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 # we want shared inboxes when available
shared = followers.filter( shared = followers.filter(

View file

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

View file

@ -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 uuid import uuid4
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.core.files.base import ContentFile from django.core.files.base import ContentFile
import requests import requests
from fedireads import models from bookwyrm import models
from .abstract_connector import AbstractConnector, SearchResult, Mapping from .abstract_connector import AbstractConnector, SearchResult, Mapping
from .abstract_connector import update_from_mappings, get_date, get_data from .abstract_connector import update_from_mappings, get_date, get_data

View file

@ -4,7 +4,7 @@ import requests
from django.core.files.base import ContentFile 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 AbstractConnector, SearchResult, Mapping
from .abstract_connector import update_from_mappings from .abstract_connector import update_from_mappings
from .abstract_connector import get_date, get_data from .abstract_connector import get_date, get_data

View file

@ -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 django.contrib.postgres.search import SearchRank, SearchVector
from fedireads import models from bookwyrm import models
from .abstract_connector import AbstractConnector, SearchResult from .abstract_connector import AbstractConnector, SearchResult
@ -12,7 +12,7 @@ class Connector(AbstractConnector):
def search(self, query): 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 ''' that gets implemented it will totally rule '''
vector = SearchVector('title', weight='A') +\ vector = SearchVector('title', weight='A') +\
SearchVector('subtitle', weight='B') +\ SearchVector('subtitle', weight='B') +\

View file

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

View file

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

View file

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

View file

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

View file

@ -7,7 +7,7 @@ import django.core.validators
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
import django.utils.timezone import django.utils.timezone
import fedireads.utils.fields import bookwyrm.utils.fields
class Migration(migrations.Migration): class Migration(migrations.Migration):
@ -62,7 +62,7 @@ class Migration(migrations.Migration):
('content', models.TextField(blank=True, null=True)), ('content', models.TextField(blank=True, null=True)),
('created_date', models.DateTimeField(auto_now_add=True)), ('created_date', models.DateTimeField(auto_now_add=True)),
('openlibrary_key', models.CharField(max_length=255)), ('openlibrary_key', models.CharField(max_length=255)),
('data', fedireads.utils.fields.JSONField()), ('data', bookwyrm.utils.fields.JSONField()),
], ],
options={ options={
'abstract': False, 'abstract': False,
@ -75,10 +75,10 @@ class Migration(migrations.Migration):
('content', models.TextField(blank=True, null=True)), ('content', models.TextField(blank=True, null=True)),
('created_date', models.DateTimeField(auto_now_add=True)), ('created_date', models.DateTimeField(auto_now_add=True)),
('openlibrary_key', models.CharField(max_length=255, unique=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/')), ('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)), ('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={ options={
'abstract': False, 'abstract': False,
@ -120,9 +120,9 @@ class Migration(migrations.Migration):
('local', models.BooleanField(default=True)), ('local', models.BooleanField(default=True)),
('privacy', models.CharField(default='public', max_length=255)), ('privacy', models.CharField(default='public', max_length=255)),
('sensitive', models.BooleanField(default=False)), ('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)), ('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)), ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
], ],
options={ options={
@ -151,8 +151,8 @@ class Migration(migrations.Migration):
('content', models.TextField(blank=True, null=True)), ('content', models.TextField(blank=True, null=True)),
('created_date', models.DateTimeField(auto_now_add=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)), ('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')), ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')),
('shelf', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='fedireads.Shelf')), ('shelf', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Shelf')),
], ],
options={ options={
'unique_together': {('book', 'shelf')}, 'unique_together': {('book', 'shelf')},
@ -161,7 +161,7 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='shelf', model_name='shelf',
name='books', name='books',
field=models.ManyToManyField(through='fedireads.ShelfBook', to='fedireads.Book'), field=models.ManyToManyField(through='bookwyrm.ShelfBook', to='bookwyrm.Book'),
), ),
migrations.AddField( migrations.AddField(
model_name='shelf', model_name='shelf',
@ -171,17 +171,17 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='book', model_name='book',
name='shelves', name='shelves',
field=models.ManyToManyField(through='fedireads.ShelfBook', to='fedireads.Shelf'), field=models.ManyToManyField(through='bookwyrm.ShelfBook', to='bookwyrm.Shelf'),
), ),
migrations.AddField( migrations.AddField(
model_name='user', model_name='user',
name='federated_server', 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( migrations.AddField(
model_name='user', model_name='user',
name='followers', 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( migrations.AddField(
model_name='user', model_name='user',
@ -200,14 +200,14 @@ class Migration(migrations.Migration):
migrations.CreateModel( migrations.CreateModel(
name='Review', name='Review',
fields=[ 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)), ('name', models.CharField(max_length=255)),
('rating', models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5)])), ('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={ options={
'abstract': False, 'abstract': False,
}, },
bases=('fedireads.status',), bases=('bookwyrm.status',),
), ),
] ]

View file

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

View file

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

View file

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

View file

@ -5,7 +5,7 @@ from django.db import migrations, models
def populate_identifiers(app_registry, schema_editor): def populate_identifiers(app_registry, schema_editor):
db_alias = schema_editor.connection.alias 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): for tag in tags.objects.using(db_alias):
tag.identifier = re.sub(r'\W+', '-', tag.name).lower() tag.identifier = re.sub(r'\W+', '-', tag.name).lower()
tag.save() tag.save()
@ -14,7 +14,7 @@ def populate_identifiers(app_registry, schema_editor):
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0004_tag'), ('bookwyrm', '0004_tag'),
] ]
operations = [ operations = [

View file

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

View file

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

View file

@ -7,13 +7,13 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0007_auto_20200223_0902'), ('bookwyrm', '0007_auto_20200223_0902'),
] ]
operations = [ operations = [
migrations.AlterField( migrations.AlterField(
model_name='user', model_name='user',
name='followers', 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),
), ),
] ]

View file

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

View file

@ -3,21 +3,21 @@
import datetime import datetime
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
import fedireads.utils.fields import bookwyrm.utils.fields
import uuid import uuid
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0009_status_published_date'), ('bookwyrm', '0009_status_published_date'),
] ]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name='Edition', name='Edition',
fields=[ fields=[
('book_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='fedireads.Book')), ('book_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Book')),
('isbn', models.CharField(max_length=255, null=True, unique=True)), ('isbn', models.CharField(max_length=255, null=True, unique=True)),
('oclc_number', models.CharField(max_length=255, null=True, unique=True)), ('oclc_number', models.CharField(max_length=255, null=True, unique=True)),
('pages', models.IntegerField(null=True)), ('pages', models.IntegerField(null=True)),
@ -25,18 +25,18 @@ class Migration(migrations.Migration):
options={ options={
'abstract': False, 'abstract': False,
}, },
bases=('fedireads.book',), bases=('bookwyrm.book',),
), ),
migrations.CreateModel( migrations.CreateModel(
name='Work', name='Work',
fields=[ fields=[
('book_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='fedireads.Book')), ('book_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Book')),
('lccn', models.CharField(max_length=255, null=True, unique=True)), ('lccn', models.CharField(max_length=255, null=True, unique=True)),
], ],
options={ options={
'abstract': False, 'abstract': False,
}, },
bases=('fedireads.book',), bases=('bookwyrm.book',),
), ),
migrations.RemoveField( migrations.RemoveField(
model_name='author', model_name='author',
@ -53,7 +53,7 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='author', model_name='author',
name='aliases', name='aliases',
field=fedireads.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, size=None), field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, size=None),
), ),
migrations.AddField( migrations.AddField(
model_name='author', model_name='author',
@ -129,7 +129,7 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='book', model_name='book',
name='misc_identifiers', name='misc_identifiers',
field=fedireads.utils.fields.JSONField(null=True), field=bookwyrm.utils.fields.JSONField(null=True),
), ),
migrations.AddField( migrations.AddField(
model_name='book', model_name='book',
@ -185,6 +185,6 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='book', model_name='book',
name='parent_work', name='parent_work',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='fedireads.Work'), field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Work'),
), ),
] ]

View file

@ -8,7 +8,7 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0010_auto_20200307_0655'), ('bookwyrm', '0010_auto_20200307_0655'),
] ]
operations = [ operations = [
@ -20,8 +20,8 @@ class Migration(migrations.Migration):
('updated_date', models.DateTimeField(auto_now=True)), ('updated_date', models.DateTimeField(auto_now=True)),
('read', models.BooleanField(default=False)), ('read', models.BooleanField(default=False)),
('notification_type', models.CharField(max_length=255)), ('notification_type', models.CharField(max_length=255)),
('related_book', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='fedireads.Book')), ('related_book', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')),
('related_status', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='fedireads.Status')), ('related_status', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Status')),
('related_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='related_user', to=settings.AUTH_USER_MODEL)), ('related_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='related_user', to=settings.AUTH_USER_MODEL)),
('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
], ],

View file

@ -1,19 +1,19 @@
# Generated by Django 3.0.3 on 2020-03-08 16:25 # Generated by Django 3.0.3 on 2020-03-08 16:25
from django.db import migrations, models from django.db import migrations, models
import fedireads.utils.fields import bookwyrm.utils.fields
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0011_notification'), ('bookwyrm', '0011_notification'),
] ]
operations = [ operations = [
migrations.AlterField( migrations.AlterField(
model_name='author', model_name='author',
name='aliases', name='aliases',
field=fedireads.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
), ),
] ]

View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0012_auto_20200308_1625'), ('bookwyrm', '0012_auto_20200308_1625'),
] ]
operations = [ operations = [

View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0013_user_manually_approves_followers'), ('bookwyrm', '0013_user_manually_approves_followers'),
] ]
operations = [ operations = [

View file

@ -8,7 +8,7 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0014_status_remote_id'), ('bookwyrm', '0014_status_remote_id'),
] ]
operations = [ operations = [
@ -88,17 +88,17 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='user', model_name='user',
name='blocks', name='blocks',
field=models.ManyToManyField(related_name='blocked_by', through='fedireads.UserBlocks', to=settings.AUTH_USER_MODEL), field=models.ManyToManyField(related_name='blocked_by', through='bookwyrm.UserBlocks', to=settings.AUTH_USER_MODEL),
), ),
migrations.AddField( migrations.AddField(
model_name='user', model_name='user',
name='follow_requests', name='follow_requests',
field=models.ManyToManyField(related_name='follower_requests', through='fedireads.UserFollowRequest', to=settings.AUTH_USER_MODEL), field=models.ManyToManyField(related_name='follower_requests', through='bookwyrm.UserFollowRequest', to=settings.AUTH_USER_MODEL),
), ),
migrations.AddField( migrations.AddField(
model_name='user', model_name='user',
name='following', name='following',
field=models.ManyToManyField(related_name='followers', through='fedireads.UserFollows', to=settings.AUTH_USER_MODEL), field=models.ManyToManyField(related_name='followers', through='bookwyrm.UserFollows', to=settings.AUTH_USER_MODEL),
), ),
migrations.AddConstraint( migrations.AddConstraint(
model_name='userfollows', model_name='userfollows',

View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0015_auto_20200311_1212'), ('bookwyrm', '0015_auto_20200311_1212'),
] ]
operations = [ operations = [

View file

@ -7,7 +7,7 @@ import django.db.models.expressions
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0016_auto_20200313_1337'), ('bookwyrm', '0016_auto_20200313_1337'),
] ]
operations = [ operations = [

View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0017_auto_20200314_2152'), ('bookwyrm', '0017_auto_20200314_2152'),
] ]
operations = [ operations = [

View file

@ -7,20 +7,20 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0018_favorite_remote_id'), ('bookwyrm', '0018_favorite_remote_id'),
] ]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name='Comment', name='Comment',
fields=[ 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)), ('name', models.CharField(max_length=255)),
('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={ options={
'abstract': False, 'abstract': False,
}, },
bases=('fedireads.status',), bases=('bookwyrm.status',),
), ),
] ]

View file

@ -2,13 +2,13 @@
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
import fedireads.models.book import bookwyrm.models.book
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0019_comment'), ('bookwyrm', '0019_comment'),
] ]
operations = [ operations = [
@ -19,7 +19,7 @@ class Migration(migrations.Migration):
('created_date', models.DateTimeField(auto_now_add=True)), ('created_date', models.DateTimeField(auto_now_add=True)),
('updated_date', models.DateTimeField(auto_now=True)), ('updated_date', models.DateTimeField(auto_now=True)),
('identifier', models.CharField(max_length=255, unique=True)), ('identifier', models.CharField(max_length=255, unique=True)),
('connector_file', models.CharField(choices=[('openlibrary', 'Openlibrary'), ('fedireads', 'Fedireads')], default='openlibrary', max_length=255)), ('connector_file', models.CharField(choices=[('openlibrary', 'Openlibrary'), ('bookwyrm', 'BookWyrm')], default='openlibrary', max_length=255)),
('is_self', models.BooleanField(default=False)), ('is_self', models.BooleanField(default=False)),
('api_key', models.CharField(max_length=255, null=True)), ('api_key', models.CharField(max_length=255, null=True)),
('base_url', models.CharField(max_length=255)), ('base_url', models.CharField(max_length=255)),
@ -48,11 +48,11 @@ class Migration(migrations.Migration):
), ),
migrations.AddConstraint( migrations.AddConstraint(
model_name='connector', model_name='connector',
constraint=models.CheckConstraint(check=models.Q(connector_file__in=fedireads.models.connector.ConnectorFiles), name='connector_file_valid'), constraint=models.CheckConstraint(check=models.Q(connector_file__in=bookwyrm.models.connector.ConnectorFiles), name='connector_file_valid'),
), ),
migrations.AddField( migrations.AddField(
model_name='book', model_name='book',
name='connector', name='connector',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='fedireads.Connector'), field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Connector'),
), ),
] ]

View file

@ -1,13 +1,13 @@
# Generated by Django 3.0.3 on 2020-03-28 04:28 # Generated by Django 3.0.3 on 2020-03-28 04:28
from django.db import migrations, models from django.db import migrations, models
import fedireads.utils.fields import bookwyrm.utils.fields
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0020_auto_20200327_2335'), ('bookwyrm', '0020_auto_20200327_2335'),
] ]
operations = [ operations = [
@ -19,12 +19,12 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='book', model_name='book',
name='subject_places', name='subject_places',
field=fedireads.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
), ),
migrations.AddField( migrations.AddField(
model_name='book', model_name='book',
name='subjects', name='subjects',
field=fedireads.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
), ),
migrations.AddField( migrations.AddField(
model_name='edition', model_name='edition',
@ -34,7 +34,7 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='edition', model_name='edition',
name='publishers', name='publishers',
field=fedireads.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
), ),
migrations.AlterField( migrations.AlterField(
model_name='connector', model_name='connector',

View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0021_auto_20200328_0428'), ('bookwyrm', '0021_auto_20200328_0428'),
] ]
operations = [ operations = [

View file

@ -7,7 +7,7 @@ import uuid
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0022_auto_20200328_2001'), ('bookwyrm', '0022_auto_20200328_2001'),
] ]
operations = [ operations = [

View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0023_auto_20200328_2203'), ('bookwyrm', '0023_auto_20200328_2203'),
] ]
operations = [ operations = [

View file

@ -7,7 +7,7 @@ import django.utils.timezone
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0024_federatedserver_application_version'), ('bookwyrm', '0024_federatedserver_application_version'),
] ]
operations = [ operations = [

View file

@ -7,19 +7,19 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0025_auto_20200330_0037'), ('bookwyrm', '0025_auto_20200330_0037'),
] ]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name='Boost', name='Boost',
fields=[ 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')),
], ],
options={ options={
'abstract': False, 'abstract': False,
}, },
bases=('fedireads.status',), bases=('bookwyrm.status',),
), ),
migrations.RemoveConstraint( migrations.RemoveConstraint(
model_name='notification', model_name='notification',
@ -37,6 +37,6 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='boost', model_name='boost',
name='boosted_status', name='boosted_status',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='boosters', to='fedireads.Status'), field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='boosters', to='bookwyrm.Status'),
), ),
] ]

View file

@ -2,13 +2,13 @@
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
import fedireads.utils.fields import bookwyrm.utils.fields
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0026_auto_20200330_1456'), ('bookwyrm', '0026_auto_20200330_1456'),
] ]
operations = [ operations = [
@ -27,7 +27,7 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='book', model_name='book',
name='languages', name='languages',
field=fedireads.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None), field=bookwyrm.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
), ),
migrations.AddField( migrations.AddField(
model_name='edition', model_name='edition',
@ -37,46 +37,46 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='edition', model_name='edition',
name='parent_work', name='parent_work',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='fedireads.Work'), field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Work'),
), ),
migrations.AddField( migrations.AddField(
model_name='edition', model_name='edition',
name='shelves', name='shelves',
field=models.ManyToManyField(through='fedireads.ShelfBook', to='fedireads.Shelf'), field=models.ManyToManyField(through='bookwyrm.ShelfBook', to='bookwyrm.Shelf'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='comment', model_name='comment',
name='book', name='book',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='fedireads.Edition'), field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='notification', model_name='notification',
name='related_book', name='related_book',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='fedireads.Edition'), field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='review', model_name='review',
name='book', name='book',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='fedireads.Edition'), field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='shelf', model_name='shelf',
name='books', name='books',
field=models.ManyToManyField(through='fedireads.ShelfBook', to='fedireads.Edition'), field=models.ManyToManyField(through='bookwyrm.ShelfBook', to='bookwyrm.Edition'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='shelfbook', model_name='shelfbook',
name='book', name='book',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='fedireads.Edition'), field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='status', model_name='status',
name='mention_books', name='mention_books',
field=models.ManyToManyField(related_name='mention_book', to='fedireads.Edition'), field=models.ManyToManyField(related_name='mention_book', to='bookwyrm.Edition'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='tag', model_name='tag',
name='book', name='book',
field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='fedireads.Edition'), field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
), ),
] ]

View file

@ -7,7 +7,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0027_auto_20200330_2232'), ('bookwyrm', '0027_auto_20200330_2232'),
] ]
operations = [ operations = [

View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0028_auto_20200401_1824'), ('bookwyrm', '0028_auto_20200401_1824'),
] ]
operations = [ operations = [

View file

@ -7,20 +7,20 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0029_auto_20200403_1835'), ('bookwyrm', '0029_auto_20200403_1835'),
] ]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name='Quotation', name='Quotation',
fields=[ 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')),
('quote', models.TextField()), ('quote', models.TextField()),
('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='fedireads.Edition')), ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition')),
], ],
options={ options={
'abstract': False, 'abstract': False,
}, },
bases=('fedireads.status',), bases=('bookwyrm.status',),
), ),
] ]

View file

@ -8,7 +8,7 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0030_quotation'), ('bookwyrm', '0030_quotation'),
] ]
operations = [ operations = [
@ -21,7 +21,7 @@ class Migration(migrations.Migration):
('pages_read', models.IntegerField(blank=True, null=True)), ('pages_read', models.IntegerField(blank=True, null=True)),
('start_date', models.DateTimeField(blank=True, null=True)), ('start_date', models.DateTimeField(blank=True, null=True)),
('finish_date', models.DateTimeField(blank=True, null=True)), ('finish_date', models.DateTimeField(blank=True, null=True)),
('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)), ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
], ],
options={ options={

View file

@ -4,13 +4,13 @@ from django.conf import settings
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
import django.utils.timezone import django.utils.timezone
import fedireads.utils.fields import bookwyrm.utils.fields
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0031_readthrough'), ('bookwyrm', '0031_readthrough'),
] ]
operations = [ operations = [
@ -18,7 +18,7 @@ class Migration(migrations.Migration):
name='ImportItem', name='ImportItem',
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('data', fedireads.utils.fields.JSONField()), ('data', bookwyrm.utils.fields.JSONField()),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
@ -50,11 +50,11 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='importitem', model_name='importitem',
name='book', name='book',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='fedireads.Book'), field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='bookwyrm.Book'),
), ),
migrations.AddField( migrations.AddField(
model_name='importitem', model_name='importitem',
name='job', name='job',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='fedireads.ImportJob'), field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='bookwyrm.ImportJob'),
), ),
] ]

View file

@ -7,7 +7,7 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0032_auto_20200421_1347'), ('bookwyrm', '0032_auto_20200421_1347'),
] ]
operations = [ operations = [
@ -29,7 +29,7 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='notification', model_name='notification',
name='related_import', name='related_import',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='fedireads.ImportJob'), field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.ImportJob'),
), ),
migrations.AlterField( migrations.AlterField(
model_name='notification', model_name='notification',

View file

@ -7,13 +7,13 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0033_auto_20200422_1249'), ('bookwyrm', '0033_auto_20200422_1249'),
] ]
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name='importjob', model_name='importjob',
name='import_status', name='import_status',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='fedireads.Status'), field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Status'),
), ),
] ]

View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0034_importjob_import_status'), ('bookwyrm', '0034_importjob_import_status'),
] ]
operations = [ operations = [

View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0035_auto_20200429_1708'), ('bookwyrm', '0035_auto_20200429_1708'),
] ]
operations = [ operations = [

View file

@ -7,7 +7,7 @@ import django.utils.timezone
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0036_auto_20200503_2007'), ('bookwyrm', '0036_auto_20200503_2007'),
] ]
operations = [ operations = [

View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0037_auto_20200504_0154'), ('bookwyrm', '0037_auto_20200504_0154'),
] ]
operations = [ operations = [

View file

@ -6,7 +6,7 @@ from django.db import migrations
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0038_author_remote_id'), ('bookwyrm', '0038_author_remote_id'),
] ]
operations = [ operations = [

View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0039_auto_20200510_2342'), ('bookwyrm', '0039_auto_20200510_2342'),
] ]
operations = [ operations = [

View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0040_auto_20200513_0153'), ('bookwyrm', '0040_auto_20200513_0153'),
] ]
operations = [ operations = [

View file

@ -6,7 +6,7 @@ from django.db import migrations
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0041_user_remote_id'), ('bookwyrm', '0041_user_remote_id'),
] ]
operations = [ operations = [

View file

@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0041_user_remote_id'), ('bookwyrm', '0041_user_remote_id'),
] ]
operations = [ operations = [

View file

@ -1,13 +1,13 @@
# Generated by Django 3.0.3 on 2020-06-01 21:31 # Generated by Django 3.0.3 on 2020-06-01 21:31
from django.db import migrations, models from django.db import migrations, models
import fedireads.models.site import bookwyrm.models.site
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0042_sitesettings'), ('bookwyrm', '0042_sitesettings'),
] ]
operations = [ operations = [
@ -15,7 +15,7 @@ class Migration(migrations.Migration):
name='SiteInvite', name='SiteInvite',
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('code', models.CharField(default=fedireads.models.site.new_invite_code, max_length=32)), ('code', models.CharField(default=bookwyrm.models.site.new_invite_code, max_length=32)),
('expiry', models.DateTimeField(blank=True, null=True)), ('expiry', models.DateTimeField(blank=True, null=True)),
('use_limit', models.IntegerField(blank=True, null=True)), ('use_limit', models.IntegerField(blank=True, null=True)),
('times_used', models.IntegerField(default=0)), ('times_used', models.IntegerField(default=0)),

View file

@ -8,7 +8,7 @@ import django.db.models.deletion
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0043_siteinvite'), ('bookwyrm', '0043_siteinvite'),
] ]
operations = [ operations = [

View file

@ -6,8 +6,8 @@ from django.db import migrations
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0044_siteinvite_user'), ('bookwyrm', '0044_siteinvite_user'),
('fedireads', '0042_auto_20200524_0346'), ('bookwyrm', '0042_auto_20200524_0346'),
] ]
operations = [ operations = [

View file

@ -0,0 +1,28 @@
# Generated by Django 3.0.7 on 2020-09-21 15:09
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('bookwyrm', '0045_merge_20200810_2010'),
]
operations = [
migrations.RenameField(
model_name='user',
old_name='fedireads_user',
new_name='bookwyrm_user',
),
migrations.AlterField(
model_name='connector',
name='connector_file',
field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('self_connector', 'Self Connector'), ('bookwyrm_connector', 'BookWyrm Connector')], max_length=255),
),
migrations.AlterField(
model_name='sitesettings',
name='name',
field=models.CharField(default='1d8390fd.ngrok.io', max_length=100),
),
]

View file

@ -11,10 +11,10 @@ from Crypto.Hash import SHA256
from django.db import models from django.db import models
from django.dispatch import receiver from django.dispatch import receiver
from fedireads import activitypub from bookwyrm import activitypub
from fedireads.settings import DOMAIN from bookwyrm.settings import DOMAIN
class FedireadsModel(models.Model): class BookWyrmModel(models.Model):
''' shared fields ''' ''' shared fields '''
created_date = models.DateTimeField(auto_now_add=True) created_date = models.DateTimeField(auto_now_add=True)
updated_date = models.DateTimeField(auto_now=True) updated_date = models.DateTimeField(auto_now=True)

View file

@ -4,14 +4,14 @@ from django.utils import timezone
from django.utils.http import http_date from django.utils.http import http_date
from model_utils.managers import InheritanceManager from model_utils.managers import InheritanceManager
from fedireads import activitypub from bookwyrm import activitypub
from fedireads.settings import DOMAIN from bookwyrm.settings import DOMAIN
from fedireads.utils.fields import ArrayField from bookwyrm.utils.fields import ArrayField
from .base_model import ActivityMapping, ActivitypubMixin, FedireadsModel from .base_model import ActivityMapping, ActivitypubMixin, BookWyrmModel
class Book(ActivitypubMixin, FedireadsModel): class Book(ActivitypubMixin, BookWyrmModel):
''' a generic book, which can mean either an edition or a work ''' ''' a generic book, which can mean either an edition or a work '''
# these identifiers apply to both works and editions # these identifiers apply to both works and editions
openlibrary_key = models.CharField(max_length=255, blank=True, null=True) openlibrary_key = models.CharField(max_length=255, blank=True, null=True)
@ -175,7 +175,7 @@ class Edition(Book):
activity_serializer = activitypub.Edition activity_serializer = activitypub.Edition
class Author(ActivitypubMixin, FedireadsModel): class Author(ActivitypubMixin, BookWyrmModel):
''' copy of an author from OL ''' ''' copy of an author from OL '''
openlibrary_key = models.CharField(max_length=255, blank=True, null=True) openlibrary_key = models.CharField(max_length=255, blank=True, null=True)
sync = models.BooleanField(default=True) sync = models.BooleanField(default=True)

View file

@ -1,12 +1,12 @@
''' manages interfaces with external sources of book data ''' ''' manages interfaces with external sources of book data '''
from django.db import models from django.db import models
from fedireads.connectors.settings import CONNECTORS from bookwyrm.connectors.settings import CONNECTORS
from .base_model import FedireadsModel from .base_model import BookWyrmModel
ConnectorFiles = models.TextChoices('ConnectorFiles', CONNECTORS) ConnectorFiles = models.TextChoices('ConnectorFiles', CONNECTORS)
class Connector(FedireadsModel): class Connector(BookWyrmModel):
''' book data source connectors ''' ''' book data source connectors '''
identifier = models.CharField(max_length=255, unique=True) identifier = models.CharField(max_length=255, unique=True)
priority = models.IntegerField(default=2) priority = models.IntegerField(default=2)

View file

@ -1,14 +1,14 @@
''' connections to external ActivityPub servers ''' ''' connections to external ActivityPub servers '''
from django.db import models from django.db import models
from .base_model import FedireadsModel from .base_model import BookWyrmModel
class FederatedServer(FedireadsModel): class FederatedServer(BookWyrmModel):
''' store which server's we federate with ''' ''' store which server's we federate with '''
server_name = models.CharField(max_length=255, unique=True) server_name = models.CharField(max_length=255, unique=True)
# federated, blocked, whatever else # federated, blocked, whatever else
status = models.CharField(max_length=255, default='federated') 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_type = models.CharField(max_length=255, null=True)
application_version = models.CharField(max_length=255, null=True) application_version = models.CharField(max_length=255, null=True)

View file

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

View file

@ -1,11 +1,11 @@
''' defines relationships between users ''' ''' defines relationships between users '''
from django.db import models from django.db import models
from fedireads import activitypub from bookwyrm import activitypub
from .base_model import FedireadsModel from .base_model import BookWyrmModel
class UserRelationship(FedireadsModel): class UserRelationship(BookWyrmModel):
''' many-to-many through table for followers ''' ''' many-to-many through table for followers '''
user_subject = models.ForeignKey( user_subject = models.ForeignKey(
'User', 'User',

View file

@ -1,11 +1,11 @@
''' puttin' books on shelves ''' ''' puttin' books on shelves '''
from django.db import models from django.db import models
from fedireads import activitypub from bookwyrm import activitypub
from .base_model import FedireadsModel, OrderedCollectionMixin from .base_model import BookWyrmModel, OrderedCollectionMixin
class Shelf(OrderedCollectionMixin, FedireadsModel): class Shelf(OrderedCollectionMixin, BookWyrmModel):
''' a list of books owned by a user ''' ''' a list of books owned by a user '''
name = models.CharField(max_length=100) name = models.CharField(max_length=100)
identifier = models.CharField(max_length=100) identifier = models.CharField(max_length=100)
@ -33,7 +33,7 @@ class Shelf(OrderedCollectionMixin, FedireadsModel):
unique_together = ('user', 'identifier') unique_together = ('user', 'identifier')
class ShelfBook(FedireadsModel): class ShelfBook(BookWyrmModel):
''' many to many join table for books and shelves ''' ''' many to many join table for books and shelves '''
book = models.ForeignKey('Edition', on_delete=models.PROTECT) book = models.ForeignKey('Edition', on_delete=models.PROTECT)
shelf = models.ForeignKey('Shelf', on_delete=models.PROTECT) shelf = models.ForeignKey('Shelf', on_delete=models.PROTECT)

View file

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

View file

@ -5,12 +5,12 @@ from django.core.validators import MaxValueValidator, MinValueValidator
from django.db import models from django.db import models
from model_utils.managers import InheritanceManager from model_utils.managers import InheritanceManager
from fedireads import activitypub from bookwyrm import activitypub
from .base_model import ActivitypubMixin, OrderedCollectionPageMixin from .base_model import ActivitypubMixin, OrderedCollectionPageMixin
from .base_model import ActivityMapping, FedireadsModel from .base_model import ActivityMapping, BookWyrmModel
class Status(OrderedCollectionPageMixin, FedireadsModel): class Status(OrderedCollectionPageMixin, BookWyrmModel):
''' any post, like a reply to a review, etc ''' ''' any post, like a reply to a review, etc '''
user = models.ForeignKey('User', on_delete=models.PROTECT) user = models.ForeignKey('User', on_delete=models.PROTECT)
content = models.TextField(blank=True, null=True) content = models.TextField(blank=True, null=True)
@ -67,7 +67,7 @@ class Status(OrderedCollectionPageMixin, FedireadsModel):
ActivityMapping('replies', 'ap_replies'), ActivityMapping('replies', 'ap_replies'),
] ]
# serializing to fedireads expanded activitypub # serializing to bookwyrm expanded activitypub
activity_mappings = shared_mappings + [ activity_mappings = shared_mappings + [
ActivityMapping('name', 'name'), ActivityMapping('name', 'name'),
ActivityMapping('inReplyToBook', 'book'), ActivityMapping('inReplyToBook', 'book'),
@ -161,7 +161,7 @@ class Review(Status):
activity_serializer = activitypub.Review activity_serializer = activitypub.Review
class Favorite(ActivitypubMixin, FedireadsModel): class Favorite(ActivitypubMixin, BookWyrmModel):
''' fav'ing a post ''' ''' fav'ing a post '''
user = models.ForeignKey('User', on_delete=models.PROTECT) user = models.ForeignKey('User', on_delete=models.PROTECT)
status = models.ForeignKey('Status', on_delete=models.PROTECT) status = models.ForeignKey('Status', on_delete=models.PROTECT)
@ -201,7 +201,7 @@ class Boost(Status):
# unique_together = ('user', 'boosted_status') # unique_together = ('user', 'boosted_status')
class ReadThrough(FedireadsModel): class ReadThrough(BookWyrmModel):
''' Store progress through a book in the database. ''' ''' Store progress through a book in the database. '''
user = models.ForeignKey('User', on_delete=models.PROTECT) user = models.ForeignKey('User', on_delete=models.PROTECT)
book = models.ForeignKey('Book', on_delete=models.PROTECT) book = models.ForeignKey('Book', on_delete=models.PROTECT)
@ -220,7 +220,7 @@ NotificationType = models.TextChoices(
'NotificationType', 'NotificationType',
'FAVORITE REPLY TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT') 'FAVORITE REPLY TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT')
class Notification(FedireadsModel): class Notification(BookWyrmModel):
''' you've been tagged, liked, followed, etc ''' ''' you've been tagged, liked, followed, etc '''
user = models.ForeignKey('User', on_delete=models.PROTECT) user = models.ForeignKey('User', on_delete=models.PROTECT)
related_book = models.ForeignKey( related_book = models.ForeignKey(

View file

@ -3,12 +3,12 @@ import urllib.parse
from django.db import models from django.db import models
from fedireads import activitypub from bookwyrm import activitypub
from fedireads.settings import DOMAIN from bookwyrm.settings import DOMAIN
from .base_model import OrderedCollectionMixin, FedireadsModel from .base_model import OrderedCollectionMixin, BookWyrmModel
class Tag(OrderedCollectionMixin, FedireadsModel): class Tag(OrderedCollectionMixin, BookWyrmModel):
''' freeform tags for books ''' ''' freeform tags for books '''
user = models.ForeignKey('User', on_delete=models.PROTECT) user = models.ForeignKey('User', on_delete=models.PROTECT)
book = models.ForeignKey('Edition', on_delete=models.PROTECT) book = models.ForeignKey('Edition', on_delete=models.PROTECT)

View file

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

View file

@ -6,13 +6,13 @@ from django.http import HttpResponseNotFound, JsonResponse
from django.views.decorators.csrf import csrf_exempt from django.views.decorators.csrf import csrf_exempt
import requests import requests
from fedireads import activitypub from bookwyrm import activitypub
from fedireads import models from bookwyrm import models
from fedireads.broadcast import broadcast from bookwyrm.broadcast import broadcast
from fedireads.status import create_review, create_status from bookwyrm.status import create_review, create_status
from fedireads.status import create_quotation, create_comment from bookwyrm.status import create_quotation, create_comment
from fedireads.status import create_tag, create_notification, create_rating from bookwyrm.status import create_tag, create_notification, create_rating
from fedireads.remote_user import get_or_create_remote_user from bookwyrm.remote_user import get_or_create_remote_user
@csrf_exempt @csrf_exempt
@ -227,9 +227,9 @@ def handle_status(user, book_id, builder, *args):
book = models.Edition.objects.get(id=book_id) book = models.Edition.objects.get(id=book_id)
status = builder(user, book, *args) status = builder(user, book, *args)
broadcast(user, status.to_create_activity(user), software='fedireads') broadcast(user, status.to_create_activity(user), software='bookwyrm')
# re-format the activity for non-fedireads servers # re-format the activity for non-bookwyrm servers
remote_activity = status.to_create_activity(user, pure=True) remote_activity = status.to_create_activity(user, pure=True)
broadcast(user, remote_activity, software='other') broadcast(user, remote_activity, software='other')

View file

@ -6,7 +6,7 @@ import requests
from django.core.files.base import ContentFile from django.core.files.base import ContentFile
from django.db import transaction from django.db import transaction
from fedireads import activitypub, models from bookwyrm import activitypub, models
def get_or_create_remote_user(actor): def get_or_create_remote_user(actor):
@ -28,7 +28,7 @@ def get_or_create_remote_user(actor):
if avatar: if avatar:
user.avatar.save(*avatar) user.avatar.save(*avatar)
if user.fedireads_user: if user.bookwyrm_user:
get_remote_reviews(user) get_remote_reviews(user)
return user return user
@ -79,7 +79,7 @@ def get_avatar(data):
def get_remote_reviews(user): def get_remote_reviews(user):
''' ingest reviews by a new remote fedireads user ''' ''' ingest reviews by a new remote bookwyrm user '''
outbox_page = user.outbox + '?page=true' outbox_page = user.outbox + '?page=true'
response = requests.get( response = requests.get(
outbox_page, outbox_page,
@ -88,7 +88,7 @@ def get_remote_reviews(user):
data = response.json() data = response.json()
# TODO: pagination? # TODO: pagination?
for status in data['orderedItems']: for status in data['orderedItems']:
if status.get('fedireadsType') == 'Review': if status.get('bookwyrmType') == 'Review':
activitypub.Review(**status).to_model(models.Review) activitypub.Review(**status).to_model(models.Review)

View file

@ -1,8 +1,8 @@
''' Routine tasks for keeping your library tidy ''' ''' Routine tasks for keeping your library tidy '''
from datetime import timedelta from datetime import timedelta
from django.utils import timezone from django.utils import timezone
from fedireads import books_manager from bookwyrm import books_manager
from fedireads import models from bookwyrm import models
def sync_book_data(): def sync_book_data():
''' update books with any changes to their canonical source ''' ''' update books with any changes to their canonical source '''

View file

@ -1,4 +1,4 @@
''' fedireads settings and configuration ''' ''' bookwyrm settings and configuration '''
import os import os
from environs import Env from environs import Env
@ -31,14 +31,14 @@ OL_URL = env('OL_URL')
# Application definition # Application definition
INSTALLED_APPS = [ INSTALLED_APPS = [
'django.contrib.admin', #'django.contrib.admin',
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',
'django.contrib.sessions', 'django.contrib.sessions',
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'django.contrib.humanize', 'django.contrib.humanize',
'fedireads', 'bookwyrm',
'celery', 'celery',
] ]
@ -52,7 +52,7 @@ MIDDLEWARE = [
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
] ]
ROOT_URLCONF = 'fedireads.urls' ROOT_URLCONF = 'bookwyrm.urls'
TEMPLATES = [ TEMPLATES = [
{ {
@ -71,15 +71,15 @@ TEMPLATES = [
] ]
WSGI_APPLICATION = 'fedireads.wsgi.application' WSGI_APPLICATION = 'bookwyrm.wsgi.application'
# Database # Database
# https://docs.djangoproject.com/en/2.0/ref/settings/#databases # https://docs.djangoproject.com/en/2.0/ref/settings/#databases
FEDIREADS_DATABASE_BACKEND = env('FEDIREADS_DATABASE_BACKEND', 'postgres') BOOKWYRM_DATABASE_BACKEND = env('BOOKWYRM_DATABASE_BACKEND', 'postgres')
FEDIREADS_DBS = { BOOKWYRM_DBS = {
'postgres': { 'postgres': {
'ENGINE': 'django.db.backends.postgresql_psycopg2', 'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': env('POSTGRES_DB', 'fedireads'), 'NAME': env('POSTGRES_DB', 'fedireads'),
@ -95,12 +95,12 @@ FEDIREADS_DBS = {
} }
DATABASES = { DATABASES = {
'default': FEDIREADS_DBS[FEDIREADS_DATABASE_BACKEND] 'default': BOOKWYRM_DBS[BOOKWYRM_DATABASE_BACKEND]
} }
LOGIN_URL = '/login/' LOGIN_URL = '/login/'
AUTH_USER_MODEL = 'fedireads.User' AUTH_USER_MODEL = 'bookwyrm.User'
# Password validation # Password validation
# https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators # https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators

View file

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View file

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

View file

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Some files were not shown because too many files have changed in this diff Show more