Prevent missed-message emails for deleted messages.

This of course only works in the 2 minute window where missed-message
emails are planned, but nonetheless likely avoids common cases of
emailing users with deleted messages.

Fixes: #3873.
This commit is contained in:
dattatreya303
2017-03-14 13:08:01 +05:30
committed by Tim Abbott
parent ceac6d9c59
commit a61ff3e234
2 changed files with 91 additions and 1 deletions

View File

@@ -335,6 +335,10 @@ def handle_missedmessage_emails(user_profile_id, missed_email_events):
messages = Message.objects.filter(usermessage__user_profile_id=user_profile,
id__in=message_ids,
usermessage__flags=~UserMessage.flags.read)
# Cancel missed-message emails for deleted messages
messages = [um for um in messages if um.content != "(deleted)"]
if not messages:
return