From 84fcc358fa3c11be63967e9fa8729eae89b14e7e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 14:05:08 -0700 Subject: [PATCH 01/18] Renames layout file --- bookwyrm/templates/settings/announcement.html | 2 +- bookwyrm/templates/settings/announcements.html | 2 +- bookwyrm/templates/settings/edit_server.html | 2 +- bookwyrm/templates/settings/federated_server.html | 2 +- bookwyrm/templates/settings/federation.html | 2 +- bookwyrm/templates/settings/{admin_layout.html => layout.html} | 0 bookwyrm/templates/settings/manage_invite_requests.html | 2 +- bookwyrm/templates/settings/manage_invites.html | 2 +- bookwyrm/templates/settings/server_blocklist.html | 2 +- bookwyrm/templates/settings/site.html | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename bookwyrm/templates/settings/{admin_layout.html => layout.html} (100%) diff --git a/bookwyrm/templates/settings/announcement.html b/bookwyrm/templates/settings/announcement.html index c0e5dec88..b3375bb50 100644 --- a/bookwyrm/templates/settings/announcement.html +++ b/bookwyrm/templates/settings/announcement.html @@ -1,4 +1,4 @@ -{% extends 'settings/admin_layout.html' %} +{% extends 'settings/layout.html' %} {% load i18n %}{% load humanize %} {% block title %}{% trans "Announcement" %} - {{ announcement.preview }}{% endblock %} diff --git a/bookwyrm/templates/settings/announcements.html b/bookwyrm/templates/settings/announcements.html index 18e765317..aba412473 100644 --- a/bookwyrm/templates/settings/announcements.html +++ b/bookwyrm/templates/settings/announcements.html @@ -1,4 +1,4 @@ -{% extends 'settings/admin_layout.html' %} +{% extends 'settings/layout.html' %} {% load i18n %}{% load humanize %} {% block title %}{% trans "Announcements" %}{% endblock %} diff --git a/bookwyrm/templates/settings/edit_server.html b/bookwyrm/templates/settings/edit_server.html index 55346a526..452316e43 100644 --- a/bookwyrm/templates/settings/edit_server.html +++ b/bookwyrm/templates/settings/edit_server.html @@ -1,4 +1,4 @@ -{% extends 'settings/admin_layout.html' %} +{% extends 'settings/layout.html' %} {% load i18n %} {% block title %}{% trans "Add instance" %}{% endblock %} diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html index c47dd285c..140a0af75 100644 --- a/bookwyrm/templates/settings/federated_server.html +++ b/bookwyrm/templates/settings/federated_server.html @@ -1,4 +1,4 @@ -{% extends 'settings/admin_layout.html' %} +{% extends 'settings/layout.html' %} {% load i18n %} {% load markdown %} diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html index e0a9ba73a..ed122e0b2 100644 --- a/bookwyrm/templates/settings/federation.html +++ b/bookwyrm/templates/settings/federation.html @@ -1,4 +1,4 @@ -{% extends 'settings/admin_layout.html' %} +{% extends 'settings/layout.html' %} {% load i18n %} {% block title %}{% trans "Federated Instances" %}{% endblock %} diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/layout.html similarity index 100% rename from bookwyrm/templates/settings/admin_layout.html rename to bookwyrm/templates/settings/layout.html diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html index 5b7315f98..e0cfd6469 100644 --- a/bookwyrm/templates/settings/manage_invite_requests.html +++ b/bookwyrm/templates/settings/manage_invite_requests.html @@ -1,4 +1,4 @@ -{% extends 'settings/admin_layout.html' %} +{% extends 'settings/layout.html' %} {% load i18n %} {% load humanize %} {% block header %}{% trans "Invite Requests" %}{% endblock %} diff --git a/bookwyrm/templates/settings/manage_invites.html b/bookwyrm/templates/settings/manage_invites.html index 6efaefcf2..95b8bdf00 100644 --- a/bookwyrm/templates/settings/manage_invites.html +++ b/bookwyrm/templates/settings/manage_invites.html @@ -1,4 +1,4 @@ -{% extends 'settings/admin_layout.html' %} +{% extends 'settings/layout.html' %} {% load i18n %} {% block header %}{% trans "Invites" %}{% endblock %} {% load humanize %} diff --git a/bookwyrm/templates/settings/server_blocklist.html b/bookwyrm/templates/settings/server_blocklist.html index 49334982f..926ab5f4a 100644 --- a/bookwyrm/templates/settings/server_blocklist.html +++ b/bookwyrm/templates/settings/server_blocklist.html @@ -1,4 +1,4 @@ -{% extends 'settings/admin_layout.html' %} +{% extends 'settings/layout.html' %} {% load i18n %} {% block title %}{% trans "Add instance" %}{% endblock %} diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html index 05b504a97..354e49e81 100644 --- a/bookwyrm/templates/settings/site.html +++ b/bookwyrm/templates/settings/site.html @@ -1,4 +1,4 @@ -{% extends 'settings/admin_layout.html' %} +{% extends 'settings/layout.html' %} {% load i18n %} {% block title %}{% trans "Site Settings" %}{% endblock %} From fd0cf49b408cea033ebe86c78d97cf63bbadd668 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 14:32:11 -0700 Subject: [PATCH 02/18] Adds html and view for email blocklist --- bookwyrm/templates/moderation/report.html | 2 +- bookwyrm/templates/moderation/reports.html | 2 +- .../templates/settings/email_blocklist.html | 40 +++++++++++++++++++ bookwyrm/templates/settings/layout.html | 19 ++++++--- bookwyrm/templates/user_admin/user.html | 2 +- bookwyrm/templates/user_admin/user_admin.html | 2 +- bookwyrm/urls.py | 1 + bookwyrm/views/__init__.py | 1 + bookwyrm/views/email_blocklist.py | 19 +++++++++ 9 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 bookwyrm/templates/settings/email_blocklist.html create mode 100644 bookwyrm/views/email_blocklist.py diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html index db03850f8..d0e4026a7 100644 --- a/bookwyrm/templates/moderation/report.html +++ b/bookwyrm/templates/moderation/report.html @@ -1,4 +1,4 @@ -{% extends 'settings/admin_layout.html' %} +{% extends 'settings/layout.html' %} {% load i18n %} {% load humanize %} diff --git a/bookwyrm/templates/moderation/reports.html b/bookwyrm/templates/moderation/reports.html index 95a276af4..c83f626fa 100644 --- a/bookwyrm/templates/moderation/reports.html +++ b/bookwyrm/templates/moderation/reports.html @@ -1,4 +1,4 @@ -{% extends 'settings/admin_layout.html' %} +{% extends 'settings/layout.html' %} {% load i18n %} {% block title %} diff --git a/bookwyrm/templates/settings/email_blocklist.html b/bookwyrm/templates/settings/email_blocklist.html new file mode 100644 index 000000000..62561f747 --- /dev/null +++ b/bookwyrm/templates/settings/email_blocklist.html @@ -0,0 +1,40 @@ +{% extends 'settings/layout.html' %} +{% load i18n %} +{% block title %}{% trans "Email Blocklist" %}{% endblock %} + +{% block header %}{% trans "Email Blocklist" %}{% endblock %} + +{% block edit-button %} + + + {% trans "Add domain" %} + +{% endblock %} + +{% block panel %} + + + {% url 'settings-federation' as url %} + + + + + + + +
+ {% trans "Domain" as text %} + {% include 'snippets/table-sort-header.html' with field="server_name" sort=sort text=text %} + + {% trans "Options" %} +
gmail.com + {% trans "Delete" as button_text %} + +
+ +{% include 'snippets/pagination.html' with page=servers path=request.path %} +{% endblock %} + diff --git a/bookwyrm/templates/settings/layout.html b/bookwyrm/templates/settings/layout.html index 6d6516476..119f52bfa 100644 --- a/bookwyrm/templates/settings/layout.html +++ b/bookwyrm/templates/settings/layout.html @@ -32,12 +32,6 @@ {% url 'settings-invites' as alt_url %} {% trans "Invites" %} - {% if perms.bookwyrm.moderate_user %} -
  • - {% url 'settings-reports' as url %} - {% trans "Reports" %} -
    • - {% endif %} {% if perms.bookwyrm.control_federation %}
  • {% url 'settings-federation' as url %} @@ -46,6 +40,19 @@ {% endif %} {% endif %} + {% if perms.bookwyrm.moderate_user %} +

    {% trans "Moderation" %}

    + + {% endif %} {% if perms.bookwyrm.edit_instance_settings %}

    {% trans "Instance Settings" %}

      diff --git a/bookwyrm/templates/user_admin/user.html b/bookwyrm/templates/user_admin/user.html index 5c118175b..e3a2413a9 100644 --- a/bookwyrm/templates/user_admin/user.html +++ b/bookwyrm/templates/user_admin/user.html @@ -1,4 +1,4 @@ -{% extends 'settings/admin_layout.html' %} +{% extends 'settings/layout.html' %} {% load i18n %} {% block title %}{{ user.username }}{% endblock %} diff --git a/bookwyrm/templates/user_admin/user_admin.html b/bookwyrm/templates/user_admin/user_admin.html index 4b4c79793..024ebfecf 100644 --- a/bookwyrm/templates/user_admin/user_admin.html +++ b/bookwyrm/templates/user_admin/user_admin.html @@ -1,4 +1,4 @@ -{% extends 'settings/admin_layout.html' %} +{% extends 'settings/layout.html' %} {% load i18n %} {% block title %}{% trans "Users" %}{% endblock %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 9ae1b8228..e51de37e9 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -141,6 +141,7 @@ urlpatterns = [ r"^invite-request/?$", views.InviteRequest.as_view(), name="invite-request" ), re_path(r"^invite/(?P[A-Za-z0-9]+)/?$", views.Invite.as_view()), + re_path(r"^settings/email-blocklist/?$", views.EmailBlocklist.as_view(), name="settings-email-blocks"), # moderation re_path(r"^settings/reports/?$", views.Reports.as_view(), name="settings-reports"), re_path( diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 5142d532d..ca10189d7 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -8,6 +8,7 @@ from .directory import Directory from .discover import Discover from .edit_user import EditUser, DeleteUser from .editions import Editions, switch_edition +from .email_blocklist import EmailBlocklist from .federation import Federation, FederatedServer from .federation import AddFederatedServer, ImportServerBlocklist from .federation import block_server, unblock_server diff --git a/bookwyrm/views/email_blocklist.py b/bookwyrm/views/email_blocklist.py new file mode 100644 index 000000000..734f81366 --- /dev/null +++ b/bookwyrm/views/email_blocklist.py @@ -0,0 +1,19 @@ +""" moderation via flagged posts and users """ +from django.contrib.auth.decorators import login_required, permission_required +from django.template.response import TemplateResponse +from django.utils.decorators import method_decorator +from django.views import View + +# pylint: disable=no-self-use +@method_decorator(login_required, name="dispatch") +@method_decorator( + permission_required("bookwyrm.moderate_user", raise_exception=True), + name="dispatch", +) +class EmailBlocklist(View): + """Block users by email address""" + + def get(self, request): + """view and compose blocks""" + data = {} + return TemplateResponse(request, "settings/email_blocklist.html", data) From 7a684a2f9655b7216b288aeb0c00a44b9e0100e7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 14:38:34 -0700 Subject: [PATCH 03/18] Adds model --- bookwyrm/migrations/0090_emailblocklist.py | 29 ++++++++++++++++++++++ bookwyrm/models/site.py | 12 +++++++++ 2 files changed, 41 insertions(+) create mode 100644 bookwyrm/migrations/0090_emailblocklist.py diff --git a/bookwyrm/migrations/0090_emailblocklist.py b/bookwyrm/migrations/0090_emailblocklist.py new file mode 100644 index 000000000..57e27989a --- /dev/null +++ b/bookwyrm/migrations/0090_emailblocklist.py @@ -0,0 +1,29 @@ +# Generated by Django 3.2.4 on 2021-09-08 21:37 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0089_user_show_suggested_users"), + ] + + operations = [ + migrations.CreateModel( + 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)), + ], + ), + ] diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index ef3f7c3ca..e3a657cc7 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -123,6 +123,18 @@ class PasswordReset(models.Model): return "https://{}/password-reset/{}".format(DOMAIN, self.code) +class EmailBlocklist(models.Model): + """blocked email addresses""" + + created_date = models.DateTimeField(auto_now_add=True) + domain = models.CharField(max_length=255) + + @property + def users(self): + """find the users associated with this address""" + User.objects.filter(email__endswith=f"@{self.domain}") + + # pylint: disable=unused-argument @receiver(models.signals.post_save, sender=SiteSettings) def preview_image(instance, *args, **kwargs): From 21de8e66be2f8b6da036d7d22e0f0d70b4858d87 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 14:39:43 -0700 Subject: [PATCH 04/18] Formats url --- bookwyrm/urls.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index e51de37e9..0beff4de9 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -141,7 +141,11 @@ urlpatterns = [ r"^invite-request/?$", views.InviteRequest.as_view(), name="invite-request" ), re_path(r"^invite/(?P[A-Za-z0-9]+)/?$", views.Invite.as_view()), - re_path(r"^settings/email-blocklist/?$", views.EmailBlocklist.as_view(), name="settings-email-blocks"), + re_path( + r"^settings/email-blocklist/?$", + views.EmailBlocklist.as_view(), + name="settings-email-blocks", + ), # moderation re_path(r"^settings/reports/?$", views.Reports.as_view(), name="settings-reports"), re_path( From c705178c3b347e1cc9e156b869009a629699e92d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 15:08:22 -0700 Subject: [PATCH 05/18] Adds create block form --- bookwyrm/forms.py | 6 +++++ bookwyrm/models/__init__.py | 4 ++- .../templates/settings/announcement_form.html | 12 ++++----- bookwyrm/templates/settings/domain_form.html | 25 +++++++++++++++++++ .../templates/settings/email_blocklist.html | 15 ++++++++--- bookwyrm/views/email_blocklist.py | 7 +++++- 6 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 bookwyrm/templates/settings/domain_form.html diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py index 96a4e3030..24e0c21e9 100644 --- a/bookwyrm/forms.py +++ b/bookwyrm/forms.py @@ -299,6 +299,12 @@ class ReportForm(CustomForm): fields = ["user", "reporter", "statuses", "note"] +class EmailBlocklistForm(CustomForm): + class Meta: + model = models.EmailBlocklist + fields = ["domain"] + + class ServerForm(CustomForm): class Meta: model = models.FederatedServer diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py index 6f378e83c..e8e1b696e 100644 --- a/bookwyrm/models/__init__.py +++ b/bookwyrm/models/__init__.py @@ -24,7 +24,9 @@ from .federated_server import FederatedServer from .import_job import ImportJob, ImportItem -from .site import SiteSettings, SiteInvite, PasswordReset, InviteRequest +from .site import SiteSettings, SiteInvite +from .site import PasswordReset, InviteRequest +from .site import EmailBlocklist from .announcement import Announcement cls_members = inspect.getmembers(sys.modules[__name__], inspect.isclass) diff --git a/bookwyrm/templates/settings/announcement_form.html b/bookwyrm/templates/settings/announcement_form.html index 8eb6acd52..ffdbfc2fd 100644 --- a/bookwyrm/templates/settings/announcement_form.html +++ b/bookwyrm/templates/settings/announcement_form.html @@ -13,21 +13,21 @@ {% csrf_token %}

      - + {{ form.preview }} {% for error in form.preview.errors %}

      {{ error | escape }}

      {% endfor %}

      - + {{ form.content }} {% for error in form.content.errors %}

      {{ error | escape }}

      {% endfor %}

      - + {% for error in form.event_date.errors %}

      {{ error | escape }}

      @@ -37,7 +37,7 @@

      - + {% for error in form.start_date.errors %}

      {{ error | escape }}

      @@ -46,7 +46,7 @@

      - + {% for error in form.end_date.errors %}

      {{ error | escape }}

      @@ -55,7 +55,7 @@

      - + {{ form.active }} {% for error in form.active.errors %}

      {{ error | escape }}

      diff --git a/bookwyrm/templates/settings/domain_form.html b/bookwyrm/templates/settings/domain_form.html new file mode 100644 index 000000000..e40a0d542 --- /dev/null +++ b/bookwyrm/templates/settings/domain_form.html @@ -0,0 +1,25 @@ +{% extends 'components/inline_form.html' %} +{% load i18n %} + +{% block header %} +{% trans "Add domain" %} +{% endblock %} + +{% block form %} +
      + {% csrf_token %} +
      + + {{ form.domain }} + {% for error in form.domain.errors %} +

      {{ error | escape }}

      + {% endfor %} +
      + +
      +
      + +
      +
      +
      +{% endblock %} diff --git a/bookwyrm/templates/settings/email_blocklist.html b/bookwyrm/templates/settings/email_blocklist.html index 62561f747..54779854a 100644 --- a/bookwyrm/templates/settings/email_blocklist.html +++ b/bookwyrm/templates/settings/email_blocklist.html @@ -5,13 +5,18 @@ {% block header %}{% trans "Email Blocklist" %}{% endblock %} {% block edit-button %} - - - {% trans "Add domain" %} +{% trans "Add domain" as button_text %} +{% include 'snippets/toggle/open_button.html' with controls_text="add_domain" icon_with_text="plus" text=button_text focus="add_domain_header" %} {% endblock %} {% block panel %} +{% include 'settings/domain_form.html' with controls_text="add_domain" class="block" %} + +

      + {% trans "When someone tries to register with an email from this domain, no account will be created. The registration process will appear to have worked." %} +

      + {% url 'settings-federation' as url %} @@ -23,8 +28,9 @@ {% trans "Options" %} + {% for domain in domains %} - + + {% endfor %}
      gmail.com{{ domain.domain }} {% trans "Delete" as button_text %}
      {% include 'snippets/pagination.html' with page=servers path=request.path %} diff --git a/bookwyrm/views/email_blocklist.py b/bookwyrm/views/email_blocklist.py index 734f81366..156b86277 100644 --- a/bookwyrm/views/email_blocklist.py +++ b/bookwyrm/views/email_blocklist.py @@ -4,6 +4,8 @@ from django.template.response import TemplateResponse from django.utils.decorators import method_decorator from django.views import View +from bookwyrm import forms, models + # pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( @@ -15,5 +17,8 @@ class EmailBlocklist(View): def get(self, request): """view and compose blocks""" - data = {} + data = { + "domains": models.EmailBlocklist.objects.order_by("-created_date").all(), + "form": forms.EmailBlocklistForm(), + } return TemplateResponse(request, "settings/email_blocklist.html", data) From 8717d8a675409d11e38723509a24ca28f3599374 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 15:30:18 -0700 Subject: [PATCH 06/18] Create new email domain block entries --- bookwyrm/migrations/0090_emailblocklist.py | 23 ++++++++----------- bookwyrm/models/site.py | 9 ++++++-- bookwyrm/templates/settings/domain_form.html | 17 +++++++++----- .../templates/settings/email_blocklist.html | 20 ++++++++++++++-- bookwyrm/views/email_blocklist.py | 14 +++++++++++ 5 files changed, 59 insertions(+), 24 deletions(-) diff --git a/bookwyrm/migrations/0090_emailblocklist.py b/bookwyrm/migrations/0090_emailblocklist.py index 57e27989a..2592e329e 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 e3a657cc7..d9289b148 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 e40a0d542..0919791e9 100644 --- a/bookwyrm/templates/settings/domain_form.html +++ b/bookwyrm/templates/settings/domain_form.html @@ -8,13 +8,18 @@ {% block form %}
      {% csrf_token %} -
      - - {{ form.domain }} - {% for error in form.domain.errors %} -

      {{ error | escape }}

      - {% endfor %} + +
      +
      +
      @
      +
      +
      + {{ form.domain }} +
      + {% for error in form.domain.errors %} +

      {{ error | escape }}

      + {% endfor %}
      diff --git a/bookwyrm/templates/settings/email_blocklist.html b/bookwyrm/templates/settings/email_blocklist.html index 54779854a..e43b20adc 100644 --- a/bookwyrm/templates/settings/email_blocklist.html +++ b/bookwyrm/templates/settings/email_blocklist.html @@ -1,5 +1,7 @@ {% extends 'settings/layout.html' %} {% load i18n %} +{% load humanize %} + {% block title %}{% trans "Email Blocklist" %}{% endblock %} {% block header %}{% trans "Email Blocklist" %}{% endblock %} @@ -17,13 +19,14 @@ {% trans "When someone tries to register with an email from this domain, no account will be created. The registration process will appear to have worked." %}

      - +
      {% url 'settings-federation' as url %} + @@ -31,17 +34,30 @@ {% for domain in domains %} + {% endfor %}
      {% trans "Domain" as text %} {% include 'snippets/table-sort-header.html' with field="server_name" sort=sort text=text %} {% trans "Options" %}
      {{ domain.domain }} + + {% with user_count=domain.users.count %} + {% blocktrans trimmed count conter=user_count with display_count=user_count|intcomma %} + {{ display_count }} user + {% plural %} + {{ display_count }} users + {% endblocktrans %} + {% endwith %} + {% trans "Delete" as button_text %} + {% trans "Block users" as button_text %} +
      -{% include 'snippets/pagination.html' with page=servers path=request.path %} {% endblock %} diff --git a/bookwyrm/views/email_blocklist.py b/bookwyrm/views/email_blocklist.py index 156b86277..36717f4a5 100644 --- a/bookwyrm/views/email_blocklist.py +++ b/bookwyrm/views/email_blocklist.py @@ -22,3 +22,17 @@ class EmailBlocklist(View): "form": forms.EmailBlocklistForm(), } return TemplateResponse(request, "settings/email_blocklist.html", data) + + def post(self, request): + """create a new domain block""" + form = forms.EmailBlocklistForm(request.POST) + data = { + "domains": models.EmailBlocklist.objects.order_by("-created_date").all(), + "form": form, + } + if not form.is_valid(): + return TemplateResponse(request, "settings/email_blocklist.html", data) + form.save() + + data["form"] = forms.EmailBlocklistForm() + return TemplateResponse(request, "settings/email_blocklist.html", data) From c4a43d5029b8a9f08332b896213e1b7858ced72a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 15:31:07 -0700 Subject: [PATCH 07/18] Updates migration --- bookwyrm/migrations/0090_emailblocklist.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/bookwyrm/migrations/0090_emailblocklist.py b/bookwyrm/migrations/0090_emailblocklist.py index 2592e329e..6934e51e9 100644 --- a/bookwyrm/migrations/0090_emailblocklist.py +++ b/bookwyrm/migrations/0090_emailblocklist.py @@ -6,19 +6,27 @@ 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, unique=True)), + ( + "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',), + "ordering": ("-created_date",), }, ), ] From 605af3bf88d260ed8634a36b5fbb0b0c8cf513ed Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 15:33:53 -0700 Subject: [PATCH 08/18] Not going to implement that today --- bookwyrm/templates/settings/email_blocklist.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bookwyrm/templates/settings/email_blocklist.html b/bookwyrm/templates/settings/email_blocklist.html index e43b20adc..38e37e35c 100644 --- a/bookwyrm/templates/settings/email_blocklist.html +++ b/bookwyrm/templates/settings/email_blocklist.html @@ -50,10 +50,6 @@ {{ button_text }} - {% trans "Block users" as button_text %} - {% endfor %} From 59096ae9ec35f20302d19979b33a242d5d7c50eb Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 15:37:52 -0700 Subject: [PATCH 09/18] Adds email filtering to user admin view --- bookwyrm/views/user_admin.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py index ac5357a28..574356c23 100644 --- a/bookwyrm/views/user_admin.py +++ b/bookwyrm/views/user_admin.py @@ -33,6 +33,9 @@ class UserAdminList(View): scope = request.GET.get("scope") if scope and scope == "local": filters["local"] = True + email = request.GET.get("email") + if email: + filters["email__endswith"] = email users = models.User.objects.filter(**filters) From cc61d44cefd4d4a79fe313aad73d32cc6b4a1152 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 15:38:34 -0700 Subject: [PATCH 10/18] Removes stray tag --- bookwyrm/templates/settings/email_blocklist.html | 1 - 1 file changed, 1 deletion(-) diff --git a/bookwyrm/templates/settings/email_blocklist.html b/bookwyrm/templates/settings/email_blocklist.html index 38e37e35c..17f833d45 100644 --- a/bookwyrm/templates/settings/email_blocklist.html +++ b/bookwyrm/templates/settings/email_blocklist.html @@ -9,7 +9,6 @@ {% block edit-button %} {% trans "Add domain" as button_text %} {% include 'snippets/toggle/open_button.html' with controls_text="add_domain" icon_with_text="plus" text=button_text focus="add_domain_header" %} - {% endblock %} {% block panel %} From 5441b5b7f315c718caa2945156e6efd9b0f0f9a4 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 15:49:18 -0700 Subject: [PATCH 11/18] Prevent users from registering with blocked emails --- bookwyrm/views/register.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bookwyrm/views/register.py b/bookwyrm/views/register.py index 1ecb97b16..1a0615ac0 100644 --- a/bookwyrm/views/register.py +++ b/bookwyrm/views/register.py @@ -42,6 +42,12 @@ class Register(View): email = form.data["email"] password = form.data["password"] + # make sure the email isn't blocked as spam + email_domain = email.split("@")[-1] + if models.EmailBlocklist.objects.filter(domain=email_domain).exists(): + # treat this like a successful registration, but don't do anything + return redirect("confirm-email") + # check localname and email uniqueness if models.User.objects.filter(localname=localname).first(): form.errors["localname"] = ["User with this username already exists"] From 97f0d82b05eaea76aba84769a1ce358e77bd66b7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 15:49:52 -0700 Subject: [PATCH 12/18] Missing close td tag --- bookwyrm/templates/settings/email_blocklist.html | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/templates/settings/email_blocklist.html b/bookwyrm/templates/settings/email_blocklist.html index 17f833d45..d35b63429 100644 --- a/bookwyrm/templates/settings/email_blocklist.html +++ b/bookwyrm/templates/settings/email_blocklist.html @@ -43,6 +43,7 @@ {% endblocktrans %} {% endwith %} + {% trans "Delete" as button_text %} + + {% csrf_token %} + {% trans "Delete" as button_text %} + + {% endfor %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 0beff4de9..f80ef791a 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -146,6 +146,11 @@ urlpatterns = [ views.EmailBlocklist.as_view(), name="settings-email-blocks", ), + re_path( + r"^settings/email-blocks/(?P\d+)/delete/?$", + views.EmailBlocklist.as_view(), + name="settings-email-blocks-delete", + ), # moderation re_path(r"^settings/reports/?$", views.Reports.as_view(), name="settings-reports"), re_path( diff --git a/bookwyrm/views/email_blocklist.py b/bookwyrm/views/email_blocklist.py index 36717f4a5..2ed8c1524 100644 --- a/bookwyrm/views/email_blocklist.py +++ b/bookwyrm/views/email_blocklist.py @@ -1,5 +1,6 @@ """ moderation via flagged posts and users """ from django.contrib.auth.decorators import login_required, permission_required +from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse from django.utils.decorators import method_decorator from django.views import View @@ -23,8 +24,11 @@ class EmailBlocklist(View): } return TemplateResponse(request, "settings/email_blocklist.html", data) - def post(self, request): + def post(self, request, domain_id=None): """create a new domain block""" + if domain_id: + return self.delete(request, domain_id) + form = forms.EmailBlocklistForm(request.POST) data = { "domains": models.EmailBlocklist.objects.order_by("-created_date").all(), @@ -36,3 +40,10 @@ class EmailBlocklist(View): data["form"] = forms.EmailBlocklistForm() return TemplateResponse(request, "settings/email_blocklist.html", data) + + # pylint: disable=unused-argument + def delete(self, request, domain_id): + """remove a domain block""" + domain = get_object_or_404(models.EmailBlocklist, id=domain_id) + domain.delete() + return redirect("settings-email-blocks") From b891f32707c4e46afc423f6df20de115eb6102d0 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 16:31:15 -0700 Subject: [PATCH 15/18] Adds deletion test --- bookwyrm/tests/views/test_email_blocks.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/bookwyrm/tests/views/test_email_blocks.py b/bookwyrm/tests/views/test_email_blocks.py index 1272ef9d6..1fddfbe76 100644 --- a/bookwyrm/tests/views/test_email_blocks.py +++ b/bookwyrm/tests/views/test_email_blocks.py @@ -55,3 +55,21 @@ class EmailBlocklistViews(TestCase): self.assertTrue( models.EmailBlocklist.objects.filter(domain="gmail.com").exists() ) + + def test_blocklist_page_delete(self): + """there are so many views, this just makes sure it LOADS""" + domain = models.EmailBlocklist.objects.create(domain="gmail.com") + + view = views.EmailBlocklist.as_view() + request = self.factory.post(f"/settings/email-blocklist/{domain.id}/delete") + request.user = self.local_user + request.user.is_superuser = True + + result = view(request) + + self.assertIsInstance(result, TemplateResponse) + self.assertEqual(result.status_code, 302) + + self.assertFalse( + models.EmailBlocklist.objects.filter(domain="gmail.com").exists() + ) From 21527803de00c94cac998c4f625fc05d92a9b213 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 16:35:36 -0700 Subject: [PATCH 16/18] Fixes delete test --- bookwyrm/tests/views/test_email_blocks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/tests/views/test_email_blocks.py b/bookwyrm/tests/views/test_email_blocks.py index 1fddfbe76..cc5fb56fc 100644 --- a/bookwyrm/tests/views/test_email_blocks.py +++ b/bookwyrm/tests/views/test_email_blocks.py @@ -61,7 +61,7 @@ class EmailBlocklistViews(TestCase): domain = models.EmailBlocklist.objects.create(domain="gmail.com") view = views.EmailBlocklist.as_view() - request = self.factory.post(f"/settings/email-blocklist/{domain.id}/delete") + request = self.factory.post("", domain_id=domain.id) request.user = self.local_user request.user.is_superuser = True From bcb78653e93d61b0494069ad836622919bef221a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 17:39:22 -0700 Subject: [PATCH 17/18] Fixes remove email domain test --- bookwyrm/tests/views/test_email_blocks.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bookwyrm/tests/views/test_email_blocks.py b/bookwyrm/tests/views/test_email_blocks.py index cc5fb56fc..be3d9d702 100644 --- a/bookwyrm/tests/views/test_email_blocks.py +++ b/bookwyrm/tests/views/test_email_blocks.py @@ -61,13 +61,11 @@ class EmailBlocklistViews(TestCase): domain = models.EmailBlocklist.objects.create(domain="gmail.com") view = views.EmailBlocklist.as_view() - request = self.factory.post("", domain_id=domain.id) + request = self.factory.post("") request.user = self.local_user request.user.is_superuser = True - result = view(request) - - self.assertIsInstance(result, TemplateResponse) + result = view(request, domain_id=domain.id) self.assertEqual(result.status_code, 302) self.assertFalse( From 7ef179a4f3432c815fc3fb825d8d014b6f845a02 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Sep 2021 17:44:17 -0700 Subject: [PATCH 18/18] Merge migration --- ...e_0090_auto_20210908_2346_0090_emailblocklist.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bookwyrm/migrations/0091_merge_0090_auto_20210908_2346_0090_emailblocklist.py diff --git a/bookwyrm/migrations/0091_merge_0090_auto_20210908_2346_0090_emailblocklist.py b/bookwyrm/migrations/0091_merge_0090_auto_20210908_2346_0090_emailblocklist.py new file mode 100644 index 000000000..7aae2c7a6 --- /dev/null +++ b/bookwyrm/migrations/0091_merge_0090_auto_20210908_2346_0090_emailblocklist.py @@ -0,0 +1,13 @@ +# Generated by Django 3.2.4 on 2021-09-09 00:43 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0090_auto_20210908_2346"), + ("bookwyrm", "0090_emailblocklist"), + ] + + operations = []