From 5027d00c109ed02b79e9c985077674f6dfd42766 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Fri, 22 Jun 2012 21:25:37 -0700 Subject: Change packaging for XEP-0256 to just a single file. --- setup.py | 1 - sleekxmpp/plugins/xep_0256.py | 64 +++++++++++++++++++++++++++++ sleekxmpp/plugins/xep_0256/__init__.py | 14 ------- sleekxmpp/plugins/xep_0256/last_activity.py | 64 ----------------------------- 4 files changed, 64 insertions(+), 79 deletions(-) create mode 100644 sleekxmpp/plugins/xep_0256.py delete mode 100644 sleekxmpp/plugins/xep_0256/__init__.py delete mode 100644 sleekxmpp/plugins/xep_0256/last_activity.py diff --git a/setup.py b/setup.py index 4c22611f..71973ceb 100755 --- a/setup.py +++ b/setup.py @@ -93,7 +93,6 @@ packages = [ 'sleekxmpp', 'sleekxmpp/plugins/xep_0224', 'sleekxmpp/plugins/xep_0231', 'sleekxmpp/plugins/xep_0249', - 'sleekxmpp/plugins/xep_0256', 'sleekxmpp/plugins/xep_0258', 'sleekxmpp/features', 'sleekxmpp/features/feature_mechanisms', diff --git a/sleekxmpp/plugins/xep_0256.py b/sleekxmpp/plugins/xep_0256.py new file mode 100644 index 00000000..2938868d --- /dev/null +++ b/sleekxmpp/plugins/xep_0256.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 permission. +""" + +import logging + +from sleekxmpp import Presence +from sleekxmpp.plugins import BasePlugin +from sleekxmpp.xmlstream import register_stanza_plugin + +from sleekxmpp.plugins.xep_0012 import stanza, LastActivity + + +log = logging.getLogger(__name__) + + +class XEP_0256(BasePlugin): + + name = 'xep_0256' + description = 'XEP-0256: Last Activity in Presence' + dependencies = set(['xep_0012']) + stanza = stanza + + def plugin_init(self): + self.auto_last_activity = self.config.get('auto_last_activity', False) + + register_stanza_plugin(Presence, LastActivity) + + self.xmpp.add_filter('out', self._initial_presence_activity) + self.xmpp.add_event_handler('connected', self._reset_presence_activity) + + self._initial_presence = set() + + def _reset_presence_activity(self, e): + self._initial_presence = set() + + def _initial_presence_activity(self, stanza): + if isinstance(stanza, Presence): + use_last_activity = False + + if self.auto_last_activity and stanza['show'] in ('xa', 'away'): + use_last_activity = True + + if stanza['from'] not in self._initial_presence: + self._initial_presence.add(stanza['from']) + use_last_activity = True + + if use_last_activity: + plugin = self.xmpp['xep_0012'] + try: + result = plugin.api['get_last_activity'](stanza['from'], + None, + stanza['to']) + seconds = result['last_activity']['seconds'] + except XMPPError: + seconds = None + + if seconds is not None: + stanza['last_activity']['seconds'] = seconds + return stanza diff --git a/sleekxmpp/plugins/xep_0256/__init__.py b/sleekxmpp/plugins/xep_0256/__init__.py deleted file mode 100644 index cfe712b7..00000000 --- a/sleekxmpp/plugins/xep_0256/__init__.py +++ /dev/null @@ -1,14 +0,0 @@ -""" - 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_0256.last_activity import XEP_0256 - - -register_plugin(XEP_0256) diff --git a/sleekxmpp/plugins/xep_0256/last_activity.py b/sleekxmpp/plugins/xep_0256/last_activity.py deleted file mode 100644 index 2938868d..00000000 --- a/sleekxmpp/plugins/xep_0256/last_activity.py +++ /dev/null @@ -1,64 +0,0 @@ -""" - 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 Presence -from sleekxmpp.plugins import BasePlugin -from sleekxmpp.xmlstream import register_stanza_plugin - -from sleekxmpp.plugins.xep_0012 import stanza, LastActivity - - -log = logging.getLogger(__name__) - - -class XEP_0256(BasePlugin): - - name = 'xep_0256' - description = 'XEP-0256: Last Activity in Presence' - dependencies = set(['xep_0012']) - stanza = stanza - - def plugin_init(self): - self.auto_last_activity = self.config.get('auto_last_activity', False) - - register_stanza_plugin(Presence, LastActivity) - - self.xmpp.add_filter('out', self._initial_presence_activity) - self.xmpp.add_event_handler('connected', self._reset_presence_activity) - - self._initial_presence = set() - - def _reset_presence_activity(self, e): - self._initial_presence = set() - - def _initial_presence_activity(self, stanza): - if isinstance(stanza, Presence): - use_last_activity = False - - if self.auto_last_activity and stanza['show'] in ('xa', 'away'): - use_last_activity = True - - if stanza['from'] not in self._initial_presence: - self._initial_presence.add(stanza['from']) - use_last_activity = True - - if use_last_activity: - plugin = self.xmpp['xep_0012'] - try: - result = plugin.api['get_last_activity'](stanza['from'], - None, - stanza['to']) - seconds = result['last_activity']['seconds'] - except XMPPError: - seconds = None - - if seconds is not None: - stanza['last_activity']['seconds'] = seconds - return stanza -- cgit v1.2.3