Add support for XEP-0280 Message Carbons

6 files changed, 159 insertions, 7 deletions

diff --git a/setup.py b/setup.py
index d8fd6ef9..4d97b90a 100755
--- a/setup.py
+++ b/setup.py
@@ -102,6 +102,7 @@ packages     = [ 'sleekxmpp',
                  'sleekxmpp/plugins/xep_0249',
                  'sleekxmpp/plugins/xep_0258',
                  'sleekxmpp/plugins/xep_0279',
+                 'sleekxmpp/plugins/xep_0280',
                  'sleekxmpp/plugins/xep_0297',
                  'sleekxmpp/features',
                  'sleekxmpp/features/feature_mechanisms',
diff --git a/sleekxmpp/plugins/__init__.py b/sleekxmpp/plugins/__init__.py
index f09a26f1..461d292d 100644
--- a/sleekxmpp/plugins/__init__.py
+++ b/sleekxmpp/plugins/__init__.py
@@ -68,6 +68,7 @@ __all__ = [
     'xep_0258',  # Security Labels in XMPP
     'xep_0270',  # XMPP Compliance Suites 2010
     'xep_0279',  # Server IP Check
+    'xep_0280',  # Message Carbons
     'xep_0297',  # Stanza Forwarding
     'xep_0302',  # XMPP Compliance Suites 2012
 ]
diff --git a/sleekxmpp/plugins/xep_0280/__init__.py b/sleekxmpp/plugins/xep_0280/__init__.py
new file mode 100644
index 00000000..8ed65346
--- /dev/null
+++ b/sleekxmpp/plugins/xep_0280/__init__.py
@@ -0,0 +1,17 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permissio
+"""
+
+from sleekxmpp.plugins.base import register_plugin
+
+from sleekxmpp.plugins.xep_0280.stanza import ReceivedCarbon, SentCarbon
+from sleekxmpp.plugins.xep_0280.stanza import PrivateCarbon
+from sleekxmpp.plugins.xep_0280.stanza import CarbonEnable, CarbonDisable
+from sleekxmpp.plugins.xep_0280.carbons import XEP_0280
+
+
+register_plugin(XEP_0280)
diff --git a/sleekxmpp/plugins/xep_0280/carbons.py b/sleekxmpp/plugins/xep_0280/carbons.py
new file mode 100644
index 00000000..7eec7acd
--- /dev/null
+++ b/sleekxmpp/plugins/xep_0280/carbons.py
@@ -0,0 +1,76 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permissio
+"""
+
+import logging
+
+import sleekxmpp
+from sleekxmpp.stanza import Message, Iq
+from sleekxmpp.xmlstream.handler import Callback
+from sleekxmpp.xmlstream.matcher import StanzaPath
+from sleekxmpp.xmlstream import register_stanza_plugin
+from sleekxmpp.plugins import BasePlugin
+from sleekxmpp.plugins.xep_0280 import stanza
+
+
+log = logging.getLogger(__name__)
+
+
+class XEP_0280(BasePlugin):
+
+    """
+    XEP-0280 Message Carbons
+    """
+
+    name = 'xep_0280'
+    description = 'XEP-0280: Message Carbons'
+    dependencies = set(['xep_0030', 'xep_0297'])
+    stanza = stanza
+
+    def plugin_init(self):
+        self.xmpp.register_handler(
+            Callback('Carbon Received',
+                     StanzaPath('message/carbon_received'),
+                     self._handle_carbon_received))
+        self.xmpp.register_handler(
+            Callback('Carbon Sent',
+                     StanzaPath('message/carbon_sent'),
+                     self._handle_carbon_sent))
+
+        register_stanza_plugin(Message, stanza.ReceivedCarbon)
+        register_stanza_plugin(Message, stanza.SentCarbon)
+        register_stanza_plugin(Message, stanza.PrivateCarbon)
+        register_stanza_plugin(Iq, stanza.CarbonEnable)
+        register_stanza_plugin(Iq, stanza.CarbonDisable)
+
+    def plugin_end(self):
+        self.xmpp.remove_handler('Carbon Received')
+        self.xmpp.remove_handler('Carbon Sent')
+        self.xmpp.plugin['xep_0030'].del_feature(feature='urn:xmpp:carbons:1')
+
+    def session_bind(self, jid):
+        self.xmpp.plugin['xep_0030'].add_feature('urn:xmpp:carbons:1')
+
+    def _handle_carbon_received(self, msg):
+        self.xmpp.event('carbon_received', msg)
+
+    def _handle_carbon_sent(self, msg):
+        self.xmpp.event('carbon_sent', msg)
+
+    def enable(self, ifrom=None, block=True, timeout=None, callback=None):
+        iq = self.xmpp.Iq()
+        iq['type'] = 'set'
+        iq['from'] = ifrom
+        iq.enable('carbon_enable')
+        return iq.send(block=block, timeout=timeout, callback=callback)
+
+    def disable(self, ifrom=None, block=True, timeout=None, callback=None):
+        iq = self.xmpp.Iq()
+        iq['type'] = 'set'
+        iq['from'] = ifrom
+        iq.enable('carbon_disable')
+        return iq.send(block=block, timeout=timeout, callback=callback)
diff --git a/sleekxmpp/plugins/xep_0280/stanza.py b/sleekxmpp/plugins/xep_0280/stanza.py
new file mode 100644
index 00000000..94b37823
--- /dev/null
+++ b/sleekxmpp/plugins/xep_0280/stanza.py
@@ -0,0 +1,64 @@
+"""
+    SleekXMPP: The Sleek XMPP Library
+    Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+    This file is part of SleekXMPP.
+
+    See the file LICENSE for copying permissio
+"""
+
+from sleekxmpp.xmlstream import ElementBase
+
+
+class ReceivedCarbon(ElementBase):
+    name = 'received'
+    namespace = 'urn:xmpp:carbons:1'
+    plugin_attrib = 'carbon_received'
+    interfaces = set(['carbon_received'])
+    is_extension = True
+
+    def get_carbon_received(self):
+        return self.parent()['forwarded']['stanza']
+
+    def del_carbon_received(self):
+        del self.parent()['forwarded']['stanza']
+
+    def set_carbon_received(self, stanza):
+        self.parent()['forwarded']['stanza'] = stanza
+
+
+class SentCarbon(ElementBase):
+    name = 'sent'
+    namespace = 'urn:xmpp:carbons:1'
+    plugin_attrib = 'carbon_sent'
+    interfaces = set(['carbon_sent'])
+    is_extension = True
+
+    def get_carbon_sent(self):
+        return self.parent()['forwarded']['stanza']
+
+    def del_carbon_sent(self):
+        del self.parent()['forwarded']['stanza']
+
+    def set_carbon_sent(self, stanza):
+        self.parent()['forwarded']['stanza'] = stanza
+
+
+class PrivateCarbon(ElementBase):
+    name = 'private'
+    namespace = 'urn:xmpp:carbons:1'
+    plugin_attrib = 'carbon_private'
+    interfaces = set()
+
+
+class CarbonEnable(ElementBase):
+    name = 'enable'
+    namespace = 'urn:xmpp:carbons:1'
+    plugin_attrib = 'carbon_enable'
+    interfaces = set()
+
+
+class CarbonDisable(ElementBase):
+    name = 'disable'
+    namespace = 'urn:xmpp:carbons:1'
+    plugin_attrib = 'carbon_disable'
+    interfaces = set()
diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py
index a75d7079..4f58953b 100644
--- a/sleekxmpp/xmlstream/stanzabase.py
+++ b/sleekxmpp/xmlstream/stanzabase.py
@@ -525,13 +525,6 @@ class ElementBase(object):
         if reuse and (attrib, lang) in self.plugins:
             return self.plugins[(attrib, lang)]
 
-        if existing_xml is None:
-            existing_xml = self.xml.find(plugin_class.tag_name())
-
-        if existing_xml is not None:
-            if existing_xml.attrib.get('{%s}lang' % XML_NS, default_lang) != lang:
-                existing_xml = None
-
         plugin = plugin_class(parent=self, xml=existing_xml)
 
         if plugin.is_extension: