paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-14 19:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change receive_is_idle to take a user_profile_id.

Browse Source 
(imported from commit 4cb4c8c61bc7e1308a9a3d9264990c28dc08fec5)
This commit is contained in:
Tim Abbott
2014-01-09 15:55:24 -05:00
parent e38ac2f9ac
commit cbc655bd4d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zerver/tornado_callbacks.py
View File

@@ -98,10 +98,10 @@ def cache_load_message_data(message_id, users):
return message, user_profiles return message, user_profiles
def receiver_is_idle(user_profile, realm_presences): def receiver_is_idle(user_profile_id, realm_presences):
# If a user has no message-receiving event queues, they've got no open zulip # If a user has no message-receiving event queues, they've got no open zulip
# session so we notify them # session so we notify them
all_client_descriptors = get_client_descriptors_for_user(user_profile.id) all_client_descriptors = get_client_descriptors_for_user(user_profile_id)
message_event_queues = [client for client in all_client_descriptors if client.accepts_messages()] message_event_queues = [client for client in all_client_descriptors if client.accepts_messages()]
off_zulip = len(message_event_queues) == 0 off_zulip = len(message_event_queues) == 0
@@ -109,12 +109,12 @@ def receiver_is_idle(user_profile, realm_presences):
# presence information in this case (and it's hard to get without an additional # presence information in this case (and it's hard to get without an additional
# db query) so we simply don't try to guess if this cross-realm recipient # db query) so we simply don't try to guess if this cross-realm recipient
# has been idle for too long # has been idle for too long
if realm_presences is None or not user_profile.id in realm_presences: if realm_presences is None or not user_profile_id in realm_presences:
return off_zulip return off_zulip
# If the most recent online status from a user is >1hr in the past, we notify # If the most recent online status from a user is >1hr in the past, we notify
# them regardless of whether or not they have an open window # them regardless of whether or not they have an open window
user_presence = realm_presences[user_profile.id] user_presence = realm_presences[user_profile_id]
idle_too_long = False idle_too_long = False
newest = None newest = None
for client, status in user_presence.iteritems(): for client, status in user_presence.iteritems():
@@ -165,7 +165,7 @@ def process_new_message(data):
received_pm = message.recipient.type in (Recipient.PERSONAL, Recipient.HUDDLE) and \ received_pm = message.recipient.type in (Recipient.PERSONAL, Recipient.HUDDLE) and \
user_profile_id != message.sender.id user_profile_id != message.sender.id
mentioned = 'mentioned' in flags mentioned = 'mentioned' in flags
if (received_pm or mentioned) and receiver_is_idle(user_profile, realm_presences): if (received_pm or mentioned) and receiver_is_idle(user_profile_id, realm_presences):
event = build_offline_notification_event(user_profile_id, message.id) event = build_offline_notification_event(user_profile_id, message.id)
# We require RabbitMQ to do this, as we can't call the email handler # We require RabbitMQ to do this, as we can't call the email handler