From a97403c465e23885fec611629f3acef911bdf0fe Mon Sep 17 00:00:00 2001
From: zerolab <dan@zerolab.org>
Date: Mon, 20 Nov 2023 15:47:41 +0000
Subject: [PATCH] Fix `get_valid_recipients` and `get_recipient_users`
 returning None

---
 wagtail/admin/mail.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/wagtail/admin/mail.py b/wagtail/admin/mail.py
index 05c48c14f9..02df14a1b6 100644
--- a/wagtail/admin/mail.py
+++ b/wagtail/admin/mail.py
@@ -228,7 +228,8 @@ class EmailNotificationMixin:
         return {
             recipient
             for recipient in self.get_recipient_users(instance, **kwargs)
-            if recipient.is_active
+            if recipient
+            and recipient.is_active
             and recipient.email
             and getattr(
                 UserProfile.get_for_user(recipient),
@@ -312,7 +313,7 @@ class BaseWorkflowStateEmailNotifier(EmailNotificationMixin, Notifier):
     def __init__(self):
         super().__init__((WorkflowState,))
 
-    def get_context(self, workflow_state, **kwargs):
+    def get_context(self, workflow_state: WorkflowState, **kwargs):
         context = super().get_context(workflow_state, **kwargs)
         context["workflow"] = workflow_state.workflow
         context["object"] = workflow_state.content_object
@@ -327,11 +328,11 @@ class WorkflowStateApprovalEmailNotifier(BaseWorkflowStateEmailNotifier):
 
     notification = "approved"
 
-    def get_recipient_users(self, workflow_state, **kwargs):
+    def get_recipient_users(self, workflow_state: WorkflowState, **kwargs):
         triggering_user = kwargs.get("user", None)
         recipients = set()
         requested_by = workflow_state.requested_by
-        if requested_by != triggering_user:
+        if requested_by is not None and requested_by != triggering_user:
             recipients = {requested_by}
 
         return recipients
@@ -342,11 +343,11 @@ class WorkflowStateRejectionEmailNotifier(BaseWorkflowStateEmailNotifier):
 
     notification = "rejected"
 
-    def get_recipient_users(self, workflow_state, **kwargs):
+    def get_recipient_users(self, workflow_state: WorkflowState, **kwargs):
         triggering_user = kwargs.get("user", None)
         recipients = set()
         requested_by = workflow_state.requested_by
-        if requested_by != triggering_user:
+        if requested_by is not None and requested_by != triggering_user:
             recipients = {requested_by}
 
         return recipients
@@ -365,7 +366,7 @@ class WorkflowStateSubmissionEmailNotifier(BaseWorkflowStateEmailNotifier):
 
     notification = "submitted"
 
-    def get_recipient_users(self, workflow_state, **kwargs):
+    def get_recipient_users(self, workflow_state: WorkflowState, **kwargs):
         triggering_user = kwargs.get("user", None)
         recipients = get_user_model().objects.none()
         include_superusers = getattr(
@@ -406,7 +407,7 @@ class BaseGroupApprovalTaskStateEmailNotifier(EmailNotificationMixin, Notifier):
             context["page"] = context["object"].specific
         return context
 
-    def get_recipient_users(self, task_state, **kwargs):
+    def get_recipient_users(self, task_state: TaskState, **kwargs):
         triggering_user = kwargs.get("user", None)
 
         group_members = get_user_model().objects.filter(