Merge branch 'main' into partially-read-shelf

bookwyrm/views/__init__.py

@@ -6,7 +6,7 @@ from .admin.automod import AutoMod, automod_delete, run_automod
 from .admin.dashboard import Dashboard
 from .admin.federation import Federation, FederatedServer
 from .admin.federation import AddFederatedServer, ImportServerBlocklist
-from .admin.federation import block_server, unblock_server
+from .admin.federation import block_server, unblock_server, refresh_server
 from .admin.email_blocklist import EmailBlocklist
 from .admin.ip_blocklist import IPBlocklist
 from .admin.invite import ManageInvites, Invite, InviteRequest
@@ -21,6 +21,7 @@ from .admin.reports import (
     moderator_delete_user,
 )
 from .admin.site import Site
+from .admin.themes import Themes, delete_theme
 from .admin.user_admin import UserAdmin, UserAdminList
 
 # user preferences

bookwyrm/views/admin/federation.py

@@ -11,6 +11,7 @@ from django.views.decorators.http import require_POST
 
 from bookwyrm import forms, models
 from bookwyrm.settings import PAGE_LENGTH
+from bookwyrm.models.user import get_or_create_remote_server
 
 
 # pylint: disable= no-self-use
@@ -37,6 +38,12 @@ class Federation(View):
         page = paginated.get_page(request.GET.get("page"))
 
         data = {
+            "federated_count": models.FederatedServer.objects.filter(
+                status="federated"
+            ).count(),
+            "blocked_count": models.FederatedServer.objects.filter(
+                status="blocked"
+            ).count(),
             "servers": page,
             "page_range": paginated.get_elided_page_range(
                 page.number, on_each_side=2, on_ends=1
@@ -157,3 +164,14 @@ def unblock_server(request, server):
     server = get_object_or_404(models.FederatedServer, id=server)
     server.unblock()
     return redirect("settings-federated-server", server.id)
+
+
+@login_required
+@require_POST
+@permission_required("bookwyrm.control_federation", raise_exception=True)
+# pylint: disable=unused-argument
+def refresh_server(request, server):
+    """unblock a server"""
+    server = get_object_or_404(models.FederatedServer, id=server)
+    get_or_create_remote_server(server.server_name, refresh=True)
+    return redirect("settings-federated-server", server.id)

bookwyrm/views/admin/site.py

@@ -29,7 +29,7 @@ class Site(View):
         if not form.is_valid():
             data = {"site_form": form}
             return TemplateResponse(request, "settings/site.html", data)
-        form.save()
+        site = form.save()
 
         data = {"site_form": forms.SiteForm(instance=site), "success": True}
         return TemplateResponse(request, "settings/site.html", data)

bookwyrm/views/admin/themes.py

@@ -0,0 +1,59 @@
+""" manage themes """
+from django.contrib.auth.decorators import login_required, permission_required
+from django.contrib.staticfiles.utils import get_files
+from django.contrib.staticfiles.storage import StaticFilesStorage
+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
+from django.views.decorators.http import require_POST
+
+from bookwyrm import forms, models
+
+
+# pylint: disable= no-self-use
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.edit_instance_settings", raise_exception=True),
+    name="dispatch",
+)
+class Themes(View):
+    """manage things like the instance name"""
+
+    def get(self, request):
+        """view existing themes and set defaults"""
+        return TemplateResponse(request, "settings/themes.html", get_view_data())
+
+    def post(self, request):
+        """edit the site settings"""
+        form = forms.ThemeForm(request.POST, request.FILES)
+        if form.is_valid():
+            form.save()
+
+        data = get_view_data()
+
+        if not form.is_valid():
+            data["theme_form"] = form
+        else:
+            data["success"] = True
+        return TemplateResponse(request, "settings/themes.html", data)
+
+
+def get_view_data():
+    """data for view"""
+    choices = list(get_files(StaticFilesStorage(), location="css/themes"))
+    current = models.Theme.objects.values_list("path", flat=True)
+    return {
+        "themes": models.Theme.objects.all(),
+        "choices": [c for c in choices if c not in current and c[-5:] == ".scss"],
+        "theme_form": forms.ThemeForm(),
+    }
+
+
+@require_POST
+@permission_required("bookwyrm.edit_instance_settings", raise_exception=True)
+# pylint: disable=unused-argument
+def delete_theme(request, theme_id):
+    """Remove a theme"""
+    get_object_or_404(models.Theme, id=theme_id).delete()
+    return redirect("settings-themes")

bookwyrm/views/user.py

@@ -1,5 +1,6 @@
 """ non-interactive pages """
 from django.contrib.auth.decorators import login_required
+from django.core.exceptions import PermissionDenied
 from django.core.paginator import Paginator
 from django.db.models import Q, Count
 from django.http import Http404
@@ -105,6 +106,9 @@ class Followers(View):
         if is_api_request(request):
             return ActivitypubResponse(user.to_followers_activity(**request.GET))
 
+        if user.hide_follows:
+            raise PermissionDenied()
+
         followers = annotate_if_follows(request.user, user.followers)
         paginated = Paginator(followers.all(), PAGE_LENGTH)
         data = {
@@ -125,6 +129,9 @@ class Following(View):
         if is_api_request(request):
             return ActivitypubResponse(user.to_following_activity(**request.GET))
 
+        if user.hide_follows:
+            raise PermissionDenied()
+
         following = annotate_if_follows(request.user, user.following)
         paginated = Paginator(following.all(), PAGE_LENGTH)
         data = {