Merge branch 'main' into production

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/templates/about/about.html

@@ -12,6 +12,7 @@
 {% block about_content %}
 {# seven day cache #}
 {% cache 604800 about_page %}
+
 {% get_book_superlatives as superlatives %}
 <section class="content pb-4">
     <h2>
@@ -26,7 +27,7 @@
     </p>
 
     <div class="columns">
-        {% if top_rated %}
+        {% if superlatives.top_rated %}
         {% with book=superlatives.top_rated.default_edition rating=top_rated.rating %}
         <div class="column is-one-third is-flex">
             <div class="media notification">
@@ -45,7 +46,7 @@
         {% endwith %}
         {% endif %}
 
-        {% if wanted %}
+        {% if superlatives.wanted %}
         {% with book=superlatives.wanted.default_edition %}
         <div class="column is-one-third is-flex">
             <div class="media notification">
@@ -64,7 +65,7 @@
         {% endwith %}
         {% endif %}
 
-        {% if controversial %}
+        {% if superlatives.controversial %}
         {% with book=superlatives.controversial.default_edition %}
         <div class="column is-one-third is-flex">
             <div class="media notification">

bookwyrm/tests/models/test_site.py

@@ -93,3 +93,48 @@ class SiteModels(TestCase):
         token = models.PasswordReset.objects.create(user=self.local_user, code="hello")
         self.assertTrue(token.valid())
         self.assertEqual(token.link, f"https://{settings.DOMAIN}/password-reset/hello")
+
+    @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
+        )
+        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",
+            "nutriaword",
+            local=True,
+            localname="nutria",
+            remote_id="https://example.com/users/nutria",
+            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)