Removed bounced email contact removal (#441)

This feature was never working anyway.
Anybody could remove addresses from anyones adressbook by sending a bounce
and then the receiver was not able to send an email to that address anymore.
Nice dos :)

2 files changed, 1 insertions, 13 deletions

diff --git a/service/pixelated/adapter/search/__init__.py b/service/pixelated/adapter/search/__init__.py
index 84e69a9a..0c86582d 100644
--- a/service/pixelated/adapter/search/__init__.py
+++ b/service/pixelated/adapter/search/__init__.py
@@ -102,7 +102,6 @@ class SearchEngine(object):
             to=KEYWORD(stored=False, commas=True),
             cc=KEYWORD(stored=False, commas=True),
             bcc=KEYWORD(stored=False, commas=True),
-            bounced=KEYWORD(stored=False, commas=True),
             subject=TEXT(stored=False),
             date=NUMERIC(stored=False, sortable=True, bits=64, signed=False),
             body=TEXT(stored=False),
@@ -123,7 +122,6 @@ class SearchEngine(object):
         header = mdict['header']
         tags = set(mdict.get('tags', {}))
         tags.add(mail.mailbox_name.lower())
-        bounced = mail.bounced if mail.bounced else ['']
 
         index_data = {
             'sender': self._empty_string_to_none(header.get('from', '')),
@@ -133,7 +131,6 @@ class SearchEngine(object):
             'cc': self._format_recipient(header, 'cc'),
             'bcc': self._format_recipient(header, 'bcc'),
             'tag': u','.join(unique(tags)),
-            'bounced': u','.join(bounced),
             'body': unicode(mdict['textPlainBody'] if 'textPlainBody' in mdict else mdict['body']),
             'ident': unicode(mdict['ident']),
             'flags': unicode(','.join(unique(mail.flags))),
diff --git a/service/pixelated/adapter/search/contacts.py b/service/pixelated/adapter/search/contacts.py
index 0dfeb15b..0729e146 100644
--- a/service/pixelated/adapter/search/contacts.py
+++ b/service/pixelated/adapter/search/contacts.py
@@ -31,21 +31,12 @@ def address_duplication_filter(contacts):
     return contacts_by_mail.values()
 
 
-def bounced_addresses_filter(searcher, contacts):
-    query = QueryParser('bounced', searcher.schema).parse('*')
-    bounced_addresses = searcher.search(query,
-                                        limit=None,
-                                        groupedby=sorting.FieldFacet('bounced',
-                                                                     allow_overlap=True)).groups()
-    return set(contacts) - set(flatten([bounced_addresses]))
-
-
 def extract_mail_address(text):
     return parseaddr(text)[1]
 
 
 def contacts_suggestions(query, searcher):
-    return address_duplication_filter(bounced_addresses_filter(searcher, search_addresses(searcher, query))) if query else []
+    return address_duplication_filter(search_addresses(searcher, query)) if query else []
 
 
 def search_addresses(searcher, query):