Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

message_cache: Remove unused wide_dict parameters.

Aman Agrawalea2e6d7c93a2
diff --git a/zerver/lib/cache.py b/zerver/lib/cache.py
index a33c12db655..0ab3831a335 100644
--- a/zerver/lib/cache.py
+++ b/zerver/lib/cache.py
@@ -789,7 +789,7 @@ def to_dict_cache_key_id(message_id: int) -> str:
return f"message_dict:{message_id}"
-def to_dict_cache_key(message: "Message", realm_id: int | None = None) -> str:
+def to_dict_cache_key(message: "Message") -> str:
return to_dict_cache_key_id(message.id)
diff --git a/zerver/lib/message_cache.py b/zerver/lib/message_cache.py
index aefaa43b8ca..7dc7f8ef09b 100644
--- a/zerver/lib/message_cache.py
+++ b/zerver/lib/message_cache.py
@@ -71,8 +71,8 @@ def stringify_message_dict(message_dict: dict[str, Any]) -> bytes:
@cache_with_key(to_dict_cache_key, timeout=3600 * 24, pickled_tupled=False)
-def message_to_encoded_cache(message: Message, realm_id: int | None = None) -> bytes:
- return MessageDict.messages_to_encoded_cache([message], realm_id)[message.id]
+def message_to_encoded_cache(message: Message) -> bytes:
+ return MessageDict.messages_to_encoded_cache([message])[message.id]
def update_message_cache(
@@ -132,25 +132,17 @@ class MessageDict:
"""
@staticmethod
- def wide_dict(
- message: Message,
- realm_id: int | None = None,
- *,
- dm_involved_user_ids: set[int] | None = None,
- ) -> dict[str, Any]:
+ def wide_dict(message: Message) -> dict[str, Any]:
"""
The next two lines get the cacheable field related
to our message object, with the side effect of
populating the cache.
"""
- encoded_object_bytes = message_to_encoded_cache(message, realm_id)
+ encoded_object_bytes = message_to_encoded_cache(message)
obj = extract_message_dict(encoded_object_bytes)
MessageDict.bulk_hydrate_sender_info([obj])
- MessageDict.bulk_hydrate_recipient_info(
- [obj],
- {} if dm_involved_user_ids is None else {obj["recipient_id"]: dm_involved_user_ids},
- )
+ MessageDict.bulk_hydrate_recipient_info([obj])
return obj