erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

memory: getHistory with limit=0 now returns an empty list, use limit=None to return all messages

Browse source
This commit is contained in:
souliane 2014-10-03 12:43:59 +02:00
commit 4c61bf8fad
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/memory/memory.py
View file

@ -350,7 +350,7 @@ class Memory(object):
extra = {} extra = {}
return self.storage.addToHistory(from_jid, to_jid, message, type_, extra, timestamp, profile) return self.storage.addToHistory(from_jid, to_jid, message, type_, extra, timestamp, profile)
def getHistory(self, from_jid, to_jid, limit=0, between=True, profile=C.PROF_KEY_NONE): def getHistory(self, from_jid, to_jid, limit=None, between=True, profile=C.PROF_KEY_NONE):
assert profile != C.PROF_KEY_NONE assert profile != C.PROF_KEY_NONE
return self.storage.getHistory(jid.JID(from_jid), jid.JID(to_jid), limit, between, profile) return self.storage.getHistory(jid.JID(from_jid), jid.JID(to_jid), limit, between, profile)

8
src/memory/sqlite.py
View file

@ -264,13 +264,15 @@ class SqliteStorage(object):
{"from_jid": from_jid.full(), "to_jid": to_jid.full(), "message": message}))) {"from_jid": from_jid.full(), "to_jid": to_jid.full(), "message": message})))
return d return d
def getHistory(self, from_jid, to_jid, limit=0, between=True, profile=None): def getHistory(self, from_jid, to_jid, limit=None, between=True, profile=None):
"""Store a new message in history """Store a new message in history
@param from_jid: source JID (full, or bare for catchall @param from_jid: source JID (full, or bare for catchall
@param to_jid: dest JID (full, or bare for catchall @param to_jid: dest JID (full, or bare for catchall
@param size: maximum number of messages to get, or 0 for unlimited @param size: maximum number of messages to get, or None for unlimited
""" """
assert(profile) assert(profile)
if limit == 0:
return defer.succeed([])
def sqliteToList(query_result): def sqliteToList(query_result):
query_result.reverse() query_result.reverse()
@ -307,7 +309,7 @@ class SqliteStorage(object):
query_parts.append("ORDER BY timestamp DESC") query_parts.append("ORDER BY timestamp DESC")
if limit: if limit is not None:
query_parts.append("LIMIT ?") query_parts.append("LIMIT ?")
values.append(limit) values.append(limit)