Skip to content

Commit e463d6c

Browse files
Young-Lordneiljp
authored andcommitted
bugfix: messages: Fix crash when editing message.
When `realm_message_content_edit_limit_seconds` is None, which now means no time limit for editing messages, ZT crashes with a `TypeError`. This was diagnosed in Zulip cloud, but may be triggered for any version of the server from feature level 138, which was released first in Zulip server 6.0. Prior to this feature level, no limit on editing messages was represented by a numerical value of zero; a direct numerical comparison was therefore possible, but now causes an error. Fixes #1467.
1 parent da84485 commit e463d6c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

zulipterminal/ui_tools/messages.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1045,12 +1045,12 @@ def keypress(self, size: urwid_Size, key: str) -> Optional[str]:
10451045
# the time limit. A limit of 0 signifies no limit
10461046
# on message body editing.
10471047
msg_body_edit_enabled = True
1048-
if self.model.initial_data["realm_message_content_edit_limit_seconds"] > 0:
1048+
edit_time_limit = self.model.initial_data[
1049+
"realm_message_content_edit_limit_seconds"
1050+
]
1051+
if edit_time_limit is not None and edit_time_limit > 0:
10491052
if self.message["sender_id"] == self.model.user_id:
10501053
time_since_msg_sent = time() - self.message["timestamp"]
1051-
edit_time_limit = self.model.initial_data[
1052-
"realm_message_content_edit_limit_seconds"
1053-
]
10541054
# Don't allow editing message body if time-limit exceeded.
10551055
if time_since_msg_sent >= edit_time_limit:
10561056
if self.message["type"] == "private":

0 commit comments

Comments
 (0)