Merge branch 'main' into notifications

bookwyrm/views/admin/automod.py

@@ -33,8 +33,7 @@ class AutoMod(View):
     def post(self, request):
         """add rule"""
         form = forms.AutoModRuleForm(request.POST)
-        success = form.is_valid()
-        if success:
+        if form.is_valid():
             form.save()
             form = forms.AutoModRuleForm()
 

bookwyrm/views/admin/user_admin.py

@@ -77,8 +77,13 @@ class UserAdmin(View):
     def post(self, request, user):
         """update user group"""
         user = get_object_or_404(models.User, id=user)
-        form = forms.UserGroupForm(request.POST, instance=user)
-        if form.is_valid():
-            form.save()
+
+        if request.POST.get("groups") == "":
+            user.groups.set([])
+            form = forms.UserGroupForm(instance=user)
+        else:
+            form = forms.UserGroupForm(request.POST, instance=user)
+            if form.is_valid():
+                form.save()
         data = {"user": user, "group_form": form}
         return TemplateResponse(request, "settings/users/user.html", data)

bookwyrm/views/helpers.py

@@ -148,13 +148,6 @@ def handle_reading_status(user, shelf, book, privacy):
     status.save()
 
 
-def is_blocked(viewer, user):
-    """is this viewer blocked by the user?"""
-    if viewer.is_authenticated and viewer in user.blocks.all():
-        return True
-    return False
-
-
 def load_date_in_user_tz_as_utc(date_str: str, user: models.User) -> datetime:
     """ensures that data is stored consistently in the UTC timezone"""
     if not date_str:

bookwyrm/views/report.py

@@ -13,9 +13,13 @@ from bookwyrm import emailing, forms, models
 class Report(View):
     """Make reports"""
 
-    def get(self, request, user_id, status_id=None, link_id=None):
+    def get(self, request, user_id=None, status_id=None, link_id=None):
         """static view of report modal"""
-        data = {"user": get_object_or_404(models.User, id=user_id)}
+        data = {"user": None}
+        if user_id:
+            # but normally we should have an error if the user is not found
+            data["user"] = get_object_or_404(models.User, id=user_id)
+
         if status_id:
             data["status"] = status_id
         if link_id: