Merge pull request #2498 from bookwyrm-social/use-reactivate

Use user.reactivate when a user confirms their email address
bookwyrm-social · Dec 11, 2022 · a9846e7 · a9846e7
2 parents 734fb5a + 50a42dc
commit a9846e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
@@ -390,7 +390,10 @@ def reactivate(self):
         self.is_active = True
         self.deactivation_reason = None
         self.allow_reactivation = False
-        super().save(broadcast=False)
+        super().save(
+            broadcast=False,
+            update_fields=["deactivation_reason", "is_active", "allow_reactivation"],
+        )
 
     @property
     def local_path(self):

diff --git a/bookwyrm/views/landing/register.py b/bookwyrm/views/landing/register.py
@@ -105,9 +105,7 @@ def get(self, request, code):  # pylint: disable=unused-argument
                 request, "confirm_email/confirm_email.html", {"valid": False}
             )
         # update the user
-        user.is_active = True
-        user.deactivation_reason = None
-        user.save(broadcast=False, update_fields=["is_active", "deactivation_reason"])
+        user.reactivate()
         # direct the user to log in
         return redirect("login", confirmed="confirmed")