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

Merge 0.12->trunk

Browse source
This commit is contained in:
Kim Alvefur 2022-07-29 17:10:31 +02:00
commit 9a375e4444
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/mod_http_files.lua
View file

@ -74,8 +74,7 @@ function serve(opts)
if opts.index_files == nil then
opts.index_files = dir_indices;
end
-- TODO Crank up to warning
module:log("debug", "%s should be updated to use 'net.http.files' instead of mod_http_files", get_calling_module());
module:log("warn", "%s should be updated to use 'net.http.files' instead of mod_http_files", get_calling_module());
return fileserver.serve(opts);
end

6
plugins/mod_storage_sql.lua
View file

@ -543,8 +543,7 @@ function archive_store:summary(username, query)
SELECT DISTINCT "with", COUNT(*), MIN("when"), MAX("when")
FROM "prosodyarchive"
WHERE %s
GROUP BY "with"
ORDER BY "sort_id" %s%s;
GROUP BY "with";
]];
local args = { host, user or "", store, };
local where = { "\"host\" = ?", "\"user\" = ?", "\"store\" = ?", };
@ -557,8 +556,7 @@ function archive_store:summary(username, query)
args[#args+1] = query.limit;
end
sql_query = sql_query:format(t_concat(where, " AND "), query.reverse
and "DESC" or "ASC", query.limit and " LIMIT ?" or "");
sql_query = sql_query:format(t_concat(where, " AND "));
return engine:select(sql_query, unpack(args));
end);
if not ok then return ok, result end

17
spec/core_storagemanager_spec.lua
View file

@ -575,6 +575,23 @@ describe("storagemanager", function ()
end
end);
it("the summary api works", function()
assert.truthy(archive:delete("summary-user"));
local first_sid = archive:append("summary-user", nil, test_stanza, test_time, "contact@example.com");
local second_sid = archive:append("summary-user", nil, test_stanza, test_time+1, "contact@example.com");
assert.truthy(first_sid and second_sid, "preparations failed")
---
local user_summary, err = archive:summary("summary-user");
assert.is_table(user_summary, err);
assert.same({ ["contact@example.com"] = 2 }, user_summary.counts, "summary.counts matches");
assert.same({ ["contact@example.com"] = test_time }, user_summary.earliest, "summary.earliest matches");
assert.same({ ["contact@example.com"] = test_time+1 }, user_summary.latest, "summary.latest matches");
if user_summary.body then
assert.same({ ["contact@example.com"] = test_stanza:get_child_text("body") }, user_summary.body, "summary.body matches");
end
end);
end);
end);
end