Activate pending users when email confirmation is disabled

bookwyrm/models/site.py

@@ -90,6 +90,14 @@ class SiteSettings(models.Model):
             return get_absolute_url(uploaded)
         return urljoin(STATIC_FULL_URL, default_path)
 
+    def save(self, *args, **kwargs):
+        """if require_confirm_email is disabled, make sure no users are pending"""
+        if not self.require_confirm_email:
+            User.objects.filter(is_active=False, deactivation_reason="pending").update(
+                is_active=True, deactivation_reason=None
+            )
+        super().save(*args, **kwargs)
+
 
 class SiteInvite(models.Model):
     """gives someone access to create an account on the instance"""

bookwyrm/tests/models/test_site.py

@@ -94,14 +94,28 @@ class SiteModels(TestCase):
         self.assertTrue(token.valid())
         self.assertEqual(token.link, f"https://{settings.DOMAIN}/password-reset/hello")
 
-    def test_change_confirmation_scheme(self):
+    @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+    @patch("bookwyrm.suggested_users.remove_user_task.delay")
+    @patch("bookwyrm.activitystreams.populate_stream_task.delay")
+    @patch("bookwyrm.lists_stream.populate_lists_task.delay")
+    def test_change_confirmation_scheme(self, *_):
         """Switch from requiring email confirmation to not"""
         site = models.SiteSettings.objects.create(
             id=1, name="Fish Town", require_confirm_email=True
         )
-        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
-            "bookwyrm.activitystreams.populate_stream_task.delay"
-        ), patch("bookwyrm.lists_stream.populate_lists_task.delay"):
+        banned_user = models.User.objects.create_user(
+            "rat@local.com",
+            "rat@rat.com",
+            "ratword",
+            local=True,
+            localname="rat",
+            remote_id="https://example.com/users/rat",
+            confirmation_code="HELLO",
+        )
+        banned_user.is_active = False
+        banned_user.deactivation_reason = "banned"
+        banned_user.save(broadcast=False)
+
         pending_user = models.User.objects.create_user(
             "nutria@local.com",
             "nutria@nutria.com",
@@ -109,12 +123,18 @@ class SiteModels(TestCase):
             local=True,
             localname="nutria",
             remote_id="https://example.com/users/nutria",
-                is_active=False,
-                deactivation_reason="pending",
             confirmation_code="HELLO",
         )
+        pending_user.is_active = False
+        pending_user.deactivation_reason = "pending"
+        pending_user.save(broadcast=False)
         site.require_confirm_email = False
         site.save()
+
         pending_user.refresh_from_db()
         self.assertTrue(pending_user.is_active)
         self.assertIsNone(pending_user.deactivation_reason)
+
+        banned_user.refresh_from_db()
+        self.assertFalse(banned_user.is_active)
+        self.assertIsNotNone(banned_user.deactivation_reason)