mirror of
https://github.com/zulip/zulip.git
synced 2025-10-25 00:53:56 +00:00
message_edit: Set stream_topic only if content is edited.
stream_topic variable is needed only when updating content so we set the field inside is_content_edited block. Also added a comment clarifying about why we use orig_stream for stream ID.
This commit is contained in:
@@ -571,7 +571,15 @@ def do_update_message(
|
|||||||
"flags": um.flags_list(),
|
"flags": um.flags_list(),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if message_edit_request.is_content_edited:
|
||||||
|
assert rendering_result is not None
|
||||||
|
|
||||||
|
# mention_data is required if there's a content edit.
|
||||||
|
assert mention_data is not None
|
||||||
|
|
||||||
if isinstance(message_edit_request, StreamMessageEditRequest):
|
if isinstance(message_edit_request, StreamMessageEditRequest):
|
||||||
|
# We do not allow changing content and stream together,
|
||||||
|
# so we use ID of orig_stream.
|
||||||
stream_topic: StreamTopicTarget | None = StreamTopicTarget(
|
stream_topic: StreamTopicTarget | None = StreamTopicTarget(
|
||||||
stream_id=message_edit_request.orig_stream.id,
|
stream_id=message_edit_request.orig_stream.id,
|
||||||
topic_name=message_edit_request.target_topic_name,
|
topic_name=message_edit_request.target_topic_name,
|
||||||
@@ -579,12 +587,6 @@ def do_update_message(
|
|||||||
else:
|
else:
|
||||||
stream_topic = None
|
stream_topic = None
|
||||||
|
|
||||||
if message_edit_request.is_content_edited:
|
|
||||||
assert rendering_result is not None
|
|
||||||
|
|
||||||
# mention_data is required if there's a content edit.
|
|
||||||
assert mention_data is not None
|
|
||||||
|
|
||||||
update_message_content(
|
update_message_content(
|
||||||
user_profile,
|
user_profile,
|
||||||
target_message,
|
target_message,
|
||||||
|
|||||||
Reference in New Issue
Block a user