paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-12 18:06:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

create_user: Fix initial unreads ignoring private streams.

Browse Source 
This logic was apparently missed when we implemented private streams
with shared history; the correct check is to look at whether the user
can access message history in the stream, which used to be equivalent
to whether it's a private stream.
This commit is contained in:
Tim Abbott
2024-02-09 11:59:56 -08:00
parent de77521d1a
commit 9efce0b16c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/actions/create_user.py
View File

@@ -24,6 +24,7 @@ from zerver.lib.mention import silent_mention_syntax_for_user
from zerver.lib.remote_server import maybe_enqueue_audit_log_upload from zerver.lib.remote_server import maybe_enqueue_audit_log_upload
from zerver.lib.send_email import clear_scheduled_invitation_emails from zerver.lib.send_email import clear_scheduled_invitation_emails
from zerver.lib.stream_subscription import bulk_get_subscriber_peer_info from zerver.lib.stream_subscription import bulk_get_subscriber_peer_info
from zerver.lib.streams import can_access_stream_history
from zerver.lib.user_counts import realm_user_count, realm_user_count_by_role from zerver.lib.user_counts import realm_user_count, realm_user_count_by_role
from zerver.lib.user_groups import get_system_user_group_for_user from zerver.lib.user_groups import get_system_user_group_for_user
from zerver.lib.users import ( from zerver.lib.users import (
@@ -178,9 +179,14 @@ def add_new_user_history(user_profile: UserProfile, streams: Iterable[Stream]) -
Mark the very most recent messages as unread. Mark the very most recent messages as unread.
""" """
# Find recipient ids for the user's streams that were passed to us. # Find recipient ids for the the user's streams, limiting to just
# (Only look at public streams.) # those where we can access the streams' full history.
recipient_ids = [stream.recipient_id for stream in streams if not stream.invite_only] #
# TODO: This will do database queries in a loop if many private
# streams are involved.
recipient_ids = [
stream.recipient_id for stream in streams if can_access_stream_history(user_profile, stream)
]
# Start by finding recent messages matching those recipients. # Start by finding recent messages matching those recipients.
cutoff_date = timezone_now() - ONBOARDING_RECENT_TIMEDELTA cutoff_date = timezone_now() - ONBOARDING_RECENT_TIMEDELTA