Merge branch 'master' into develop

sleekxmpp/plugins/__init__.py

@@ -69,5 +69,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
 ]

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)

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)

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()

sleekxmpp/plugins/xep_0297/__init__.py

@@ -0,0 +1,16 @@
+"""
+    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 permission.
+"""
+
+from sleekxmpp.plugins.base import register_plugin
+
+from sleekxmpp.plugins.xep_0297 import stanza
+from sleekxmpp.plugins.xep_0297.stanza import Forwarded
+from sleekxmpp.plugins.xep_0297.forwarded import XEP_0297
+
+
+register_plugin(XEP_0297)

sleekxmpp/plugins/xep_0297/forwarded.py

@@ -0,0 +1,59 @@
+"""
+    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 permission.
+"""
+
+
+import logging
+
+from sleekxmpp import Iq, Message, Presence
+from sleekxmpp.plugins import BasePlugin
+from sleekxmpp.xmlstream import register_stanza_plugin
+from sleekxmpp.xmlstream.handler import Callback
+from sleekxmpp.xmlstream.matcher import StanzaPath
+from sleekxmpp.plugins.xep_0297 import stanza, Forwarded
+
+
+class XEP_0297(BasePlugin):
+
+    name = 'xep_0297'
+    description = 'XEP-0297: Stanza Forwarding'
+    dependencies = set(['xep_0030', 'xep_0203'])
+    stanza = stanza
+
+    def plugin_init(self):
+        register_stanza_plugin(Message, Forwarded)
+        register_stanza_plugin(Forwarded, Message)
+        register_stanza_plugin(Forwarded, Presence)
+        register_stanza_plugin(Forwarded, Iq)
+        register_stanza_plugin(Forwarded, self.xmpp['xep_0203'].stanza.Delay)
+
+        self.xmpp.register_handler(
+            Callback('Forwarded Stanza',
+                StanzaPath('message/forwarded'),
+                self._handle_forwarded))
+
+    def session_bind(self, jid):
+        self.xmpp['xep_0030'].add_feature('urn:xmpp:forward:0')
+
+    def plugin_end(self):
+        self.xmpp['xep_0030'].del_feature(feature='urn:xmpp:forward:0')
+        self.xmpp.remove_handler('Forwarded Stanza')
+
+    def forward(self, stanza=None, mto=None, mbody=None, mfrom=None, delay=None):
+        stanza.stream = None
+
+        msg = self.xmpp.Message()
+        msg['to'] = mto
+        msg['from'] = mfrom
+        msg['body'] = mbody
+        msg['forwarded']['stanza'] = stanza
+        if delay is not None:
+            msg['forwarded']['delay']['stamp'] = delay
+        msg.send()
+
+    def _handle_forwarded(self, msg):
+        self.xmpp.event('forwarded_stanza', msg)

sleekxmpp/plugins/xep_0297/stanza.py

@@ -0,0 +1,34 @@
+"""
+    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 permission.
+"""
+
+from sleekxmpp.xmlstream import ElementBase
+
+
+class Forwarded(ElementBase):
+    name = 'forwarded'
+    namespace = 'urn:xmpp:forward:0'
+    plugin_attrib = 'forwarded'
+    interfaces = set(['stanza'])
+
+    def get_stanza(self):
+        if self.xml.find('{jabber:client}message') is not None:
+            return self['message']
+        elif self.xml.find('{jabber:client}presence') is not None:
+            return self['presence']
+        elif self.xml.find('{jabber:client}iq') is not None:
+            return self['iq']
+        return ''
+
+    def set_stanza(self, value):
+        self.del_stanza()
+        self.append(value)
+
+    def del_stanza(self):
+        del self['message']
+        del self['presence']
+        del self['iq']