From d0bc9b8f9264a7fcfe55bfc79a1193cec5bd031d Mon Sep 17 00:00:00 2001 From: Vector73 Date: Thu, 10 Jul 2025 06:04:19 +0000 Subject: [PATCH] message_edit: Cleanup empty topic check. --- zerver/actions/message_edit.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/zerver/actions/message_edit.py b/zerver/actions/message_edit.py index 18dd9903b7..1e490acfb6 100644 --- a/zerver/actions/message_edit.py +++ b/zerver/actions/message_edit.py @@ -1485,18 +1485,15 @@ def build_message_edit_request( topics_policy = get_stream_topics_policy(message.realm, target_stream) empty_topic_display_name = get_topic_display_name("", user_profile.default_language) - target_topic_empty = ("(no topic)", "") + target_topic_empty = target_topic_name in ("(no topic)", "") if ( - target_topic_name in target_topic_empty + target_topic_empty and (is_topic_edited or is_stream_edited) and topics_policy == StreamTopicsPolicyEnum.disable_empty_topic.value ): raise MessagesNotAllowedInEmptyTopicError(empty_topic_display_name) - if ( - topics_policy == StreamTopicsPolicyEnum.empty_topic_only.value - and target_topic_name not in target_topic_empty - ): + if topics_policy == StreamTopicsPolicyEnum.empty_topic_only.value and not target_topic_empty: raise TopicsNotAllowedError(empty_topic_display_name) return StreamMessageEditRequest(