From 07f4300176f9f1edb9597dc0e75c6cdf21f67143 Mon Sep 17 00:00:00 2001 From: Dustin Steiner Date: Fri, 27 Jan 2023 15:43:34 +0000 Subject: [PATCH 1/6] feat: button in admin view to manually activate pending user --- .../settings/users/user_moderation_actions.html | 6 ++++++ bookwyrm/urls.py | 5 +++++ bookwyrm/utils/regex.py | 2 +- bookwyrm/views/__init__.py | 2 +- bookwyrm/views/admin/user_admin.py | 16 +++++++++++++++- 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/bookwyrm/templates/settings/users/user_moderation_actions.html b/bookwyrm/templates/settings/users/user_moderation_actions.html index 72202f379..9fda8c847 100644 --- a/bookwyrm/templates/settings/users/user_moderation_actions.html +++ b/bookwyrm/templates/settings/users/user_moderation_actions.html @@ -15,6 +15,12 @@

{% endif %} + {% if not user.is_active and user.deactivation_reason == "pending" %} +
+ {% csrf_token %} + +
+ {% endif %} {% if user.is_active or user.deactivation_reason == "pending" %}
{% csrf_token %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 73bdd3755..cd07cbf00 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -145,6 +145,11 @@ urlpatterns = [ views.UserAdmin.as_view(), name="settings-user", ), + re_path( + r"^settings/users/(?P\d+)/activate/?$", + views.ActivateUserAdmin.as_view(), + name="settings-activate-user", + ), re_path( r"^settings/federation/(?P(federated|blocked))?/?$", views.Federation.as_view(), diff --git a/bookwyrm/utils/regex.py b/bookwyrm/utils/regex.py index c8a475a3d..b2c8a5ba3 100644 --- a/bookwyrm/utils/regex.py +++ b/bookwyrm/utils/regex.py @@ -1,6 +1,6 @@ """ defining regexes for regularly used concepts """ -DOMAIN = r"[\w_\-\.]+\.[a-z\-]{2,}" +DOMAIN = r"(?:localhost:[0-9]{4,}|[\w_\-\.]+\.[a-z\-]{2,})" LOCALNAME = r"@?[a-zA-Z_\-\.0-9]+" STRICT_LOCALNAME = r"@[a-zA-Z_\-\.0-9]+" USERNAME = rf"{LOCALNAME}(@{DOMAIN})?" diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 353275c46..cb4d79abd 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -31,7 +31,7 @@ from .admin.reports import ( ) from .admin.site import Site, Registration, RegistrationLimited from .admin.themes import Themes, delete_theme -from .admin.user_admin import UserAdmin, UserAdminList +from .admin.user_admin import UserAdmin, UserAdminList, ActivateUserAdmin # user preferences from .preferences.change_password import ChangePassword diff --git a/bookwyrm/views/admin/user_admin.py b/bookwyrm/views/admin/user_admin.py index 4611a388c..bc04e833f 100644 --- a/bookwyrm/views/admin/user_admin.py +++ b/bookwyrm/views/admin/user_admin.py @@ -1,7 +1,7 @@ """ manage user """ from django.contrib.auth.decorators import login_required, permission_required from django.core.paginator import Paginator -from django.shortcuts import get_object_or_404 +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 @@ -95,3 +95,17 @@ class UserAdmin(View): form.save(request) data = {"user": user, "group_form": form} return TemplateResponse(request, "settings/users/user.html", data) + +@method_decorator(login_required, name="dispatch") +@method_decorator( + permission_required("bookwyrm.moderate_user", raise_exception=True), + name="dispatch", +) +class ActivateUserAdmin(View): + """activate a user manually""" + + def post(self, request, user): + """activate user""" + user = get_object_or_404(models.User, id=user) + user.reactivate() + return redirect("settings-user", user.id) From 3d29524e29f85d099fc078bb701c79b8069825a0 Mon Sep 17 00:00:00 2001 From: Dustin Steiner Date: Fri, 27 Jan 2023 15:45:43 +0000 Subject: [PATCH 2/6] chore: reverse support for localhost domain --- bookwyrm/utils/regex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/utils/regex.py b/bookwyrm/utils/regex.py index b2c8a5ba3..c8a475a3d 100644 --- a/bookwyrm/utils/regex.py +++ b/bookwyrm/utils/regex.py @@ -1,6 +1,6 @@ """ defining regexes for regularly used concepts """ -DOMAIN = r"(?:localhost:[0-9]{4,}|[\w_\-\.]+\.[a-z\-]{2,})" +DOMAIN = r"[\w_\-\.]+\.[a-z\-]{2,}" LOCALNAME = r"@?[a-zA-Z_\-\.0-9]+" STRICT_LOCALNAME = r"@[a-zA-Z_\-\.0-9]+" USERNAME = rf"{LOCALNAME}(@{DOMAIN})?" From 54aea0654af7a81162b3cc6631b4011fc23e6e00 Mon Sep 17 00:00:00 2001 From: Dustin Steiner Date: Fri, 27 Jan 2023 15:47:22 +0000 Subject: [PATCH 3/6] style: run linter --- bookwyrm/views/admin/user_admin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/views/admin/user_admin.py b/bookwyrm/views/admin/user_admin.py index bc04e833f..77177e6f1 100644 --- a/bookwyrm/views/admin/user_admin.py +++ b/bookwyrm/views/admin/user_admin.py @@ -96,6 +96,7 @@ class UserAdmin(View): data = {"user": user, "group_form": form} return TemplateResponse(request, "settings/users/user.html", data) + @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.moderate_user", raise_exception=True), From 3fdbfe405bf8bc930d0766b4de3b2c6a984adcef Mon Sep 17 00:00:00 2001 From: Dustin Steiner Date: Sat, 28 Jan 2023 08:31:16 +0000 Subject: [PATCH 4/6] fix: rename activate user form name --- bookwyrm/templates/settings/users/user_moderation_actions.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/settings/users/user_moderation_actions.html b/bookwyrm/templates/settings/users/user_moderation_actions.html index 9fda8c847..5bd007e0d 100644 --- a/bookwyrm/templates/settings/users/user_moderation_actions.html +++ b/bookwyrm/templates/settings/users/user_moderation_actions.html @@ -16,7 +16,7 @@ {% endif %} {% if not user.is_active and user.deactivation_reason == "pending" %} - + {% csrf_token %} From 952dd0dcdf43a552e4cc39ad280203c48b668e62 Mon Sep 17 00:00:00 2001 From: Dustin Steiner Date: Sat, 28 Jan 2023 08:31:41 +0000 Subject: [PATCH 5/6] style: fix unused parameter linter error --- bookwyrm/views/admin/user_admin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/views/admin/user_admin.py b/bookwyrm/views/admin/user_admin.py index 77177e6f1..c793d3bff 100644 --- a/bookwyrm/views/admin/user_admin.py +++ b/bookwyrm/views/admin/user_admin.py @@ -105,6 +105,7 @@ class UserAdmin(View): class ActivateUserAdmin(View): """activate a user manually""" + # pylint: disable=unused-argument def post(self, request, user): """activate user""" user = get_object_or_404(models.User, id=user) From 1d0599d6d95e1154fe39ef7c2f3306d297e01597 Mon Sep 17 00:00:00 2001 From: Dustin Steiner Date: Mon, 30 Jan 2023 08:23:06 +0000 Subject: [PATCH 6/6] chore: make and compile messages --- locale/en_US/LC_MESSAGES/django.po | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 9ba4bfe40..5f3c62895 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-26 16:43+0000\n" +"POT-Creation-Date: 2023-01-30 08:21+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -851,7 +851,7 @@ msgstr "" #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 -#: bookwyrm/templates/settings/users/user_moderation_actions.html:69 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:75 #: bookwyrm/templates/shelf/form.html:25 #: bookwyrm/templates/snippets/reading_modals/layout.html:18 msgid "Save" @@ -5448,7 +5448,7 @@ msgid "Remove theme" msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:5 -#: bookwyrm/templates/settings/users/user_moderation_actions.html:32 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:38 msgid "Permanently delete user" msgstr "" @@ -5570,14 +5570,18 @@ msgid "User Actions" msgstr "" #: bookwyrm/templates/settings/users/user_moderation_actions.html:21 +msgid "Activate user" +msgstr "" + +#: bookwyrm/templates/settings/users/user_moderation_actions.html:27 msgid "Suspend user" msgstr "" -#: bookwyrm/templates/settings/users/user_moderation_actions.html:26 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:32 msgid "Un-suspend user" msgstr "" -#: bookwyrm/templates/settings/users/user_moderation_actions.html:48 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:54 msgid "Access level:" msgstr ""