Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix several bugs when register() applies events 

(imported from commit 5cd284c59022700de5c5d12182d2056366bf8617)
This commit is contained in:
Zev Benjamin 2013-04-01 15:35:22 -04:00
parent b5c2002f62
commit 6cee57b356
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zephyr/lib/actions.py
View File

@ -778,21 +778,21 @@ def do_events_register(user_profile, apply_markdown=True, event_types=None):
ret['pointer'] = max(ret['pointer'], event['pointer']) ret['pointer'] = max(ret['pointer'], event['pointer'])
elif event['type'] == "realm_user": elif event['type'] == "realm_user":
if event['op'] == "add": if event['op'] == "add":
ret['realm_users'].append(simplejson.loads(event['person'])) ret['realm_users'].append(event['person'])
elif event['op'] == "remove": elif event['op'] == "remove":
person = simplejson.loads(event['person']) person = event['person']
ret['realm_users'] = filter(lambda p: p['email'] != person['email'], ret['realm_users'] = filter(lambda p: p['email'] != person['email'],
ret['realm_users']) ret['realm_users'])
elif event['type'] == "subscription": elif event['type'] == "subscription":
if event['op'] == "add": if event['op'] == "add":
ret['subscriptions'].append(simplejson.loads(event['subscription'])) ret['subscriptions'].append(event['subscription'])
elif event['op'] == "remove": elif event['op'] == "remove":
sub = simplejson.loads(event['subscription']) sub = event['subscription']
ret['subscriptions'] = filter(lambda s: s['name'] != sub['name'], ret['subscriptions'] = filter(lambda s: s['name'] != sub['name'],
ret['subscriptions']) ret['subscriptions'])
if events: if events:
ret['last_event_id'] = events[-1:]['id'] ret['last_event_id'] = events[-1]['id']
else: else:
ret['last_event_id'] = -1 ret['last_event_id'] = -1