mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_storage_internal,memory: Only return total count if requested

Browse source
This commit is contained in:
Kim Alvefur 2019-05-05 08:12:16 +02:00
parent a371d01137
commit 637b52a13e
2 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/mod_storage_internal.lua
View file

@ -124,11 +124,14 @@ function archive:find(username, query)
if not items then
if err then
return items, err;
else
return function () end, 0;
elseif query then
if query.total then
return function () end, 0;
end
end
return function () end;
end
local count = #items;
local count = nil;
local i = 0;
if query then
items = array(items);
@ -152,11 +155,13 @@ function archive:find(username, query)
return item.when <= query["end"];
end);
end
count = #items;
if query.total then
count = #items;
end
if query.reverse then
items:reverse();
if query.before then
for j = 1, count do
for j = 1, #items do
if (items[j].key or tostring(j)) == query.before then
i = j;
break;
@ -164,7 +169,7 @@ function archive:find(username, query)
end
end
elseif query.after then
for j = 1, count do
for j = 1, #items do
if (items[j].key or tostring(j)) == query.after then
i = j;
break;

17
plugins/mod_storage_memory.lua
View file

@ -90,9 +90,14 @@ end
function archive_store:find(username, query)
local items = self.store[username or NULL];
if not items then
return function () end, 0;
if query then
if query.total then
return function () end, 0;
end
end
return function () end;
end
local count = #items;
local count = nil;
local i = 0;
if query then
items = array():append(items);
@ -116,11 +121,13 @@ function archive_store:find(username, query)
return item.when <= query["end"];
end);
end
count = #items;
if query.total then
count = #items;
end
if query.reverse then
items:reverse();
if query.before then
for j = 1, count do
for j = 1, #items do
if (items[j].key or tostring(j)) == query.before then
i = j;
break;
@ -128,7 +135,7 @@ function archive_store:find(username, query)
end
end
elseif query.after then
for j = 1, count do
for j = 1, #items do
if (items[j].key or tostring(j)) == query.after then
i = j;
break;