pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #3050 (better /ping completion)

Browse source
This commit is contained in:
mathieui 2015-07-30 21:13:20 +02:00
parent f2c8c328e6
commit 2cc9918ee9
No known key found for this signature in database
GPG key ID: C59F84CEEFD616E3
1 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
plugins/ping.py
View file

@ -22,9 +22,11 @@ Command
the current interlocutor. the current interlocutor.
""" """
from decorators import command_args_parser
from plugin import BasePlugin from plugin import BasePlugin
from roster import roster from roster import roster
from common import safeJID from common import safeJID
from contact import Contact, Resource
import tabs import tabs
import time import time
@ -41,6 +43,11 @@ class Plugin(BasePlugin):
help='Send an XMPP ping to jid or nick (see XEP-0199).', help='Send an XMPP ping to jid or nick (see XEP-0199).',
short='Send a ping.', short='Send a ping.',
completion=self.completion_muc_ping) completion=self.completion_muc_ping)
self.api.add_tab_command(tabs.RosterInfoTab, 'ping', self.command_roster_ping,
usage='<jid>',
help='Send an XMPP ping to jid (see XEP-0199).',
short='Send a ping.',
completion=self.completion_ping)
for _class in (tabs.PrivateTab, tabs.ConversationTab): for _class in (tabs.PrivateTab, tabs.ConversationTab):
self.api.add_tab_command(_class, 'ping', self.command_private_ping, self.api.add_tab_command(_class, 'ping', self.command_private_ping,
usage='[jid]', usage='[jid]',
@ -48,6 +55,7 @@ class Plugin(BasePlugin):
short='Send a ping', short='Send a ping',
completion=self.completion_ping) completion=self.completion_ping)
@command_args_parser.raw
def command_ping(self, arg): def command_ping(self, arg):
if not arg: if not arg:
return self.core.command_help('ping') return self.core.command_help('ping')
@ -64,17 +72,19 @@ class Plugin(BasePlugin):
def completion_muc_ping(self, the_input): def completion_muc_ping(self, the_input):
users = [user.nick for user in self.api.current_tab().users] users = [user.nick for user in self.api.current_tab().users]
l = [contact.bare_jid for contact in roster.get_contacts()] l = self.resources()
users.extend(l) users.extend(l)
return the_input.auto_completion(users, '', quotify=False) return the_input.auto_completion(users, '', quotify=False)
@command_args_parser.raw
def command_private_ping(self, arg): def command_private_ping(self, arg):
if arg: if arg:
return self.command_ping(arg) return self.command_ping(arg)
self.command_ping(self.api.current_tab().name) self.command_ping(self.api.current_tab().name)
@command_args_parser.raw
def command_muc_ping(self, arg): def command_muc_ping(self, arg):
if not arg.strip(): if not arg:
return return
user = self.api.current_tab().get_user_by_name(arg) user = self.api.current_tab().get_user_by_name(arg)
if user: if user:
@ -84,7 +94,26 @@ class Plugin(BasePlugin):
jid = safeJID(arg) jid = safeJID(arg)
self.command_ping(jid.full) self.command_ping(jid.full)
def completion_ping(self, the_input): @command_args_parser.raw
l = [contact.bare_jid for contact in roster.get_contacts()] def command_roster_ping(self, arg):
return the_input.auto_completion(l, '', quotify=False) if arg:
self.command_ping(arg)
else:
current = self.api.current_tab().selected_row
if isinstance(current, Resource):
self.command_ping(current.jid)
elif isinstance(current, Contact):
res = current.get_highest_priority_resource()
if res is not None:
self.command_ping(res.jid)
def resources(self):
l = []
for contact in roster.get_contacts():
for resource in contact.resources:
l.append(resource.jid)
return l
def completion_ping(self, the_input):
return the_input.auto_completion(self.resources(), '', quotify=False)