send_custom_email: Only send emails to active remote servers.

zulip · Jan 21, 2022 · 091e822 · 091e822
1 parent 756dec3
commit 091e822
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/zerver/management/commands/send_custom_email.py b/zerver/management/commands/send_custom_email.py
@@ -90,10 +90,12 @@ def handle(self, *args: Any, **options: str) -> None:
         elif options["remote_servers"]:
             from zilencer.models import RemoteZulipServer
 
-            # TODO: Make this filter for deactivated=False once we add
-            # that to the data model.
             target_emails = list(
-                set(RemoteZulipServer.objects.all().values_list("contact_email", flat=True))
+                set(
+                    RemoteZulipServer.objects.filter(deactivated=False).values_list(
+                        "contact_email", flat=True
+                    )
+                )
             )
         elif options["all_sponsored_org_admins"]:
             # Sends at most one copy to each email address, even if it