From a68196d9bbd5cfa2d68142afd4f320633890f1e9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 08:54:57 -0700
Subject: [PATCH 1/2] Improves user admin filter behavior

---
 bookwyrm/templates/user_admin/user_admin_filters.html | 2 +-
 bookwyrm/views/user_admin.py                          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/user_admin/user_admin_filters.html b/bookwyrm/templates/user_admin/user_admin_filters.html
index 5283b4e9c..c9c7a93fc 100644
--- a/bookwyrm/templates/user_admin/user_admin_filters.html
+++ b/bookwyrm/templates/user_admin/user_admin_filters.html
@@ -1,7 +1,7 @@
 {% extends 'snippets/filters_panel/filters_panel.html' %}
 
 {% block filter_fields %}
-{% include 'user_admin/server_filter.html' %}
 {% include 'user_admin/username_filter.html' %}
 {% include 'directory/community_filter.html' %}
+{% include 'user_admin/server_filter.html' %}
 {% endblock %}
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
index 3a9ea3392..ac5357a28 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/user_admin.py
@@ -31,8 +31,8 @@ class UserAdminList(View):
         if username:
             filters["username__icontains"] = username
         scope = request.GET.get("scope")
-        if scope:
-            filters["local"] = scope == "local"
+        if scope and scope == "local":
+            filters["local"] = True
 
         users = models.User.objects.filter(**filters)
 

From 2886c15e1d70d1ee8acbd3e0cd9825f7affa7688 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 6 Sep 2021 09:35:25 -0700
Subject: [PATCH 2/2] Adds more info to user admin page

---
 bookwyrm/templates/user_admin/user.html      | 12 +--
 bookwyrm/templates/user_admin/user_info.html | 93 +++++++++++++++++++-
 2 files changed, 99 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/user_admin/user.html b/bookwyrm/templates/user_admin/user.html
index c79c6971f..5c118175b 100644
--- a/bookwyrm/templates/user_admin/user.html
+++ b/bookwyrm/templates/user_admin/user.html
@@ -2,13 +2,15 @@
 {% load i18n %}
 
 {% block title %}{{ user.username }}{% endblock %}
-{% block header %}{{ user.username }}{% endblock %}
+{% block header %}
+{{ user.username }}
+<p class="help has-text-weight-normal">
+    <a href="{% url 'settings-users' %}">{% trans "Back to users" %}</a>
+</p>
+
+{% endblock %}
 
 {% block panel %}
-<div class="block">
-    <a href="{% url 'settings-users' %}">{% trans "Back to users" %}</a>
-</div>
-
 {% include 'user_admin/user_info.html' with user=user %}
 
 {% include 'user_admin/user_moderation_actions.html' with user=user %}
diff --git a/bookwyrm/templates/user_admin/user_info.html b/bookwyrm/templates/user_admin/user_info.html
index 579b3af7e..69a84a664 100644
--- a/bookwyrm/templates/user_admin/user_info.html
+++ b/bookwyrm/templates/user_admin/user_info.html
@@ -1,8 +1,10 @@
 {% load i18n %}
 {% load markdown %}
+{% load humanize %}
+
 <div class="block columns">
     <div class="column is-flex is-flex-direction-column">
-        <h4 class="title is-4">{% trans "User details" %}</h4>
+        <h4 class="title is-4">{% trans "Profile" %}</h4>
         <div class="box is-flex-grow-1">
             {% include 'user/user_preview.html' with user=user %}
             {% if user.summary %}
@@ -14,6 +16,95 @@
             <p class="mt-2"><a href="{{ user.local_path }}">{% trans "View user profile" %}</a></p>
         </div>
     </div>
+    <div class="column is-flex is-flex-direction-column is-4">
+        <h4 class="title is-4">{% trans "Status" %}</h4>
+        <div class="box is-flex-grow-1 has-text-weight-bold">
+            {% if user.is_active %}
+            <p class="notification is-success">
+                {% trans "Active" %}
+            </p>
+            {% else %}
+            <p class="notification is-warning">
+                {% trans "Inactive" %}
+                {% if user.deactivation_reason %}
+                ({{ user.deactivation_reason }})
+                {% endif %}
+            </p>
+            {% endif %}
+            <p class="notification">
+                {% if user.local %}
+                {% trans "Local" %}
+                {% else %}
+                {% trans "Remote" %}
+                {% endif %}
+            </p>
+        </div>
+    </div>
+</div>
+
+<div class="block columns">
+    <div class="column is-flex is-flex-direction-column">
+        <h4 class="title is-4">{% trans "User details" %}</h4>
+        <div class="box content is-flex-grow-1">
+            <dl>
+                {% if user.local %}
+                <div class="is-flex">
+                    <dt>{% trans "Email:" %}</dt>
+                    <dd>{{ user.email }}</dd>
+                </div>
+                {% endif %}
+
+                {% with report_count=user.report_set.count %}
+                <div class="is-flex">
+                    <dt>{% trans "Reports:" %}</dt>
+                    <dd>
+                        {{ report_count|intcomma }}
+                        {% if report_count > 0 %}
+                        <a href="{% url 'settings-reports' %}?username={{ user.username }}">
+                            {% trans "(View reports)" %}
+                        </a>
+                        {% endif %}
+                    </dd>
+                </div>
+                {% endwith %}
+
+                <div class="is-flex">
+                    <dt>{% trans "Blocked by count:" %}</dt>
+                    <dd>{{ user.blocked_by.count }}</dd>
+                </div>
+
+                <div class="is-flex">
+                    <dt>{% trans "Last active date:" %}</dt>
+                    <dd>{{ user.last_active_date }}</dd>
+                </div>
+
+                <div class="is-flex">
+                    <dt>{% trans "Manually approved followers:" %}</dt>
+                    <dd>{{ user.manually_approves_followers }}</dd>
+                </div>
+
+                <div class="is-flex">
+                    <dt>{% trans "Discoverable:" %}</dt>
+                    <dd>{{ user.discoverable }}</dd>
+                </div>
+
+                {% if not user.is_active %}
+                <div class="is-flex">
+                    <dt>{% trans "Deactivation reason:" %}</dt>
+                    <dd>{{ user.deactivation_reason }}</dd>
+                </div>
+                {% endif %}
+
+                {% if not user.is_active and user.deactivation_reason == "pending" %}
+                <div class="is-flex">
+                    <dt>{% trans "Confirmation code:" %}</dt>
+                    <dd>{{ user.confirmation_code }}</dd>
+                </div>
+                {% endif %}
+            </dl>
+        </div>
+    </div>
+
     {% if not user.local %}
     {% with server=user.federated_server %}
     <div class="column is-half is-flex is-flex-direction-column">