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

message_edit: Extract function to remove duplicate users.

Browse Source 
This functions helps exclude users for which we don't need to
send `update` event.
This commit is contained in:
Aman Agrawal
2025-03-02 02:29:21 +00:00
committed by Tim Abbott
parent 411fd9c4fe
commit d9eedee017
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
zerver/actions/message_edit.py
View File

@@ -856,20 +856,28 @@ def do_update_message(
subscriptions = get_active_subscriptions_for_stream_id( subscriptions = get_active_subscriptions_for_stream_id(
message_edit_request.target_stream.id, include_deactivated_users=False message_edit_request.target_stream.id, include_deactivated_users=False
) )
# We exclude long-term idle users, since they by
# definition have no active clients.
subscriptions = subscriptions.exclude(user_profile__long_term_idle=True)
# Remove duplicates by excluding the id of users already
# in users_to_be_notified list. This is the case where a
# 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 unmodified_user_messages]
)
def exclude_duplicates_from_subscription(
subs: QuerySet[Subscription],
) -> QuerySet[Subscription]:
# We exclude long-term idle users, since they by
# definition have no active clients.
subs = subs.exclude(user_profile__long_term_idle=True)
# Remove duplicates by excluding the id of users already
# in users_to_be_notified list. This is the case where a
# user both has a UserMessage row and is a current
# Subscriber
subs = subs.exclude(
user_profile_id__in=[um.user_profile_id for um in unmodified_user_messages]
)
if message_edit_request.is_stream_edited:
subs = subs.exclude(user_profile__in=users_losing_access)
return subs
subscriptions = exclude_duplicates_from_subscription(subscriptions)
if message_edit_request.is_stream_edited: if message_edit_request.is_stream_edited:
subscriptions = subscriptions.exclude(user_profile__in=users_losing_access)
# TODO: Guest users don't see the new moved topic # TODO: Guest users don't see the new moved topic
# unless breadcrumb message for new stream is # unless breadcrumb message for new stream is
# enabled. Excluding these users from receiving this # enabled. Excluding these users from receiving this