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

Fix the completion for all commands manipulating the roster

Browse source
This commit is contained in:
mathieui 2012-04-27 22:34:12 +02:00
parent 6743bb5d94
commit 2957cded91
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core.py
View file

@ -468,7 +468,7 @@ class Core(object):
if txt.endswith(' '): if txt.endswith(' '):
n += 1 n += 1
if n == 2: if n == 2:
return the_input.auto_completion([contact.bare_jid for contact in roster.get_contacts()], '') return the_input.auto_completion([jid for jid in roster.jids()], '')
elif n == 3: elif n == 3:
rooms = [] rooms = []
for tab in self.tabs: for tab in self.tabs:
@ -683,7 +683,7 @@ class Core(object):
self.information(_("Your JID is %s") % self.xmpp.boundjid.full) self.information(_("Your JID is %s") % self.xmpp.boundjid.full)
if not self.xmpp.anon: if not self.xmpp.anon:
# request the roster # request the roster
self.xmpp.getRoster() self.xmpp.get_roster()
# send initial presence # send initial presence
if config.get('send_initial_presence', 'true').lower() == 'true': if config.get('send_initial_presence', 'true').lower() == 'true':
pres = self.xmpp.make_presence() pres = self.xmpp.make_presence()
@ -1485,7 +1485,7 @@ class Core(object):
if text.endswith(' '): if text.endswith(' '):
n += 1 n += 1
if n == 2: if n == 2:
return the_input.auto_completion([contact.bare_jid for contact in roster.get_contacts()], '') return the_input.auto_completion([jid for jid in roster.jids()], '')
elif n == 3: elif n == 3:
return the_input.auto_completion([status for status in possible_show], '') return the_input.auto_completion([status for status in possible_show], '')
@ -1744,7 +1744,7 @@ class Core(object):
n = len(the_input.get_text().split()) n = len(the_input.get_text().split())
if n > 2 or (n == 2 and the_input.get_text().endswith(' ')): if n > 2 or (n == 2 and the_input.get_text().endswith(' ')):
return return
return the_input.auto_completion([contact.bare_jid for contact in roster.get_contacts()], '') return the_input.auto_completion([jid for jid in roster.jids()], '')
def completion_list(self, the_input): def completion_list(self, the_input):
muc_serv_list = [] muc_serv_list = []

20
src/tabs.py
View file

@ -627,7 +627,7 @@ class MucTab(ChatTab):
compare_users = lambda x: x.last_talked compare_users = lambda x: x.last_talked
userlist = [user.nick for user in sorted(self.users, key=compare_users, reverse=True)\ userlist = [user.nick for user in sorted(self.users, key=compare_users, reverse=True)\
if user.nick != self.own_nick] if user.nick != self.own_nick]
contact_list = [contact.bare_jid for contact in roster.get_contacts()] contact_list = [jid for jid in roster.jids()]
userlist.extend(contact_list) userlist.extend(contact_list)
return the_input.auto_completion(userlist, '') return the_input.auto_completion(userlist, '')
@ -1962,7 +1962,7 @@ class RosterInfoTab(Tab):
""" """
From with any JID presence in the roster From with any JID presence in the roster
""" """
jids = [contact.bare_jid for contact in roster.get_contacts()] jids = [jid for jid in roster.jids()]
return the_input.auto_completion(jids, '') return the_input.auto_completion(jids, '')
def completion_name(self, the_input): def completion_name(self, the_input):
@ -1972,7 +1972,7 @@ class RosterInfoTab(Tab):
n += 1 n += 1
if n == 2: if n == 2:
jids = [contact.bare_jid for contact in roster.get_contacts()] jids = [jid for jid in roster.jids()]
return the_input.auto_completion(jids, '') return the_input.auto_completion(jids, '')
return False return False
@ -1983,10 +1983,10 @@ class RosterInfoTab(Tab):
n += 1 n += 1
if n == 2: if n == 2:
jids = [contact.bare_jid for contact in roster.get_contacts()] jids = [jid for jid in roster.jids()]
return the_input.auto_completion(jids, '') return the_input.auto_completion(jids, '')
elif n == 3: elif n == 3:
groups = [group.name for group in roster.get_groups() if group.name != 'none'] groups = [group for group in roster.groups if group != 'none']
return the_input.auto_completion(groups, '') return the_input.auto_completion(groups, '')
return False return False
@ -1998,11 +1998,11 @@ class RosterInfoTab(Tab):
n += 1 n += 1
if n == 2: if n == 2:
jids = [contact.bare_jid for contact in roster.get_contacts()] jids = [jid for jid in roster.jids()]
return the_input.auto_completion(jids, '') return the_input.auto_completion(jids, '')
elif n == 3: elif n == 3:
contact = roster.get_contact_by_jid(args[1]) contact = roster[args[1]]
if not contact: if contact is None:
return False return False
groups = list(contact.groups) groups = list(contact.groups)
try: try:
@ -2017,8 +2017,8 @@ class RosterInfoTab(Tab):
Complete the first argument from the list of the Complete the first argument from the list of the
contact with ask=='subscribe' contact with ask=='subscribe'
""" """
jids = [contact.bare_jid for contact in roster.get_contacts()\ jids = [str(contact.bare_jid) for contact in roster.contacts.values()\
if contact.ask == 'asked'] if contact.pending_in]
return the_input.auto_completion(jids, '') return the_input.auto_completion(jids, '')
def command_accept(self, args): def command_accept(self, args):