Merge branch 'main' into tour

Merging in latest changes from main, since I got covid and missed a few weeks.

bookwyrm/views/admin/federation.py

@@ -29,6 +29,8 @@ class Federation(View):
         filters = {}
         if software := request.GET.get("application_type"):
             filters["application_type"] = software
+        if server := request.GET.get("server"):
+            filters["server_name"] = server
 
         servers = models.FederatedServer.objects.filter(status=status, **filters)
 
@@ -60,7 +62,9 @@ class Federation(View):
             "sort": sort,
             "software_options": models.FederatedServer.objects.values_list(
                 "application_type", flat=True
-            ).distinct(),
+            )
+            .distinct()
+            .order_by("application_type"),
             "form": forms.ServerForm(),
         }
         return TemplateResponse(request, "settings/federation/instance_list.html", data)

bookwyrm/views/admin/user_admin.py

@@ -22,19 +22,16 @@ class UserAdminList(View):
     def get(self, request, status="local"):
         """list of users"""
         filters = {}
-        server = request.GET.get("server")
-        if server:
+        if server := request.GET.get("server"):
             server = models.FederatedServer.objects.filter(server_name=server).first()
             filters["federated_server"] = server
             filters["federated_server__isnull"] = False
-        username = request.GET.get("username")
-        if username:
+        if username := request.GET.get("username"):
             filters["username__icontains"] = username
         scope = request.GET.get("scope")
         if scope and scope == "local":
             filters["local"] = True
-        email = request.GET.get("email")
-        if email:
+        if email := request.GET.get("email"):
             filters["email__endswith"] = email
 
         filters["local"] = status == "local"