From fb91cd6f4d011e2a4ac81710599295cd42a9dbe0 Mon Sep 17 00:00:00 2001 From: Prakhar Pratyush Date: Wed, 15 Jan 2025 01:10:39 +0530 Subject: [PATCH] message_edit: Disallow resolving empty string topic. This commit makes changes to the edit message endpoint to disallow resolving empty string topic. It also removes the resolve topic button in the web client from topic popover and message header for empty string topic. --- .../left_sidebar_topic_actions_popover.hbs | 2 +- web/templates/recipient_row.hbs | 2 +- zerver/actions/message_edit.py | 6 ++++++ zerver/openapi/zulip.yaml | 4 ++++ zerver/tests/test_message_move_topic.py | 14 ++++++++++++++ 5 files changed, 26 insertions(+), 2 deletions(-) diff --git a/web/templates/popovers/left_sidebar/left_sidebar_topic_actions_popover.hbs b/web/templates/popovers/left_sidebar/left_sidebar_topic_actions_popover.hbs index 844c1bb9d7..95344ce04a 100644 --- a/web/templates/popovers/left_sidebar/left_sidebar_topic_actions_popover.hbs +++ b/web/templates/popovers/left_sidebar/left_sidebar_topic_actions_popover.hbs @@ -86,7 +86,7 @@ {{/if}} - {{#if can_rename_topic}} + {{#if (and can_rename_topic (not is_empty_string_topic))}}
  • {{# if topic_is_resolved }} diff --git a/web/templates/recipient_row.hbs b/web/templates/recipient_row.hbs index 1c9f34fa23..64047cfbc1 100644 --- a/web/templates/recipient_row.hbs +++ b/web/templates/recipient_row.hbs @@ -54,7 +54,7 @@ {{/if}} - {{#if user_can_resolve_topic}} + {{#if (and user_can_resolve_topic (not is_empty_string_topic))}} {{#if topic_is_resolved}} {{else}} diff --git a/zerver/actions/message_edit.py b/zerver/actions/message_edit.py index 8b87b54a47..fd2861920e 100644 --- a/zerver/actions/message_edit.py +++ b/zerver/actions/message_edit.py @@ -121,6 +121,12 @@ def validate_message_edit_payload( if propagate_mode != "change_one" and topic_name is None and stream_id is None: raise JsonableError(_("Invalid propagate_mode without topic edit")) + if topic_name in { + RESOLVED_TOPIC_PREFIX.strip(), + f"{RESOLVED_TOPIC_PREFIX}{Message.EMPTY_TOPIC_FALLBACK_NAME}", + }: + raise JsonableError(_("General chat cannot be marked as resolved")) + if topic_name is not None: check_stream_topic(topic_name) diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 9a709ac2ca..48d5f1c1b5 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -8515,6 +8515,10 @@ paths: the [POST /register](/api/register-queue) response is used for this parameter, it is interpreted as an empty string. + You can [resolve topics](/help/resolve-a-topic) by editing the topic to + `✔ {original_topic}` with the `propagate_mode` parameter set to + `"change_all"`. The empty string topic cannot be marked as resolved. + **Changes**: Before Zulip 10.0 (feature level 334), empty string was not a valid topic name for channel messages. diff --git a/zerver/tests/test_message_move_topic.py b/zerver/tests/test_message_move_topic.py index 16e20768a6..fcdeefabb0 100644 --- a/zerver/tests/test_message_move_topic.py +++ b/zerver/tests/test_message_move_topic.py @@ -1757,3 +1757,17 @@ class MessageMoveTopicTest(ZulipTestCase): topic_messages[0].content, f"@_**Iago|{admin_user.id}** has marked this topic as resolved.", ) + + def test_resolve_empty_string_topic(self) -> None: + hamlet = self.example_user("hamlet") + + message_id = self.send_stream_message(hamlet, "Denmark", topic_name="") + result = self.resolve_topic_containing_message(hamlet, target_message_id=message_id) + self.assert_json_error(result, "General chat cannot be marked as resolved") + + # Verification for old clients that don't support empty string topic. + message_id = self.send_stream_message( + hamlet, "Denmark", topic_name=Message.EMPTY_TOPIC_FALLBACK_NAME + ) + result = self.resolve_topic_containing_message(hamlet, target_message_id=message_id) + self.assert_json_error(result, "General chat cannot be marked as resolved")