paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

messages: Fix unlikely exception when trying to delete a message.

Browse Source
This commit is contained in:
Tim Abbott
2020-03-22 21:35:27 -07:00
parent 481d351cee
commit 180d8abed6
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zerver/lib/actions.py
View File

@@ -4679,7 +4679,15 @@ def do_delete_messages(realm: Realm, messages: Iterable[Message]) -> None:
else:
event['recipient_id'] = message.recipient_id
events_and_users_to_notify.append((event, message_id_to_notifiable_users[message.id]))
# In theory, it's possible for message_id_to_notifiable_users
# to not have a key for the message ID in some weird corner
# case where we've deleted the last user subscribed to the
# target stream before a bot sent a message to it, and thus
# there are no UserMessage objects associated with the
# message.
events_and_users_to_notify.append(
(event, message_id_to_notifiable_users.get(message.id, []))
)
move_messages_to_archive(message_ids)
for event, users_to_notify in events_and_users_to_notify: