paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 20:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

narrow: Extract function to modify narrow before filtering messages.

Browse Source
This commit is contained in:
Aman Agrawal
2025-01-08 21:16:02 +05:30
committed by Tim Abbott
parent 43f42364ff
commit f7e02c51d2
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zerver/lib/narrow.py
View File

@@ -1372,6 +1372,16 @@ def post_process_limited_query(
) )
def clean_narrow_for_message_fetch(
narrow: list[NarrowParameter] | None,
realm: Realm,
maybe_user_profile: UserProfile | AnonymousUser,
) -> list[NarrowParameter] | None:
narrow = update_narrow_terms_containing_empty_topic_fallback_name(narrow)
narrow = update_narrow_terms_containing_with_operator(realm, maybe_user_profile, narrow)
return narrow
@dataclass @dataclass
class FetchedMessages(LimitedMessages[Row]): class FetchedMessages(LimitedMessages[Row]):
anchor: int | None anchor: int | None

5
zerver/views/message_fetch.py
View File

@@ -21,12 +21,12 @@ from zerver.lib.message import get_first_visible_message_id, messages_for_ids
from zerver.lib.narrow import ( from zerver.lib.narrow import (
NarrowParameter, NarrowParameter,
add_narrow_conditions, add_narrow_conditions,
clean_narrow_for_message_fetch,
fetch_messages, fetch_messages,
is_spectator_compatible, is_spectator_compatible,
is_web_public_narrow, is_web_public_narrow,
parse_anchor_value, parse_anchor_value,
update_narrow_terms_containing_empty_topic_fallback_name, update_narrow_terms_containing_empty_topic_fallback_name,
update_narrow_terms_containing_with_operator,
) )
from zerver.lib.request import RequestNotes from zerver.lib.request import RequestNotes
from zerver.lib.response import json_success from zerver.lib.response import json_success
@@ -146,8 +146,7 @@ def get_messages_backend(
anchor = parse_anchor_value(anchor_val, use_first_unread_anchor_val) anchor = parse_anchor_value(anchor_val, use_first_unread_anchor_val)
realm = get_valid_realm_from_request(request) realm = get_valid_realm_from_request(request)
narrow = update_narrow_terms_containing_empty_topic_fallback_name(narrow) narrow = clean_narrow_for_message_fetch(narrow, realm, maybe_user_profile)
narrow = update_narrow_terms_containing_with_operator(realm, maybe_user_profile, narrow)
num_of_messages_requested = num_before + num_after num_of_messages_requested = num_before + num_after
if client_requested_message_ids is not None: if client_requested_message_ids is not None: