diff options
author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-03-14 17:18:46 +0100 |
---|---|---|
committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2018-03-14 17:18:46 +0100 |
commit | 326de0f16155dc8a5729bffe0057282c3232141b (patch) | |
tree | bfd474a5395c7e5b317ace20d12411ea74046c3c /poezio/tabs/conversationtab.py | |
parent | ae172f84ddb9ff9c2fc26dd5ee16c1edd38d08ba (diff) | |
download | poezio-326de0f16155dc8a5729bffe0057282c3232141b.tar.gz poezio-326de0f16155dc8a5729bffe0057282c3232141b.tar.bz2 poezio-326de0f16155dc8a5729bffe0057282c3232141b.tar.xz poezio-326de0f16155dc8a5729bffe0057282c3232141b.zip |
Factorise the /version callback and make it handle errors
Fixes #3376.
Diffstat (limited to 'poezio/tabs/conversationtab.py')
-rw-r--r-- | poezio/tabs/conversationtab.py | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/poezio/tabs/conversationtab.py b/poezio/tabs/conversationtab.py index 8b713b2d..a8a22b4a 100644 --- a/poezio/tabs/conversationtab.py +++ b/poezio/tabs/conversationtab.py @@ -19,7 +19,6 @@ import curses from poezio.tabs.basetabs import OneToOneTab, Tab from poezio import common -from poezio import fixes from poezio import windows from poezio import xhtml from poezio.common import safeJID @@ -240,18 +239,6 @@ class ConversationTab(OneToOneTab): """ /version [jid] """ - - def callback(res): - if not res: - return self.core.information( - 'Could not get the software version from %s' % (jid, ), - 'Warning') - version = '%s is running %s version %s on %s' % ( - jid, res.get('name') or 'an unknown software', - res.get('version') or 'unknown', - res.get('os') or 'an unknown platform') - self.core.information(version, 'Info') - if args: return self.core.command.version(args[0]) jid = safeJID(self.name) @@ -259,7 +246,8 @@ class ConversationTab(OneToOneTab): if jid in roster: resource = roster[jid].get_highest_priority_resource() jid = resource.jid if resource else jid - fixes.get_version(self.core.xmpp, jid, callback=callback) + self.core.xmpp.plugin['xep_0092'].get_version( + jid, callback=self.core.handler.on_version_result) @command_args_parser.ignored def command_add(self): |