From 9ba50cb7ed7210600fb84172746fdb58dc3b2e1e Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 23 Oct 2017 19:30:35 +0200 Subject: Include the JID blocked instead of "Contact" It's useful to see what JID you blocked. Any JID can be blocked, so "Contact" isn't always accurate. --- poezio/tabs/rostertab.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'poezio') diff --git a/poezio/tabs/rostertab.py b/poezio/tabs/rostertab.py index e1a8f532..731120be 100644 --- a/poezio/tabs/rostertab.py +++ b/poezio/tabs/rostertab.py @@ -376,12 +376,6 @@ class RosterInfoTab(Tab): """ /block [jid] """ - def callback(iq): - if iq['type'] == 'error': - return self.core.information('Could not block the contact.', 'Error') - elif iq['type'] == 'result': - return self.core.information('Contact blocked.', 'Info') - item = self.roster_win.selected_row if args: jid = safeJID(args[0]) @@ -389,6 +383,13 @@ class RosterInfoTab(Tab): jid = item.bare_jid elif isinstance(item, Resource): jid = item.jid.bare + + def callback(iq): + if iq['type'] == 'error': + return self.core.information('Could not block %s.' % jid, 'Error') + elif iq['type'] == 'result': + return self.core.information('Blocked %s.' % jid, 'Info') + self.core.xmpp.plugin['xep_0191'].block(jid, callback=callback) def completion_block(self, the_input): -- cgit v1.2.3