From ee9c4abd08db06fd6dc808d48c43cd6d57bd1aa1 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Wed, 26 Sep 2012 01:47:45 -0700 Subject: Add support for XEP-0091: Legacy Delayed Delivery --- setup.py | 1 + sleekxmpp/plugins/__init__.py | 1 + sleekxmpp/plugins/xep_0091/__init__.py | 16 +++++++++++ sleekxmpp/plugins/xep_0091/legacy_delay.py | 29 +++++++++++++++++++ sleekxmpp/plugins/xep_0091/stanza.py | 46 ++++++++++++++++++++++++++++++ sleekxmpp/plugins/xep_0203/stanza.py | 9 ++++-- 6 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 sleekxmpp/plugins/xep_0091/__init__.py create mode 100644 sleekxmpp/plugins/xep_0091/legacy_delay.py create mode 100644 sleekxmpp/plugins/xep_0091/stanza.py diff --git a/setup.py b/setup.py index c74a15b3..247b3d91 100755 --- a/setup.py +++ b/setup.py @@ -80,6 +80,7 @@ packages = [ 'sleekxmpp', 'sleekxmpp/plugins/xep_0084', 'sleekxmpp/plugins/xep_0085', 'sleekxmpp/plugins/xep_0086', + 'sleekxmpp/plugins/xep_0091', 'sleekxmpp/plugins/xep_0092', 'sleekxmpp/plugins/xep_0107', 'sleekxmpp/plugins/xep_0108', diff --git a/sleekxmpp/plugins/__init__.py b/sleekxmpp/plugins/__init__.py index ad8b1419..1e6534d0 100644 --- a/sleekxmpp/plugins/__init__.py +++ b/sleekxmpp/plugins/__init__.py @@ -38,6 +38,7 @@ __all__ = [ 'xep_0084', # User Avatar 'xep_0085', # Chat State Notifications 'xep_0086', # Legacy Error Codes + 'xep_0091', # Legacy Delayed Delivery 'xep_0092', # Software Version 'xep_0106', # JID Escaping 'xep_0107', # User Mood diff --git a/sleekxmpp/plugins/xep_0091/__init__.py b/sleekxmpp/plugins/xep_0091/__init__.py new file mode 100644 index 00000000..04f21ef5 --- /dev/null +++ b/sleekxmpp/plugins/xep_0091/__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_0091 import stanza +from sleekxmpp.plugins.xep_0091.stanza import LegacyDelay +from sleekxmpp.plugins.xep_0091.legacy_delay import XEP_0091 + + +register_plugin(XEP_0091) diff --git a/sleekxmpp/plugins/xep_0091/legacy_delay.py b/sleekxmpp/plugins/xep_0091/legacy_delay.py new file mode 100644 index 00000000..7323d468 --- /dev/null +++ b/sleekxmpp/plugins/xep_0091/legacy_delay.py @@ -0,0 +1,29 @@ +""" + 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.stanza import Message, Presence +from sleekxmpp.xmlstream import register_stanza_plugin +from sleekxmpp.plugins import BasePlugin +from sleekxmpp.plugins.xep_0091 import stanza + + +class XEP_0091(BasePlugin): + + """ + XEP-0091: Legacy Delayed Delivery + """ + + name = 'xep_0091' + description = 'XEP-0091: Legacy Delayed Delivery' + dependencies = set() + stanza = stanza + + def plugin_init(self): + register_stanza_plugin(Message, stanza.LegacyDelay) + register_stanza_plugin(Presence, stanza.LegacyDelay) diff --git a/sleekxmpp/plugins/xep_0091/stanza.py b/sleekxmpp/plugins/xep_0091/stanza.py new file mode 100644 index 00000000..0b70ff63 --- /dev/null +++ b/sleekxmpp/plugins/xep_0091/stanza.py @@ -0,0 +1,46 @@ +""" + 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 datetime as dt + +from sleekxmpp.jid import JID +from sleekxmpp.xmlstream import ElementBase +from sleekxmpp.plugins import xep_0082 + + +class LegacyDelay(ElementBase): + + name = 'x' + namespace = 'jabber:x:delay' + plugin_attrib = 'legacy_delay' + interfaces = set(('from', 'stamp', 'text')) + + def get_from(self): + return JID(self._get_attr('from')) + + def set_from(self, value): + self._set_attr('from', str(value)) + + def get_stamp(self): + timestamp = self._get_attr('stamp') + return xep_0082.parse('%sZ' % timestamp) + + def set_stamp(self, value): + if isinstance(value, dt.datetime): + value = value.astimezone(xep_0082.tzutc) + value = xep_0082.format_datetime(value) + self._set_attr('stamp', value[0:19].replace('-', '')) + + def get_text(self): + return self.xml.text + + def set_text(self, value): + self.xml.text = value + + def del_text(self): + self.xml.text = '' diff --git a/sleekxmpp/plugins/xep_0203/stanza.py b/sleekxmpp/plugins/xep_0203/stanza.py index baae4cd3..9a11cae9 100644 --- a/sleekxmpp/plugins/xep_0203/stanza.py +++ b/sleekxmpp/plugins/xep_0203/stanza.py @@ -14,14 +14,17 @@ from sleekxmpp.plugins import xep_0082 class Delay(ElementBase): - """ - """ - name = 'delay' namespace = 'urn:xmpp:delay' plugin_attrib = 'delay' interfaces = set(('from', 'stamp', 'text')) + def get_from(self): + return JID(self._get_attr('from')) + + def set_from(self, value): + self._set_attr('from', str(value)) + def get_stamp(self): timestamp = self._get_attr('stamp') return xep_0082.parse(timestamp) -- cgit v1.2.3