From fc679b09a32e7a61a48870bc1dfbdb90a04083d0 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Thu, 20 Apr 2023 17:28:56 -0700 Subject: [PATCH] message_edit: Clarify unmodified_user_messages logic. --- zerver/actions/message_edit.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/zerver/actions/message_edit.py b/zerver/actions/message_edit.py index 06d53631ee..9b6f310300 100644 --- a/zerver/actions/message_edit.py +++ b/zerver/actions/message_edit.py @@ -597,7 +597,7 @@ def do_update_message( ] losing_access_user_ids = [sub.user_profile_id for sub in subs_losing_access] - ums = ums.exclude( + unmodified_user_messages = ums.exclude( user_profile_id__in=[sub.user_profile_id for sub in subs_losing_usermessages] ) @@ -610,6 +610,10 @@ def do_update_message( gaining_usermessage_user_ids += [ user_id for user_id in new_stream_user_ids if user_id not in old_stream_user_ids ] + else: + # If we're not moving the topic to another stream, we don't + # modify the original set of UserMessage objects queried. + unmodified_user_messages = ums # We save the full topic name so that checks that require comparison # between the original topic and the topic name passed into this function @@ -760,7 +764,7 @@ def do_update_message( # in the organization (too expansive, and also not what we do for # newly sent messages anyway) and having magical live-updates # where possible. - users_to_be_notified = list(map(user_info, ums)) + users_to_be_notified = list(map(user_info, unmodified_user_messages)) if stream_being_edited is not None and stream_being_edited.is_history_public_to_subscribers(): subscriptions = get_active_subscriptions_for_stream_id( stream_id, include_deactivated_users=False @@ -773,7 +777,7 @@ def do_update_message( # user both has a UserMessage row and is a current # Subscriber subscriptions = subscriptions.exclude( - user_profile_id__in=[um.user_profile_id for um in ums] + user_profile_id__in=[um.user_profile_id for um in unmodified_user_messages] ) if new_stream is not None: