Merge branch 'send-tag-message-hook' of https://github.com/mmb/pure-python-otr into mmb-send-tag-message-hook

Author: koolfy

README.md

@@ -8,18 +8,15 @@ Install the potr Python module:
 
 __Dependencies__: pycrypto >= 2.1 (see [dlitz/pycrypto](https://github.com/dlitz/pycrypto))
 
+This software is experimental and potentially insecure. Do not rely on it
+=========================================================================
+
 Usage Notes
 ===========
 This module uses pycrypto's RNG. If you use this package in your application and your application
 uses `os.fork()`, make sure to call `Crypto.Random.atfork()` in both the parent and the child process.
 
 Reporting bugs
 ==============
-Please read the [FAQ](https://github.com/afflux/pure-python-otr/wiki) before submitting your
-issue to the [tracker](https://github.com/afflux/pure-python-otr/issues).
-
-libotr SWIG bindings
-====================
-python-otr.pentabarf.de and pyotr.pentabarf.de redirect here.
-If you are still looking for the old C library bindings, they have moved
-to <http://python-otr-old.pentabarf.de/>
+Please read the [FAQ](https://github.com/python-otr/pure-python-otr/wiki) before submitting your
+issue to the [tracker](https://github.com/python-otr/pure-python-otr/issues).

src/potr/context.py

@@ -282,7 +282,9 @@ def processOutgoingMessage(self, msg, flags, tlvs=[]):
                     # TODO notify
                     msg = self.user.getDefaultQueryMessage(self.getPolicy)
                 return msg
-            if self.getPolicy('SEND_TAG') and self.tagOffer != OFFER_REJECTED:
+            if self.getPolicy('SEND_TAG') and \
+                self.tagOffer != OFFER_REJECTED and \
+                self.shouldTagMessage(msg):
                 self.tagOffer = OFFER_SENT
                 versions = set()
                 if self.getPolicy('ALLOW_V1'):
@@ -492,6 +494,10 @@ def getExtraKey(self, extraKeyAppId=None, extraKeyAppData=None, appdata=None):
             self.sendInternal(b'', tlvs=tlvs, appdata=appdata)
         return self.crypto.extraKey
 
+    def shouldTagMessage(self, msg):
+        """Hook to decide whether to tag a message based on its contents."""
+        return True
+
 class Account(object):
     contextclass = Context
     def __init__(self, name, protocol, maxMessageSize, privkey=None):