extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-08-19 12:24:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'unstable' of git@github.com:martin-marty/django-helpdesk.git into 1039-complexity-reduction

Browse Source
This commit is contained in:
Martin Whitehouse
2022-07-25 01:22:11 +02:00
parent 1ac78955c0 148eff8b7b
commit fe28c2f540
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
helpdesk/email.py
View File

@@ -529,19 +529,6 @@ def object_from_message(message, queue, logger):
sender_email = email.utils.getaddresses(
['\"' + sender.replace('<', '\" <')])[0][1]
cc = message.get_all('cc', None)
if cc:
# first, fixup the encoding if necessary
cc = [decode_mail_headers(decodeUnknown(
message.get_charset(), x)) for x in cc]
# get_all checks if multiple CC headers, but individual emails may be
# comma separated too
tempcc = []
for hdr in cc:
tempcc.extend(hdr.split(','))
# use a set to ensure no duplicates
cc = set([x.strip() for x in tempcc])
for ignore in IgnoreEmail.objects.filter(Q(queues=queue) | Q(queues__isnull=True)):
if ignore.test(sender_email):
if ignore.keep_in_mailbox: