Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
message_cache: Remove checks for impossible None.
Anders Kaseorga6d43171fbca
diff --git a/zerver/lib/message_cache.py b/zerver/lib/message_cache.pyindex 53c3831c7e7..1f9791c0d58 100644--- a/zerver/lib/message_cache.py+++ b/zerver/lib/message_cache.py@@ -91,13 +91,10 @@ def update_message_cache(def save_message_rendered_content(message: Message, content: str) -> str:rendering_result = render_message_markdown(message, content, realm=message.get_realm())- rendered_content = None- if rendering_result is not None:- rendered_content = rendering_result.rendered_content- message.rendered_content = rendered_content+ message.rendered_content = rendering_result.rendered_contentmessage.rendered_content_version = markdown_versionmessage.save_rendered_content()- return rendered_content+ return rendering_result.rendered_contentclass ReactionDict:@@ -436,8 +433,10 @@ class MessageDict:edit_history: list[EditHistoryEvent] = orjson.loads(edit_history_json)obj["edit_history"] = edit_history- if Message.need_to_render_content(- rendered_content, rendered_content_version, markdown_version+ if (+ rendered_content is None+ or rendered_content_version is None+ or rendered_content_version < markdown_version):# We really shouldn't be rendering objects in this method, but there is# a scenario where we upgrade the version of Markdown and fail to run@@ -456,17 +455,9 @@ class MessageDict:# in some cases.rendered_content = save_message_rendered_content(message, content)- if rendered_content is not None:- obj["rendered_content"] = rendered_content- else:- obj["rendered_content"] = (- "<p>[Zulip note: Sorry, we could not understand the formatting of your message]</p>"- )+ obj["rendered_content"] = rendered_content- if rendered_content is not None:- obj["is_me_message"] = Message.is_status_message(content, rendered_content)- else:- obj["is_me_message"] = False+ obj["is_me_message"] = Message.is_status_message(content, rendered_content)obj["reactions"] = [ReactionDict.build_dict_from_raw_db_row(reaction) for reaction in reactionsdiff --git a/zerver/models/messages.py b/zerver/models/messages.pyindex 0206a4c87d7..64e1b68e275 100644--- a/zerver/models/messages.py+++ b/zerver/models/messages.py@@ -288,18 +288,6 @@ class Message(AbstractMessage):def save_rendered_content(self) -> None:self.save(update_fields=["rendered_content", "rendered_content_version"])- @staticmethod- def need_to_render_content(- rendered_content: str | None,- rendered_content_version: int | None,- markdown_version: int,- ) -> bool:- return (- rendered_content is None- or rendered_content_version is None- or rendered_content_version < markdown_version- )-@staticmethoddef is_status_message(content: str, rendered_content: str) -> bool:"""diff --git a/zerver/tests/test_message_dict.py b/zerver/tests/test_message_dict.pyindex 475ccc4a64f..da1d013a6b6 100644--- a/zerver/tests/test_message_dict.py+++ b/zerver/tests/test_message_dict.py@@ -1,5 +1,4 @@from typing import Any-from unittest import mockfrom django.utils.timezone import now as timezone_now@@ -218,37 +217,6 @@ class MessageDictTest(ZulipTestCase):self.assertEqual(message.rendered_content, expected_content)self.assertEqual(message.rendered_content_version, markdown_version)- @mock.patch("zerver.lib.message_cache.render_message_markdown")- def test_applying_markdown_invalid_format(self, convert_mock: Any) -> None:- # pretend the converter returned an invalid message without raising an exception- convert_mock.return_value = None- sender = self.example_user("othello")- receiver = self.example_user("hamlet")- direct_message_group = get_or_create_direct_message_group(- id_list=[sender.id, receiver.id],- )- sending_client = make_client(name="test suite")- message = Message(- sender=sender,- recipient=direct_message_group.recipient,- realm=receiver.realm,- content="hello **world**",- date_sent=timezone_now(),- sending_client=sending_client,- last_edit_time=timezone_now(),- edit_history="[]",- )- message.set_topic_name("whatever")- message.save()-- # An important part of this test is to get the message through this exact code path,- # because there is an ugly hack we need to cover. So don't just say "row = message".- dct = MessageDict.ids_to_dict([message.id])[0]- error_content = (- "<p>[Zulip note: Sorry, we could not understand the formatting of your message]</p>"- )- self.assertEqual(dct["rendered_content"], error_content)-def test_topic_links_use_stream_realm(self) -> None:# Set up a realm filter on 'zulip' and assert that messages# sent to a stream on 'zulip' have the topic linkified,