core, bridge, quick_frontend: MUC private messages history management:
- history now store message type
- sqlite3 storage: fixed resource management in getHistory
- bridge: added message type in getHistory return value
- quick_chats: (ugly) hacks to manage private history filtering/nickname printing
This commit is contained in:
parent
d5fac19b9e
commit
fef2b1a620
2 changed files with 52 additions and 30 deletions
|
|
@ -268,7 +268,7 @@ class DbusObject(dbus.service.Object):
|
|||
return self._callback("getEntityData", unicode(jid), keys, unicode(profile))
|
||||
|
||||
@dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
|
||||
in_signature='ssib', out_signature='a(dsss)',
|
||||
in_signature='ssib', out_signature='a(dssss)',
|
||||
async_callbacks=('callback', 'errback'))
|
||||
def getHistory(self, from_jid, to_jid, limit, between=True, callback=None, errback=None):
|
||||
return self._callback("getHistory", unicode(from_jid), unicode(to_jid), limit, between, callback=callback, errback=errback)
|
||||
|
|
|
|||
|
|
@ -462,14 +462,14 @@ async=
|
|||
type=method
|
||||
category=core
|
||||
sig_in=ssib
|
||||
sig_out=a(dsss)
|
||||
sig_out=a(dssss)
|
||||
param_3_default=True
|
||||
doc=Get history of a communication between two entities
|
||||
doc_param_0=from_jid: source JID (bare jid for catch all, full jid else)
|
||||
doc_param_1=to_jid: dest JID (bare jid for catch all, full jid else)
|
||||
doc_param_2=limit: max number of history elements to get (0 for the whole history)
|
||||
doc_param_3=between: True if we want history between the two jids (in both direction), False if we only want messages from from_jid to to_jid
|
||||
doc_return=Ordered list (by timestamp) of tuples (timestamp, full from_jid, full to_jid, message)
|
||||
doc_return=Ordered list (by timestamp) of tuples (timestamp, full from_jid, full to_jid, message, type)
|
||||
|
||||
[addContact]
|
||||
type=method
|
||||
|
|
|
|||
Loading…
Reference in a new issue