Mercurial > libervia-web
diff src/server/server.py @ 566:8a607044ecfa
server_side: adapt to the new signatures of bridge method getHistory
| author | souliane <souliane@mailoo.org> |
|---|---|
| date | Sat, 04 Oct 2014 10:28:20 +0200 |
| parents | db1b330c1eb1 |
| children | 3eb3a2c0c011 a5019e62c3e9 |
line wrap: on
line diff
--- a/src/server/server.py Sat Oct 04 10:32:52 2014 +0200 +++ b/src/server/server.py Sat Oct 04 10:28:20 2014 +0200 @@ -353,7 +353,7 @@ profile = ISATSession(self.session).profile return self.sat_host.bridge.getPresenceStatuses(profile) - def jsonrpc_getHistory(self, from_jid, to_jid, size, between): + def jsonrpc_getHistory(self, from_jid, to_jid, size, between, search=''): """Return history for the from_jid/to_jid couple""" sat_session = ISATSession(self.session) profile = sat_session.profile @@ -364,7 +364,7 @@ if JID(from_jid).userhost() != sat_jid.userhost() and JID(to_jid).userhost() != sat_jid.userhost(): log.error("Trying to get history from a different jid, maybe a hack attempt ?") return {} - d = self.asyncBridgeCall("getHistory", from_jid, to_jid, size, between, profile) + d = self.asyncBridgeCall("getHistory", from_jid, to_jid, size, between, search, profile) def show(result_dbus): result = []