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

Send user_ids for update events.

Browse Source 
Here we handle a few flavors of realm_bot/update
and realm_user/update.  (Different events send different
attributes.)
This commit is contained in:
Steve Howell
2016-10-25 20:18:50 -07:00
committed by Tim Abbott
parent 3fd7ab950a
commit 768a04d2fa
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
zerver/lib/actions.py
View File

@@ -1680,6 +1680,7 @@ def do_change_full_name(user_profile, full_name, log=True):
'full_name': full_name}) 'full_name': full_name})
payload = dict(email=user_profile.email, payload = dict(email=user_profile.email,
user_id=user_profile.id,
full_name=user_profile.full_name) full_name=user_profile.full_name)
send_event(dict(type='realm_user', op='update', person=payload), send_event(dict(type='realm_user', op='update', person=payload),
active_user_ids(user_profile.realm)) active_user_ids(user_profile.realm))
@@ -1709,7 +1710,9 @@ def do_regenerate_api_key(user_profile, log=True):
send_event(dict(type='realm_bot', send_event(dict(type='realm_bot',
op='update', op='update',
bot=dict(email=user_profile.email, bot=dict(email=user_profile.email,
api_key=user_profile.api_key,)), user_id=user_profile.id,
api_key=user_profile.api_key,
)),
bot_owner_userids(user_profile)) bot_owner_userids(user_profile))
def do_change_avatar_source(user_profile, avatar_source, log=True): def do_change_avatar_source(user_profile, avatar_source, log=True):
@@ -1726,13 +1729,15 @@ def do_change_avatar_source(user_profile, avatar_source, log=True):
send_event(dict(type='realm_bot', send_event(dict(type='realm_bot',
op='update', op='update',
bot=dict(email=user_profile.email, bot=dict(email=user_profile.email,
avatar_url=avatar_url(user_profile),)), user_id=user_profile.id,
avatar_url=avatar_url(user_profile),
)),
bot_owner_userids(user_profile)) bot_owner_userids(user_profile))
else: else:
payload = dict( payload = dict(
email=user_profile.email, email=user_profile.email,
avatar_url=avatar_url(user_profile), avatar_url=avatar_url(user_profile),
id=user_profile.id user_id=user_profile.id
) )
send_event(dict(type='realm_user', send_event(dict(type='realm_user',
@@ -1769,7 +1774,9 @@ def do_change_default_sending_stream(user_profile, stream, log=True):
send_event(dict(type='realm_bot', send_event(dict(type='realm_bot',
op='update', op='update',
bot=dict(email=user_profile.email, bot=dict(email=user_profile.email,
default_sending_stream=stream_name,)), user_id=user_profile.id,
default_sending_stream=stream_name,
)),
bot_owner_userids(user_profile)) bot_owner_userids(user_profile))
def do_change_default_events_register_stream(user_profile, stream, log=True): def do_change_default_events_register_stream(user_profile, stream, log=True):
@@ -1790,7 +1797,9 @@ def do_change_default_events_register_stream(user_profile, stream, log=True):
send_event(dict(type='realm_bot', send_event(dict(type='realm_bot',
op='update', op='update',
bot=dict(email=user_profile.email, bot=dict(email=user_profile.email,
default_events_register_stream=stream_name,)), user_id=user_profile.id,
default_events_register_stream=stream_name,
)),
bot_owner_userids(user_profile)) bot_owner_userids(user_profile))
def do_change_default_all_public_streams(user_profile, value, log=True): def do_change_default_all_public_streams(user_profile, value, log=True):
@@ -1805,7 +1814,9 @@ def do_change_default_all_public_streams(user_profile, value, log=True):
send_event(dict(type='realm_bot', send_event(dict(type='realm_bot',
op='update', op='update',
bot=dict(email=user_profile.email, bot=dict(email=user_profile.email,
default_all_public_streams=user_profile.default_all_public_streams,)), user_id=user_profile.id,
default_all_public_streams=user_profile.default_all_public_streams,
)),
bot_owner_userids(user_profile)) bot_owner_userids(user_profile))
def do_change_is_admin(user_profile, value, permission='administer'): def do_change_is_admin(user_profile, value, permission='administer'):

1
zerver/tests/test_events.py
View File

@@ -222,6 +222,7 @@ class EventsRegisterTest(ZulipTestCase):
('op', equals('update')), ('op', equals('update')),
('bot', check_dict([ ('bot', check_dict([
('email', check_string), ('email', check_string),
('user_id', check_int),
(field_name, check), (field_name, check),
])), ])),
]) ])