core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1:
- QuickContactManagement is not used anymore and will be removed, ContactList + Core are used instead - disconnected contacts are now displayed in Primitivus (M-d to show/hide them) - avatars are temporary unavailable in wix - new bridge method: getContactsFromGroup
This commit is contained in:
parent
97420f39d5
commit
b44412ec0d
1 changed files with 207 additions and 130 deletions
|
|
@ -23,6 +23,7 @@ from twisted.internet import task, defer
|
|||
from twisted.words.protocols.jabber import jid, xmlstream
|
||||
from wokkel import client, disco, xmppim, generic, compat
|
||||
from logging import debug, info, error
|
||||
from sat.core import exceptions
|
||||
|
||||
|
||||
class SatXMPPClient(client.XMPPClient):
|
||||
|
|
@ -164,9 +165,9 @@ class SatRosterProtocol(xmppim.RosterClientProtocol):
|
|||
"""Return dictionary of attributes as used in bridge from a RosterItem
|
||||
@param item: RosterItem
|
||||
@return: dictionary of attributes"""
|
||||
item_attr = {'to': str(item.subscriptionTo),
|
||||
'from': str(item.subscriptionFrom),
|
||||
'ask': str(item.ask)
|
||||
item_attr = {'to': unicode(item.subscriptionTo),
|
||||
'from': unicode(item.subscriptionFrom),
|
||||
'ask': unicode(item.ask)
|
||||
}
|
||||
if item.name:
|
||||
item_attr['name'] = item.name
|
||||
|
|
@ -235,6 +236,12 @@ class SatRosterProtocol(xmppim.RosterClientProtocol):
|
|||
def getItems(self):
|
||||
"""Return all items of the roster"""
|
||||
return self._jids.values()
|
||||
|
||||
def getJidsFromGroup(self, group):
|
||||
try:
|
||||
return self._groups[group]
|
||||
except KeyError:
|
||||
return exceptions.UnknownGroupError
|
||||
|
||||
|
||||
class SatPresenceProtocol(xmppim.PresenceClientProtocol):
|
||||
|
|
|
|||
Loading…
Reference in a new issue