paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-07 15:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Split out public/private logic for peer events.

Browse Source 
This doesn't change anything yet, but the goal is
to eventually optimize events for the case where
one user (typically a new user) gets subscribed
to multiple public streams.
This commit is contained in:
Steve Howell
2020-10-19 20:40:25 +00:00
committed by Tim Abbott
parent 3961e69381
commit 363e5d31a6
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
zerver/lib/actions.py
View File

@@ -2945,12 +2945,13 @@ def send_peer_subscriber_events(
assert op in ["peer_add", "peer_remove"] assert op in ["peer_add", "peer_remove"]
for stream_id, altered_user_ids in altered_user_dict.items(): private_stream_ids = [
stream = stream_dict[stream_id] stream_id for stream_id in altered_user_dict
if stream_dict[stream_id].invite_only
if stream.is_in_zephyr_realm and not stream.invite_only: ]
continue
for stream_id in private_stream_ids:
altered_user_ids = altered_user_dict[stream_id]
peer_user_ids = peer_id_dict[stream_id] - altered_user_ids peer_user_ids = peer_id_dict[stream_id] - altered_user_ids
if peer_user_ids: if peer_user_ids:
@@ -2958,7 +2959,27 @@ def send_peer_subscriber_events(
event = dict( event = dict(
type="subscription", type="subscription",
op=op, op=op,
stream_id=stream.id, stream_id=stream_id,
user_id=new_user_id,
)
send_event(realm, event, peer_user_ids)
public_stream_ids = [
stream_id for stream_id in altered_user_dict
if not stream_dict[stream_id].invite_only
and not stream_dict[stream_id].is_in_zephyr_realm
]
for stream_id in public_stream_ids:
altered_user_ids = altered_user_dict[stream_id]
peer_user_ids = peer_id_dict[stream_id] - altered_user_ids
if peer_user_ids:
for new_user_id in altered_user_ids:
event = dict(
type="subscription",
op=op,
stream_id=stream_id,
user_id=new_user_id, user_id=new_user_id,
) )
send_event(realm, event, peer_user_ids) send_event(realm, event, peer_user_ids)