CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-15 21:03:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix apply_events for subscription events to actually match.

Browse Source 
Since we changed the initial subscription data to include
user_profile_ids rather than emails, we need to preserve that when
adding in events generated during the page load.

(imported from commit 4f4071b8ba30e57c6f64c9e7b54c1cc754e8f010)
This commit is contained in:
Tim Abbott 2013-12-10 16:50:36 -05:00
parent 8af0fae335
commit a3d67a7fe7
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zerver/lib/actions.py
View File

@ -799,6 +799,7 @@ def notify_subscriptions_added(user_profile, sub_pairs, stream_emails, no_log=Fa
invite_only=stream.invite_only,
color=subscription.color,
email_address=encode_email_address(stream),
notifications=subscription.notifications,
subscribers=stream_emails(stream))
for (subscription, stream) in sub_pairs]
notice = dict(event=dict(type="subscriptions", op="add",
@ -1738,6 +1739,11 @@ def apply_events(state, events):
if event['op'] == "add" or event['op'] == "update":
state['realm_users'].append(event['person'])
elif event['type'] == "subscriptions":
if event['op'] in ["add"]:
# Convert the user_profile IDs to emails since that's what register() returns
# TODO: Clean up this situation
for item in event["subscriptions"]:
item["subscribers"] = [get_user_profile_by_email(email).id for email in item["subscribers"]]
if event['op'] in ["add", "remove"]:
subscriptions_to_filter = set(sub['name'].lower() for sub in event["subscriptions"])
# We add the new subscriptions to the list of streams the
@ -1760,15 +1766,17 @@ def apply_events(state, events):
if sub['name'].lower() == event['name'].lower():
sub[event['property']] = event['value']
elif event['op'] == 'peer_add':
user_id = get_user_profile_by_email(event['user_email']).id
for sub in state['subscriptions']:
if (sub['name'] in event['subscriptions'] and
event['user_email'] not in sub['subscribers']):
sub['subscribers'].append(event['user_email'])
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
for sub in state['subscriptions']:
if (sub['name'] in event['subscriptions'] and
event['user_email'] in sub['subscribers']):
sub['subscribers'].remove(event['user_email'])
user_id in sub['subscribers']):
sub['subscribers'].remove(user_id)
elif event['type'] == "presence":
state['presences'][event['email']] = event['presence']
elif event['type'] == "update_message":