paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-30 19:43:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

digest: Don't send emails to deactivated users, even if queued.

Browse Source
This commit is contained in:
Mateusz Mandera
2022-04-15 22:47:51 +02:00
committed by Tim Abbott
parent 7a13836d26
commit fcf82bf047
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/digest.py
View File

@@ -348,7 +348,11 @@ def get_digest_context(user: UserProfile, cutoff: float) -> Dict[str, Any]:
def bulk_handle_digest_email(user_ids: List[int], cutoff: float) -> None:
# We go directly to the database to get user objects,
# since inactive users are likely to not be in the cache.
users = UserProfile.objects.filter(id__in=user_ids).order_by("id").select_related("realm")
users = (
UserProfile.objects.filter(id__in=user_ids, is_active=True, realm__deactivated=False)
.order_by("id")
.select_related("realm")
)
context_map = bulk_get_digest_context(users, cutoff)
digest_users = []