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

home: Send state_data in a separate object.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2024-02-12 17:56:26 -08:00
committed by Tim Abbott
parent b9e62c7af8
commit bf6978185d
4 changed files with 91 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
zerver/lib/home.py
View File

@@ -158,7 +158,7 @@ def build_page_params_for_home_page_load(
if user_profile is not None:
client = RequestNotes.get_notes(request).client
assert client is not None
register_ret = do_events_register(
state_data = do_events_register(
user_profile,
realm,
client,
@@ -169,12 +169,12 @@ def build_page_params_for_home_page_load(
narrow=narrow,
include_streams=False,
)
default_language = register_ret["user_settings"]["default_language"]
default_language = state_data["user_settings"]["default_language"]
else:
# The spectator client will be fetching the /register response
# for spectators via the API. But we still need to set the
# values not presence in that object.
register_ret = {
state_data = {
"queue_id": None,
}
default_language = realm.default_language
@@ -234,13 +234,12 @@ def build_page_params_for_home_page_load(
page_params["server_sentry_sample_rate"] = settings.SENTRY_FRONTEND_SAMPLE_RATE
page_params["server_sentry_trace_rate"] = settings.SENTRY_FRONTEND_TRACE_RATE
for field_name in register_ret:
page_params[field_name] = register_ret[field_name]
page_params["state_data"] = state_data
if narrow_stream is not None:
# In narrow_stream context, initial pointer is just latest message
recipient = narrow_stream.recipient
page_params["max_message_id"] = -1
state_data["max_message_id"] = -1
max_message = (
# Uses index: zerver_message_realm_recipient_id
Message.objects.filter(realm_id=realm.id, recipient=recipient)
@@ -249,15 +248,15 @@ def build_page_params_for_home_page_load(
.first()
)
if max_message:
page_params["max_message_id"] = max_message.id
state_data["max_message_id"] = max_message.id
page_params["narrow_stream"] = narrow_stream.name
if narrow_topic_name is not None:
page_params["narrow_topic"] = narrow_topic_name
page_params["narrow"] = [
dict(operator=term.operator, operand=term.operand) for term in narrow
]
assert isinstance(page_params["user_settings"], dict)
page_params["user_settings"]["enable_desktop_notifications"] = False
assert isinstance(state_data["user_settings"], dict)
state_data["user_settings"]["enable_desktop_notifications"] = False
page_params["translation_data"] = get_language_translation_data(request_language)
@@ -267,4 +266,4 @@ def build_page_params_for_home_page_load(
page_params["realm_rendered_description"] = get_realm_rendered_description(realm)
page_params["language_cookie_name"] = settings.LANGUAGE_COOKIE_NAME
return register_ret["queue_id"], page_params
return state_data["queue_id"], page_params