Merge branch 'main' into book-file-links

2022-01-09 13:15:58 -08:00 · 2022-01-09 13:15:58 -08:00 · 4931e5cad2
commit 4931e5cad2
parent 16a58ae079 6492ca2941
31 changed files with 12128 additions and 2545 deletions
--- a/bookwyrm/views/landing/about.py
+++ b/bookwyrm/views/landing/about.py
@ -19,7 +19,9 @@ def about(request):
        "status_count": models.Status.objects.filter(
            user__local=True, deleted=False
        ).count(),
-        "admins": models.User.objects.filter(groups__name__in=["admin", "moderator"]),
+        "admins": models.User.objects.filter(
+            groups__name__in=["admin", "moderator"]
+        ).distinct(),
        "version": settings.VERSION,
    }