diff options
Diffstat (limited to 'sleekxmpp')
| -rw-r--r-- | sleekxmpp/basexmpp.py | 26 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0045.py | 12 |
2 files changed, 17 insertions, 21 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index cc0f1087..fef8538a 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -261,27 +261,23 @@ class basexmpp(object): if not presence['from'].bare in self.roster: self.roster[jid] = {'groups': [], 'name': '', 'subscription': 'none', 'presence': {}, 'in_roster': False} if not resource in self.roster[jid]['presence']: + if (show == 'available' or show in presence.showtypes): + self.event("got_online", presence) wasoffline = True - self.roster[jid]['presence'][resource] = {'show': show, 'status': status, 'priority': priority} - else: - if self.roster[jid]['presence'][resource].get('show', 'unavailable') == 'unavailable': - wasoffline = True - self.roster[jid]['presence'][resource] = {'show': show, 'status': status} - self.roster[jid]['presence'][resource]['priority'] = priority + self.roster[jid]['presence'][resource] = {} + if self.roster[jid]['presence'][resource].get('show', 'unavailable') == 'unavailable': + wasoffline = True + self.roster[jid]['presence'][resource] = {'show': show, 'status': status, 'priority': priority} name = self.roster[jid].get('name', '') - if wasoffline and (show == 'available' or show in presence.showtypes): - self.event("got_online", presence) - self.event("changed_status", presence) - elif show == 'unavailable': + if show == 'unavailable': logging.debug("%s %s got offline" % (jid, resource)) - if len(self.roster[jid]['presence']) > 1: + if len(self.roster[jid]['presence']): del self.roster[jid]['presence'][resource] else: del self.roster[jid] - self.event("got_offline", presence) - self.event("changed_status", presence) - elif oldroster != self.roster.get(jid, {'presence': {}})['presence'].get(resource, {}): - self.event("changed_status", presence) + if not wasoffline: + self.event("got_offline", presence) + self.event("changed_status", presence) name = '' if name: name = "(%s) " % name diff --git a/sleekxmpp/plugins/xep_0045.py b/sleekxmpp/plugins/xep_0045.py index 7fc8a2bf..240e6b9a 100644 --- a/sleekxmpp/plugins/xep_0045.py +++ b/sleekxmpp/plugins/xep_0045.py @@ -147,12 +147,12 @@ class xep_0045(base.base_plugin): """ self.xmpp.event('groupchat_message', msg) - def jidInRoom(self, room, jid): - for nick in self.rooms[room]: - entry = self.rooms[room][nick] - if entry is not None and entry['jid'].full == jid: - return True - return False + def jidInRoom(self, room, jid): + for nick in self.rooms[room]: + entry = self.rooms[room][nick] + if entry is not None and entry['jid'].full == jid: + return True + return False def getRoomForm(self, room, ifrom=None): iq = self.xmpp.makeIqGet() |