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

message_edit: Clean up comments around moving topics.

Browse Source
This commit is contained in:
Tim Abbott
2020-07-01 14:47:55 -07:00
parent 03cf3edf42
commit c6638a62dc
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
zerver/lib/actions.py
View File

@@ -4562,8 +4562,11 @@ def do_update_message(user_profile: UserProfile, message: Message,
if sub.user_profile_id not in new_stream_sub_ids if sub.user_profile_id not in new_stream_sub_ids
] ]
# Users who can longer access the message without some action # Users who can longer access the message without some action
# from admins. # from administrators.
# TODO: Extend for case when new stream is private. #
# TODO: Extend this list to also contain users losing access
# due to the messages moving to a private stream they are not
# subscribed to.
subs_losing_access = [ subs_losing_access = [
sub for sub in subs_losing_usermessages sub for sub in subs_losing_usermessages
if sub.user_profile.is_guest if sub.user_profile.is_guest
@@ -4654,27 +4657,35 @@ def do_update_message(user_profile: UserProfile, message: Message,
if stream_being_edited is not None: if stream_being_edited is not None:
if stream_being_edited.is_history_public_to_subscribers: if stream_being_edited.is_history_public_to_subscribers:
subscribers = get_active_subscriptions_for_stream_id(stream_id) subscribers = get_active_subscriptions_for_stream_id(stream_id)
# We exclude long-term idle users, since they by definition have no active clients. # We exclude long-term idle users, since they by
# definition have no active clients.
subscribers = subscribers.exclude(user_profile__long_term_idle=True) subscribers = subscribers.exclude(user_profile__long_term_idle=True)
# Remove duplicates by excluding the id of users already in users_to_be_notified list. # Remove duplicates by excluding the id of users already
# This is the case where a user both has a UserMessage row and is a current Subscriber # in users_to_be_notified list. This is the case where a
# user both has a UserMessage row and is a current
# Subscriber
subscribers = subscribers.exclude(user_profile_id__in=[um.user_profile_id for um in ums]) subscribers = subscribers.exclude(user_profile_id__in=[um.user_profile_id for um in ums])
if new_stream is not None: if new_stream is not None:
assert delete_event_notify_user_ids is not None assert delete_event_notify_user_ids is not None
subscribers = subscribers.exclude(user_profile_id__in=delete_event_notify_user_ids) subscribers = subscribers.exclude(user_profile_id__in=delete_event_notify_user_ids)
# All users that are subscribed to the stream must be notified when a message is edited # All users that are subscribed to the stream must be
# notified when a message is edited
subscriber_ids = [user.user_profile_id for user in subscribers] subscriber_ids = [user.user_profile_id for user in subscribers]
if new_stream is not None: if new_stream is not None:
# TODO: Guest users don't see the new moved topic unless breadcrumb message for # TODO: Guest users don't see the new moved topic
# new stream is enabled. Excluding these users from receiving this event helps # unless breadcrumb message for new stream is
# us avoid a error trackeback for our clients. We should figure out a way to # enabled. Excluding these users from receiving this
# inform the guest users of this new topic if sending a 'message' event for these messages # event helps us avoid a error trackeback for our
# is not an option. # clients. We should figure out a way to inform the
# Don't send this event to guest subs who are not subscrbied to the old stream but # guest users of this new topic if sending a 'message'
# are subscribed to the new stream # event for these messages is not an option.
#
# Don't send this event to guest subs who are not
# subscribers of the old stream but are subscribed to
# the new stream; clients will be confused.
old_stream_unsubbed_guests = [ old_stream_unsubbed_guests = [
sub for sub in subs_to_new_stream sub for sub in subs_to_new_stream
if sub.user_profile.is_guest if sub.user_profile.is_guest