Merge branch 'main' into url-names

bookwyrm/views/__init__.py

@@ -3,6 +3,7 @@
 from .admin.announcements import Announcements, Announcement
 from .admin.announcements import EditAnnouncement, delete_announcement
 from .admin.automod import AutoMod, automod_delete, run_automod
+from .admin.automod import schedule_automod_task, unschedule_automod_task
 from .admin.dashboard import Dashboard
 from .admin.federation import Federation, FederatedServer
 from .admin.federation import AddFederatedServer, ImportServerBlocklist

bookwyrm/views/admin/automod.py

@@ -1,10 +1,12 @@
 """ moderation via flagged posts and users """
 from django.contrib.auth.decorators import login_required, permission_required
+from django.db import transaction
 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 django_celery_beat.models import PeriodicTask
 
 from bookwyrm import forms, models
 
@@ -24,8 +26,9 @@ class AutoMod(View):
 
     def get(self, request):
         """view rules"""
-        data = {"rules": models.AutoMod.objects.all(), "form": forms.AutoModRuleForm()}
-        return TemplateResponse(request, "settings/automod/rules.html", data)
+        return TemplateResponse(
+            request, "settings/automod/rules.html", automod_view_data()
+        )
 
     def post(self, request):
         """add rule"""
@@ -35,22 +38,49 @@ class AutoMod(View):
             form.save()
             form = forms.AutoModRuleForm()
 
-        data = {
-            "rules": models.AutoMod.objects.all(),
-            "form": form,
-            "success": success,
-        }
+        data = automod_view_data()
+        data["form"] = form
         return TemplateResponse(request, "settings/automod/rules.html", data)
 
 
+@require_POST
+@permission_required("bookwyrm.moderate_user", raise_exception=True)
+@permission_required("bookwyrm.moderate_post", raise_exception=True)
+def schedule_automod_task(request):
+    """scheduler"""
+    form = forms.IntervalScheduleForm(request.POST)
+    if not form.is_valid():
+        data = automod_view_data()
+        data["task_form"] = form
+        return TemplateResponse(request, "settings/automod/rules.html", data)
+
+    with transaction.atomic():
+        schedule = form.save()
+        PeriodicTask.objects.get_or_create(
+            interval=schedule,
+            name="automod-task",
+            task="bookwyrm.models.antispam.automod_task",
+        )
+    return redirect("settings-automod")
+
+
+@require_POST
+@permission_required("bookwyrm.moderate_user", raise_exception=True)
+@permission_required("bookwyrm.moderate_post", raise_exception=True)
+# pylint: disable=unused-argument
+def unschedule_automod_task(request, task_id):
+    """unscheduler"""
+    get_object_or_404(PeriodicTask, id=task_id).delete()
+    return redirect("settings-automod")
+
+
 @require_POST
 @permission_required("bookwyrm.moderate_user", raise_exception=True)
 @permission_required("bookwyrm.moderate_post", raise_exception=True)
 # pylint: disable=unused-argument
 def automod_delete(request, rule_id):
     """Remove a rule"""
-    rule = get_object_or_404(models.AutoMod, id=rule_id)
-    rule.delete()
+    get_object_or_404(models.AutoMod, id=rule_id).delete()
     return redirect("settings-automod")
 
 
@@ -62,3 +92,18 @@ def run_automod(request):
     """run scan"""
     models.automod_task.delay()
     return redirect("settings-automod")
+
+
+def automod_view_data():
+    """helper to get data used in the template"""
+    try:
+        task = PeriodicTask.objects.get(name="automod-task")
+    except PeriodicTask.DoesNotExist:
+        task = None
+
+    return {
+        "task": task,
+        "task_form": forms.IntervalScheduleForm(),
+        "rules": models.AutoMod.objects.all(),
+        "form": forms.AutoModRuleForm(),
+    }

bookwyrm/views/admin/themes.py

@@ -1,7 +1,5 @@
 """ 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
@@ -41,11 +39,8 @@ class Themes(View):
 
 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(),
     }
 

bookwyrm/views/admin/user_admin.py

@@ -19,7 +19,7 @@ from bookwyrm.settings import PAGE_LENGTH
 class UserAdminList(View):
     """admin view of users on this server"""
 
-    def get(self, request):
+    def get(self, request, status="local"):
         """list of users"""
         filters = {}
         server = request.GET.get("server")
@@ -37,6 +37,8 @@ class UserAdminList(View):
         if email:
             filters["email__endswith"] = email
 
+        filters["local"] = status == "local"
+
         users = models.User.objects.filter(**filters)
 
         sort = request.GET.get("sort", "-created_date")
@@ -56,6 +58,7 @@ class UserAdminList(View):
             "users": paginated.get_page(request.GET.get("page")),
             "sort": sort,
             "server": server,
+            "status": status,
         }
         return TemplateResponse(request, "settings/users/user_admin.html", data)
 

bookwyrm/views/books/books.py

@@ -12,7 +12,7 @@ from django.views.decorators.http import require_POST
 
 from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
-from bookwyrm.connectors import connector_manager
+from bookwyrm.connectors import connector_manager, ConnectorException
 from bookwyrm.connectors.abstract_connector import get_image
 from bookwyrm.settings import PAGE_LENGTH
 from bookwyrm.views.helpers import is_api_request, maybe_redirect_local_path
@@ -89,6 +89,7 @@ class Book(View):
             else None,
             "rating": reviews.aggregate(Avg("rating"))["rating__avg"],
             "lists": lists,
+            "update_error": kwargs.get("update_error", False),
         }
 
         if request.user.is_authenticated:
@@ -200,6 +201,10 @@ def update_book_from_remote(request, book_id, connector_identifier):
     )
     book = get_object_or_404(models.Book.objects.select_subclasses(), id=book_id)
 
-    connector.update_book_from_remote(book)
+    try:
+        connector.update_book_from_remote(book)
+    except ConnectorException:
+        # the remote source isn't available or doesn't know this book
+        return Book().get(request, book_id, update_error=True)
 
     return redirect("book", book.id)