groups general -> General
agents are now in Agents group, even if the server tells us it's in another group
This commit is contained in:
parent
fa68a12725
commit
caee2945d1
2 changed files with 7 additions and 8 deletions
|
@ -430,11 +430,11 @@ class plugin:
|
|||
if 'not in the roster' in u.groups:
|
||||
u.groups.remove('not in the roster')
|
||||
if len(u.groups) == 0:
|
||||
u.groups = ['general']
|
||||
u.groups = ['General']
|
||||
self.roster.add_user_to_roster(u.jid, account)
|
||||
self.send('UPDUSER', account, (u.jid, u.name, u.groups))
|
||||
else:
|
||||
user1 = User(jid, jid, ['general'], 'online', \
|
||||
user1 = User(jid, jid, ['General'], 'online', \
|
||||
'online', 'to', '', array[1], 0, '')
|
||||
self.roster.contacts[account][jid] = [user1]
|
||||
self.roster.add_user_to_roster(jid, account)
|
||||
|
|
|
@ -121,11 +121,10 @@ class roster_window:
|
|||
return
|
||||
users = self.contacts[account][jid]
|
||||
user = users[0]
|
||||
if user.groups == []:
|
||||
if user.jid.find("@") <= 0:
|
||||
user.groups.append('Agents')
|
||||
elif user.groups == []:
|
||||
user.groups.append('general')
|
||||
if user.jid.find("@") <= 0:
|
||||
user.groups = ['Agents']
|
||||
elif user.groups == []:
|
||||
user.groups.append('General')
|
||||
|
||||
if (user.show == 'offline' or user.show == 'error') and not showOffline\
|
||||
and not 'Agents' in user.groups and \
|
||||
|
@ -576,7 +575,7 @@ class roster_window:
|
|||
pseudo = jid
|
||||
self.plugin.send('SUB', account, (jid, txt))
|
||||
if not self.contacts[account].has_key(jid):
|
||||
user1 = User(jid, pseudo, ['general'], 'requested', \
|
||||
user1 = User(jid, pseudo, ['General'], 'requested', \
|
||||
'requested', 'none', 'subscribe', '', 0, '')
|
||||
self.contacts[account][jid] = [user1]
|
||||
self.add_user_to_roster(jid, account)
|
||||
|
|
Loading…
Add table
Reference in a new issue