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

peer_remove: Send user_id, not email, for unsubscribe events.

Browse Source
This commit is contained in:
Steve Howell
2016-11-08 06:04:18 -08:00
committed by Tim Abbott
parent 61625ce51e
commit a03a7d4c95
5 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/actions.py
View File

@@ -1614,7 +1614,7 @@ def bulk_remove_subscriptions(users, streams):
event = dict(type="subscription",
op="peer_remove",
subscriptions=[stream.name],
user_email=removed_user.email)
user_id=removed_user.id)
send_event(event, peer_user_ids)
return ([(sub.user_profile, stream) for (sub, stream) in subs_to_deactivate],
@@ -3059,7 +3059,7 @@ def apply_events(state, events, user_profile):
user_id not in sub['subscribers']):
sub['subscribers'].append(user_id)
elif event['op'] == 'peer_remove':
user_id = get_user_profile_by_email(event['user_email']).id
user_id = event['user_id']
for sub in state['subscriptions']:
if (sub['name'] in event['subscriptions'] and
user_id in sub['subscribers']):