From 33f483757086e2576f04aec237c596bc4513be67 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Thu, 8 Aug 2013 16:28:05 -0400 Subject: [PATCH] Only count message queues when determining whether to deliver missed message emails (imported from commit 5a302489f3bcb19e2824452a0d3c1330e483af7f) --- zerver/tornado_callbacks.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zerver/tornado_callbacks.py b/zerver/tornado_callbacks.py index 99237458d0..7ee7daffc1 100644 --- a/zerver/tornado_callbacks.py +++ b/zerver/tornado_callbacks.py @@ -312,7 +312,9 @@ def process_new_message(data): received_pm = message.recipient.type in (Recipient.PERSONAL, Recipient.HUDDLE) and \ user_profile_id != message.sender.id mentioned = 'mentioned' in flags - idle = len(get_client_descriptors_for_user(user_profile_id)) == 0 + all_client_descriptors = get_client_descriptors_for_user(user_profile_id) + message_event_queues = [client for client in all_client_descriptors if client.accepts_event_type('message')] + idle = len(message_event_queues) == 0 if (received_pm or mentioned) and idle: if receives_offline_notifications(user_profile_id): event = build_offline_notification_event(user_profile_id, message.id)