jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup how events are run, they are always direct by definition now

Browse Source
This commit is contained in:
Florent Le Coz
2014-07-23 17:01:17 +02:00
parent 5611b30022
commit 74117453b5
7 changed files with 41 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slixmpp/plugins/xep_0078/legacyauth.py
View File

@@ -82,12 +82,12 @@ class XEP_0078(BasePlugin):
resp = iq.send(now=True)
except IqError as err:
log.info("Authentication failed: %s", err.iq['error']['condition'])
self.xmpp.event('failed_auth', direct=True)
self.xmpp.event('failed_auth')
self.xmpp.disconnect()
return True
except IqTimeout:
log.info("Authentication failed: %s", 'timeout')
self.xmpp.event('failed_auth', direct=True)
self.xmpp.event('failed_auth')
self.xmpp.disconnect()
return True
@@ -123,11 +123,11 @@ class XEP_0078(BasePlugin):
result = iq.send(now=True)
except IqError as err:
log.info("Authentication failed")
self.xmpp.event("failed_auth", direct=True)
self.xmpp.event("failed_auth")
self.xmpp.disconnect()
except IqTimeout:
log.info("Authentication failed")
self.xmpp.event("failed_auth", direct=True)
self.xmpp.event("failed_auth")
self.xmpp.disconnect()
self.xmpp.features.add('auth')
@@ -137,7 +137,7 @@ class XEP_0078(BasePlugin):
self.xmpp.boundjid = JID(self.xmpp.requested_jid,
resource=resource,
cache_lock=True)
self.xmpp.event('session_bind', self.xmpp.boundjid, direct=True)
self.xmpp.event('session_bind', self.xmpp.boundjid)
log.debug("Established Session")
self.xmpp.sessionstarted = True