From 79053219e55be1ddce6297d0c5eb296776b161b6 Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Wed, 14 Oct 2015 11:24:12 +0200 Subject: Parse address before filtering for reply - Issue #491 - Now supports whitespaces, names before the address and encoded addresses --- service/pixelated/adapter/mailstore/leap_mailstore.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'service/pixelated/adapter/mailstore/leap_mailstore.py') diff --git a/service/pixelated/adapter/mailstore/leap_mailstore.py b/service/pixelated/adapter/mailstore/leap_mailstore.py index 0182efd9..f3351dbd 100644 --- a/service/pixelated/adapter/mailstore/leap_mailstore.py +++ b/service/pixelated/adapter/mailstore/leap_mailstore.py @@ -15,6 +15,7 @@ # along with Pixelated. If not, see . import base64 from email.header import decode_header +from email.utils import parseaddr import quopri from uuid import uuid4 @@ -163,7 +164,12 @@ class LeapMail(Mail): if not recipients: recipients = [] - return [recipient for recipient in recipients if recipient != InputMail.FROM_EMAIL_ADDRESS] + return [recipient for recipient in recipients if not self._parsed_mail_matches(recipient, InputMail.FROM_EMAIL_ADDRESS)] + + def _parsed_mail_matches(self, to_parse, expected): + if InputMail.FROM_EMAIL_ADDRESS is None: + return False + return parseaddr(self._decoded_header_utf_8(to_parse))[1] == expected @staticmethod def from_dict(mail_dict): -- cgit v1.2.3