From 07f4300176f9f1edb9597dc0e75c6cdf21f67143 Mon Sep 17 00:00:00 2001
From: Dustin Steiner <dustin.steiner@gmail.com>
Date: Fri, 27 Jan 2023 15:43:34 +0000
Subject: [PATCH] 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 @@
             </p>
             {% endif %}
 
+            {% if not user.is_active and user.deactivation_reason == "pending" %}
+            <form name="suspend" method="post" action="{% url 'settings-activate-user' user.id  %}" class="mr-1">
+                {% csrf_token %}
+                <button type="submit" class="button is-success is-light">{% trans "Activate user" %}</button>
+            </form>
+            {% endif %}
             {% if user.is_active or user.deactivation_reason == "pending" %}
             <form name="suspend" method="post" action="{% url 'settings-report-suspend' user.id  %}" class="mr-1">
                 {% 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<user>\d+)/activate/?$",
+        views.ActivateUserAdmin.as_view(),
+        name="settings-activate-user",
+    ),
     re_path(
         r"^settings/federation/(?P<status>(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)