Improve MeFilter

afew/filters/MeFilter.py

@@ -11,8 +11,8 @@ class MeFilter(Filter):
     message = 'Tagging all mails sent directly to myself'
     _bare_email_re = re.compile(r"[^<]*<(?P<email>[^@<>]+@[^@<>]+)>")
 
-    def __init__(self, database, me_tag='to-me', tags_blacklist=[]):
-        super().__init__(database, tags_blacklist=tags_blacklist)
+    def __init__(self, database, me_tag=None, **kwargs):
+        super().__init__(database, **kwargs)
 
         my_addresses = set()
         my_addresses.add(notmuch_settings.get('user', 'primary_email'))
@@ -23,8 +23,10 @@ def __init__(self, database, me_tag='to-me', tags_blacklist=[]):
         self.query = ' OR '.join('to:"%s"' % address
                                  for address in my_addresses)
 
-        self.me_tag = me_tag
-
-    def handle_message(self, message):
-        if not self._tag_blacklist.intersection(message.get_tags()):
-            self.add_tags(message, self.me_tag)
+        # The me_tag option does nothing that couldn't be done with the
+        # "normal" tags option. If the me_tag is explicitly configured or there
+        # is no tags option make use of it.
+        if not me_tag is None or (not self._tags_to_add and not self._tags_to_remove):
+            if me_tag is None:
+                me_tag = 'to-me'
+            self._tags_to_add.append(me_tag)

docs/filters.rst

@@ -176,7 +176,11 @@ MeFilter
 
 Add filter tagging mail sent directly to any of addresses defined in
 Notmuch config file: `primary_email` or `other_email`.
-Default tag is `to-me` and can be customized with `me_tag` option.
+Default tag action is `+to-me`.
+
+(In the past there used to be advertised a `me_tag` option to overwrite the tag
+to apply. The current code still handles it as it used to work, but usage is
+discouraged.)
 
 SentMailsFilter
 ---------------