diff --git a/bookwyrm/migrations/0090_emailblocklist.py b/bookwyrm/migrations/0090_emailblocklist.py index 57e27989..2592e329 100644 --- a/bookwyrm/migrations/0090_emailblocklist.py +++ b/bookwyrm/migrations/0090_emailblocklist.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.4 on 2021-09-08 21:37 +# Generated by Django 3.2.4 on 2021-09-08 22:21 from django.db import migrations, models @@ -6,24 +6,19 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ("bookwyrm", "0089_user_show_suggested_users"), + ('bookwyrm', '0089_user_show_suggested_users'), ] operations = [ migrations.CreateModel( - name="EmailBlocklist", + name='EmailBlocklist', fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("created_date", models.DateTimeField(auto_now_add=True)), - ("domain", models.CharField(max_length=255)), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_date', models.DateTimeField(auto_now_add=True)), + ('domain', models.CharField(max_length=255, unique=True)), ], + options={ + 'ordering': ('-created_date',), + }, ), ] diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index e3a657cc..d9289b14 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -127,12 +127,17 @@ class EmailBlocklist(models.Model): """blocked email addresses""" created_date = models.DateTimeField(auto_now_add=True) - domain = models.CharField(max_length=255) + domain = models.CharField(max_length=255, unique=True) + + class Meta: + """default sorting""" + + ordering = ("-created_date",) @property def users(self): """find the users associated with this address""" - User.objects.filter(email__endswith=f"@{self.domain}") + return User.objects.filter(email__endswith=f"@{self.domain}") # pylint: disable=unused-argument diff --git a/bookwyrm/templates/settings/domain_form.html b/bookwyrm/templates/settings/domain_form.html index e40a0d54..0919791e 100644 --- a/bookwyrm/templates/settings/domain_form.html +++ b/bookwyrm/templates/settings/domain_form.html @@ -8,13 +8,18 @@ {% block form %}