Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

message_fetch: Rename message_ids variable for clarity. 

Added `result_` prefix to differentiate it from upcoming `message_ids`
parameter to the API request. Also, this is final `message_ids` that
we will fetch the messages for. So, a `result` prefix makes sense here.
This commit is contained in:
Aman Agrawal 2024-10-01 13:09:20 +00:00 committed by Tim Abbott
parent 334a195627
commit 57589bcffa
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zerver/views/message_fetch.py
View File

@ -226,25 +226,25 @@ def get_messages_backend(
# rendered message dict before returning it. We attempt to # rendered message dict before returning it. We attempt to
# bulk-fetch rendered message dicts from remote cache using the # bulk-fetch rendered message dicts from remote cache using the
# 'messages' list. # 'messages' list.
message_ids: list[int] = [] result_message_ids: list[int] = []
user_message_flags: dict[int, list[str]] = {} user_message_flags: dict[int, list[str]] = {}
if is_web_public_query: if is_web_public_query:
# For spectators, we treat all historical messages as read. # For spectators, we treat all historical messages as read.
for row in rows: for row in rows:
message_id = row[0] message_id = row[0]
message_ids.append(message_id) result_message_ids.append(message_id)
user_message_flags[message_id] = ["read"] user_message_flags[message_id] = ["read"]
elif include_history: elif include_history:
assert user_profile is not None assert user_profile is not None
message_ids = [row[0] for row in rows] result_message_ids = [row[0] for row in rows]
# TODO: This could be done with an outer join instead of two queries # TODO: This could be done with an outer join instead of two queries
um_rows = UserMessage.objects.filter( um_rows = UserMessage.objects.filter(
user_profile=user_profile, message_id__in=message_ids user_profile=user_profile, message_id__in=result_message_ids
) )
user_message_flags = {um.message_id: um.flags_list() for um in um_rows} user_message_flags = {um.message_id: um.flags_list() for um in um_rows}
for message_id in message_ids: for message_id in result_message_ids:
if message_id not in user_message_flags: if message_id not in user_message_flags:
user_message_flags[message_id] = ["read", "historical"] user_message_flags[message_id] = ["read", "historical"]
else: else:
@ -252,7 +252,7 @@ def get_messages_backend(
message_id = row[0] message_id = row[0]
flags = row[1] flags = row[1]
user_message_flags[message_id] = UserMessage.flags_list_for_flags(flags) user_message_flags[message_id] = UserMessage.flags_list_for_flags(flags)
message_ids.append(message_id) result_message_ids.append(message_id)
search_fields: dict[int, dict[str, str]] = {} search_fields: dict[int, dict[str, str]] = {}
if is_search: if is_search:
@ -264,7 +264,7 @@ def get_messages_backend(
) )
message_list = messages_for_ids( message_list = messages_for_ids(
message_ids=message_ids, message_ids=result_message_ids,
user_message_flags=user_message_flags, user_message_flags=user_message_flags,
search_fields=search_fields, search_fields=search_fields,
apply_markdown=apply_markdown, apply_markdown=apply_markdown,