From 2b289f34f929a69424a22bb0de3b668a58ba80cd Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 8 Dec 2018 17:09:55 +0100
Subject: various: Don't rely on _G.unpack existing

---
 plugins/mod_storage_sql.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 56cef569..5c0c0208 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -11,7 +11,7 @@ local is_stanza = require"util.stanza".is_stanza;
 local t_concat = table.concat;
 
 local noop = function() end
-local unpack = table.unpack or unpack;
+local unpack = table.unpack or unpack; -- luacheck: ignore 113
 local function iterator(result)
 	return function(result_)
 		local row = result_();
-- 
cgit v1.2.3


From d7761bd914bd38e43de12c248196bc81307c71c5 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 20 Oct 2017 12:53:53 +0200
Subject: mod_storage_internal,_sql: Add limit to number of items in an archive
 store (fixes #733)

---
 plugins/mod_storage_sql.lua | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 5c0c0208..4fe2a262 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -1,6 +1,7 @@
 
 -- luacheck: ignore 212/self
 
+local cache = require "util.cache";
 local json = require "util.json";
 local sql = require "util.sql";
 local xml_parse = require "util.xml".parse;
@@ -148,6 +149,9 @@ end
 
 --- Archive store API
 
+local archive_item_limit = module:get_option_number("storage_archive_item_limit", 1000);
+local archive_item_count_cache = cache.new(module:get_option("storage_archive_item_limit_cache_size", 1000));
+
 -- luacheck: ignore 512 431/user 431/store
 local map_store = {};
 map_store.__index = map_store;
@@ -231,6 +235,32 @@ archive_store.caps = {
 };
 archive_store.__index = archive_store
 function archive_store:append(username, key, value, when, with)
+	local item_count = archive_item_count_cache:get(username);
+	if not item_count then
+		local ok, ret = engine:transaction(function()
+			local count_sql = [[
+			SELECT COUNT(*) FROM "prosodyarchive"
+			WHERE "host"=? AND "user"=? AND "store"=?;
+			]];
+			local result = engine:select(count_sql, host, user, store);
+			if result then
+				for row in result do
+					item_count = row[1];
+				end
+			end
+		end);
+		if not ok or not item_count then
+			module:log("error", "Failed while checking quota for %s: %s", username, ret);
+			return nil, "Failure while checking quota";
+		end
+		archive_item_count_cache:set(username, item_count);
+	end
+
+	module:log("debug", "%s has %d items out of %d limit", username, item_count, archive_item_limit);
+	if item_count >= archive_item_limit then
+		return nil, "quota-limit";
+	end
+
 	local user,store = username,self.store;
 	when = when or os.time();
 	with = with or "";
@@ -245,12 +275,18 @@ function archive_store:append(username, key, value, when, with)
 		VALUES (?,?,?,?,?,?,?,?);
 		]];
 		if key then
-			engine:delete(delete_sql, host, user or "", store, key);
+			local result, err = engine:delete(delete_sql, host, user or "", store, key);
+			if result then
+				item_count = item_count - result:affected();
+				archive_item_count_cache:set(username, item_count);
+			end
 		else
+			item_count = item_count + 1;
 			key = uuid.generate();
 		end
 		local t, encoded_value = assert(serialize(value));
 		engine:insert(insert_sql, host, user or "", store, when, with, key, t, encoded_value);
+		archive_item_count_cache:set(username, item_count+1);
 		return key;
 	end);
 	if not ok then return ok, ret; end
@@ -422,6 +458,7 @@ function archive_store:delete(username, query)
 		end
 		return engine:delete(sql_query, unpack(args));
 	end);
+	archive_item_count_cache:set(username, nil);
 	return ok and stmt:affected(), stmt;
 end
 
-- 
cgit v1.2.3


From 0028ea46e2aed1e0522da59b3d31912afea2c54a Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 22 Mar 2019 18:01:24 +0100
Subject: mod_storage_internal,_sql: Expose archive capabilities feature set

This was planned to be added long ago but was forgotten.
---
 plugins/mod_storage_sql.lua | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 4fe2a262..82c5c3fe 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -232,6 +232,8 @@ end
 local archive_store = {}
 archive_store.caps = {
 	total = true;
+	quota = archive_item_limit;
+	truncate = true;
 };
 archive_store.__index = archive_store
 function archive_store:append(username, key, value, when, with)
-- 
cgit v1.2.3


From 9eb4885f38891261621cd18aa206883851acbaab Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 22 Mar 2019 18:02:27 +0100
Subject: mod_storage_internal,_sql: Key item count cache on both username and
 store

---
 plugins/mod_storage_sql.lua | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 82c5c3fe..3028bb72 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -7,6 +7,7 @@ local sql = require "util.sql";
 local xml_parse = require "util.xml".parse;
 local uuid = require "util.uuid";
 local resolve_relative_path = require "util.paths".resolve_relative_path;
+local jid_join = require "util.jid".join;
 
 local is_stanza = require"util.stanza".is_stanza;
 local t_concat = table.concat;
@@ -237,7 +238,8 @@ archive_store.caps = {
 };
 archive_store.__index = archive_store
 function archive_store:append(username, key, value, when, with)
-	local item_count = archive_item_count_cache:get(username);
+	local cache_key = jid_join(username, host, self.store);
+	local item_count = archive_item_count_cache:get(cache_key);
 	if not item_count then
 		local ok, ret = engine:transaction(function()
 			local count_sql = [[
@@ -255,7 +257,7 @@ function archive_store:append(username, key, value, when, with)
 			module:log("error", "Failed while checking quota for %s: %s", username, ret);
 			return nil, "Failure while checking quota";
 		end
-		archive_item_count_cache:set(username, item_count);
+		archive_item_count_cache:set(cache_key, item_count);
 	end
 
 	module:log("debug", "%s has %d items out of %d limit", username, item_count, archive_item_limit);
@@ -280,7 +282,7 @@ function archive_store:append(username, key, value, when, with)
 			local result, err = engine:delete(delete_sql, host, user or "", store, key);
 			if result then
 				item_count = item_count - result:affected();
-				archive_item_count_cache:set(username, item_count);
+				archive_item_count_cache:set(cache_key, item_count);
 			end
 		else
 			item_count = item_count + 1;
@@ -288,7 +290,7 @@ function archive_store:append(username, key, value, when, with)
 		end
 		local t, encoded_value = assert(serialize(value));
 		engine:insert(insert_sql, host, user or "", store, when, with, key, t, encoded_value);
-		archive_item_count_cache:set(username, item_count+1);
+		archive_item_count_cache:set(cache_key, item_count+1);
 		return key;
 	end);
 	if not ok then return ok, ret; end
@@ -460,7 +462,8 @@ function archive_store:delete(username, query)
 		end
 		return engine:delete(sql_query, unpack(args));
 	end);
-	archive_item_count_cache:set(username, nil);
+	local cache_key = jid_join(username, host, self.store);
+	archive_item_count_cache:set(cache_key, nil);
 	return ok and stmt:affected(), stmt;
 end
 
-- 
cgit v1.2.3


From 3e5243f2d2df3e4933a9bd7fdaf13c848265178e Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 22 Mar 2019 02:09:38 +0100
Subject: mod_storage_sql: Don't increment counter twice (fixes accounting
 error)

---
 plugins/mod_storage_sql.lua | 1 -
 1 file changed, 1 deletion(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 3028bb72..154daf06 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -285,7 +285,6 @@ function archive_store:append(username, key, value, when, with)
 				archive_item_count_cache:set(cache_key, item_count);
 			end
 		else
-			item_count = item_count + 1;
 			key = uuid.generate();
 		end
 		local t, encoded_value = assert(serialize(value));
-- 
cgit v1.2.3


From 61edbdb90f50b71c6a13f24e7621b561fef9b3ac Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 22 Mar 2019 02:10:46 +0100
Subject: mod_storage_sql: Fix to use currently queried store

Was using the previously queried store due to this being cached in an
upvalue.
---
 plugins/mod_storage_sql.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 154daf06..325fab94 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -238,7 +238,8 @@ archive_store.caps = {
 };
 archive_store.__index = archive_store
 function archive_store:append(username, key, value, when, with)
-	local cache_key = jid_join(username, host, self.store);
+	local user,store = username,self.store;
+	local cache_key = jid_join(username, host, store);
 	local item_count = archive_item_count_cache:get(cache_key);
 	if not item_count then
 		local ok, ret = engine:transaction(function()
@@ -265,7 +266,6 @@ function archive_store:append(username, key, value, when, with)
 		return nil, "quota-limit";
 	end
 
-	local user,store = username,self.store;
 	when = when or os.time();
 	with = with or "";
 	local ok, ret = engine:transaction(function()
-- 
cgit v1.2.3


From 56a9e395ade713122fd2251a64232abd270cadbe Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 22 Mar 2019 02:12:02 +0100
Subject: mod_storage_sql: Skip cache write

This would cause the cache to be wrong in case the the later INSERT
fails and the transaction is aborted.
---
 plugins/mod_storage_sql.lua | 1 -
 1 file changed, 1 deletion(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 325fab94..35a16870 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -282,7 +282,6 @@ function archive_store:append(username, key, value, when, with)
 			local result, err = engine:delete(delete_sql, host, user or "", store, key);
 			if result then
 				item_count = item_count - result:affected();
-				archive_item_count_cache:set(cache_key, item_count);
 			end
 		else
 			key = uuid.generate();
-- 
cgit v1.2.3


From 5029870d3eee5bbe50c012fe1e7f4ee62e62ee24 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 22 Mar 2019 02:13:27 +0100
Subject: mod_storage_sql: Cache total count if it's calculated as part of the
 current query

---
 plugins/mod_storage_sql.lua | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 35a16870..b3bd5171 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -384,6 +384,9 @@ function archive_store:find(username, query)
 					total = row[1];
 				end
 			end
+			if query.start == nil and query.with == nil and query["end"] == nil and query.key == nil then
+				archive_item_count_cache:set(cache_key, total);
+			end
 			if query.limit == 0 then -- Skip the real query
 				return noop, total;
 			end
-- 
cgit v1.2.3


From 9393931a25367390465b480b8dbaa38e9f199b54 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 22 Mar 2019 02:18:54 +0100
Subject: mod_storage_sql: Return cached count if only this is queried for

---
 plugins/mod_storage_sql.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index b3bd5171..8c03da01 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -362,7 +362,11 @@ end
 function archive_store:find(username, query)
 	query = query or {};
 	local user,store = username,self.store;
-	local total;
+	local cache_key = jid_join(username, host, self.store);
+	local total = archive_item_count_cache:get(cache_key);
+	if total ~= nil and query.limit == 0 and query.start == nil and query.with == nil and query["end"] == nil and query.key == nil then
+		return noop, total;
+	end
 	local ok, result = engine:transaction(function()
 		local sql_query = [[
 		SELECT "key", "type", "value", "when", "with"
-- 
cgit v1.2.3


From 8cc789c7968e0f578eba70be1be13b1645e52914 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 22 Mar 2019 16:30:53 +0100
Subject: mod_storage_sql: No archive item limit by default

---
 plugins/mod_storage_sql.lua | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 8c03da01..6b26759f 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -150,7 +150,7 @@ end
 
 --- Archive store API
 
-local archive_item_limit = module:get_option_number("storage_archive_item_limit", 1000);
+local archive_item_limit = module:get_option_number("storage_archive_item_limit");
 local archive_item_count_cache = cache.new(module:get_option("storage_archive_item_limit_cache_size", 1000));
 
 -- luacheck: ignore 512 431/user 431/store
@@ -261,9 +261,11 @@ function archive_store:append(username, key, value, when, with)
 		archive_item_count_cache:set(cache_key, item_count);
 	end
 
-	module:log("debug", "%s has %d items out of %d limit", username, item_count, archive_item_limit);
-	if item_count >= archive_item_limit then
-		return nil, "quota-limit";
+	if archive_item_limit then
+		module:log("debug", "%s has %d items out of %d limit", username, item_count, archive_item_limit);
+		if item_count >= archive_item_limit then
+			return nil, "quota-limit";
+		end
 	end
 
 	when = when or os.time();
-- 
cgit v1.2.3


From a32b5ceb4576f8fefeea0f68aae1f81dd942125d Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Mon, 25 Feb 2019 15:51:55 +0100
Subject: mod_storage_sql: Implement archive summary API

---
 plugins/mod_storage_sql.lua | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 6b26759f..ffe48ab8 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -419,6 +419,41 @@ function archive_store:find(username, query)
 	end, total;
 end
 
+function archive_store:summary(username, query)
+	query = query or {};
+	local user,store = username,self.store;
+	local ok, result = engine:transaction(function()
+		local sql_query = [[
+		SELECT DISTINCT "with", COUNT(*)
+		FROM "prosodyarchive"
+		WHERE %s
+		GROUP BY "with"
+		ORDER BY "sort_id" %s%s;
+		]];
+		local args = { host, user or "", store, };
+		local where = { "\"host\" = ?", "\"user\" = ?", "\"store\" = ?", };
+
+		archive_where(query, args, where);
+
+		archive_where_id_range(query, args, where);
+
+		if query.limit then
+			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 "");
+		return engine:select(sql_query, unpack(args));
+	end);
+	if not ok then return ok, result end
+	local summary = {};
+	for row in result do
+		local with, count = row[1], row[2];
+		summary[with] = count;
+	end
+	return summary;
+end
+
 function archive_store:delete(username, query)
 	query = query or {};
 	local user,store = username,self.store;
-- 
cgit v1.2.3


From 40040cdfbca7a934bb5e1256a9fdd403350eeaae Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sun, 5 May 2019 16:26:01 +0200
Subject: mod_storage_sql: Add support for iterating over users in archive
 stores

---
 plugins/mod_storage_sql.lua | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index ffe48ab8..596687ae 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -509,6 +509,19 @@ function archive_store:delete(username, query)
 	return ok and stmt:affected(), stmt;
 end
 
+function archive_store:users()
+	local ok, result = engine:transaction(function()
+		local select_sql = [[
+		SELECT DISTINCT "user"
+		FROM "prosodyarchive"
+		WHERE "host"=? AND "store"=?;
+		]];
+		return engine:select(select_sql, host, self.store);
+	end);
+	if not ok then error(result); end
+	return iterator(result);
+end
+
 local stores = {
 	keyval = keyval_store;
 	map = map_store;
-- 
cgit v1.2.3


From a770a8430662ca624d81bdf4e23e8da5356c82ac Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 23 Mar 2019 00:51:10 +0100
Subject: mod_storage_sql: Look up archive IDs in separate queries (fixes
 #1325)

This is probably not good for performance.
---
 plugins/mod_storage_sql.lua | 58 ++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index f0a8fee0..5da5e448 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -327,38 +327,36 @@ local function archive_where(query, args, where)
 	end
 end
 local function archive_where_id_range(query, args, where)
-	local args_len = #args
 	-- Before or after specific item, exclusive
+	local id_lookup_sql = [[
+	SELECT "sort_id"
+	FROM "prosodyarchive"
+	WHERE "key" = ? AND "host" = ? AND "user" = ? AND "store" = ?
+	LIMIT 1;
+	]];
 	if query.after then  -- keys better be unique!
-		where[#where+1] = [[
-		"sort_id" > COALESCE(
-			(
-				SELECT "sort_id"
-				FROM "prosodyarchive"
-				WHERE "key" = ? AND "host" = ? AND "user" = ? AND "store" = ?
-				LIMIT 1
-			), 0)
-		]];
-		args[args_len+1], args[args_len+2], args[args_len+3], args[args_len+4] = query.after, args[1], args[2], args[3];
-		args_len = args_len + 4
+		local after_id = nil;
+		for row in engine:select(id_lookup_sql, query.after, host, user or "", store) do
+			after_id = row[1];
+		end
+		if not after_id then
+			return nil, "item-not-found";
+		end
+		where[#where+1] = '"sort_id" > ?';
+		args[#args+1] = after_id;
 	end
 	if query.before then
-		where[#where+1] = [[
-		"sort_id" < COALESCE(
-			(
-				SELECT "sort_id"
-				FROM "prosodyarchive"
-				WHERE "key" = ? AND "host" = ? AND "user" = ? AND "store" = ?
-				LIMIT 1
-			),
-			(
-				SELECT MAX("sort_id")+1
-				FROM "prosodyarchive"
-			)
-		)
-		]]
-		args[args_len+1], args[args_len+2], args[args_len+3], args[args_len+4] = query.before, args[1], args[2], args[3];
+		local before_id = nil;
+		for row in engine:select(id_lookup_sql, query.after, host, user or "", store) do
+			before_id = row[1];
+		end
+		if not before_id then
+			return nil, "item-not-found";
+		end
+		where[#where+1] = '"sort_id" < ?';
+		args[#args+1] = before_id;
 	end
+	return true;
 end
 
 function archive_store:find(username, query)
@@ -398,7 +396,8 @@ function archive_store:find(username, query)
 			end
 		end
 
-		archive_where_id_range(query, args, where);
+		local ok, err = archive_where_id_range(query, args, where);
+		if not ok then return ok, err; end
 
 		if query.limit then
 			args[#args+1] = query.limit;
@@ -466,7 +465,8 @@ function archive_store:delete(username, query)
 			table.remove(where, 2);
 		end
 		archive_where(query, args, where);
-		archive_where_id_range(query, args, where);
+		local ok, err = archive_where_id_range(query, args, where);
+		if not ok then return ok, err; end
 		if query.truncate == nil then
 			sql_query = sql_query:format(t_concat(where, " AND "));
 		else
-- 
cgit v1.2.3


From 5a2a81bfe97c366e6da39442534b4e58ba64ae71 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Tue, 28 May 2019 00:46:24 +0200
Subject: mod_storage_sql: Correctly return item-not-found error

`return ok, err` comes out as `transaction_ok, ok, err`
---
 plugins/mod_storage_sql.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 5da5e448..cfc8450c 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -367,7 +367,7 @@ function archive_store:find(username, query)
 	if total ~= nil and query.limit == 0 and query.start == nil and query.with == nil and query["end"] == nil and query.key == nil then
 		return noop, total;
 	end
-	local ok, result = engine:transaction(function()
+	local ok, result, err = engine:transaction(function()
 		local sql_query = [[
 		SELECT "key", "type", "value", "when", "with"
 		FROM "prosodyarchive"
@@ -407,7 +407,8 @@ function archive_store:find(username, query)
 			and "DESC" or "ASC", query.limit and " LIMIT ?" or "");
 		return engine:select(sql_query, unpack(args));
 	end);
-	if not ok then return ok, result end
+	if not ok then return ok, result; end
+	if not result then return nil, err; end
 	return function()
 		local row = result();
 		if row ~= nil then
-- 
cgit v1.2.3


From 7b63f8d95dcc99df5508a05c60fe472dfc2a4282 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Tue, 28 May 2019 00:47:50 +0200
Subject: mod_storage_sql: Fix to use correct arguments to archive id lookup

---
 plugins/mod_storage_sql.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index cfc8450c..ad2de840 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -336,7 +336,7 @@ local function archive_where_id_range(query, args, where)
 	]];
 	if query.after then  -- keys better be unique!
 		local after_id = nil;
-		for row in engine:select(id_lookup_sql, query.after, host, user or "", store) do
+		for row in engine:select(id_lookup_sql, query.after, args[1], args[2], args[3]) do
 			after_id = row[1];
 		end
 		if not after_id then
@@ -347,7 +347,7 @@ local function archive_where_id_range(query, args, where)
 	end
 	if query.before then
 		local before_id = nil;
-		for row in engine:select(id_lookup_sql, query.after, host, user or "", store) do
+		for row in engine:select(id_lookup_sql, query.after, args[1], args[2], args[3]) do
 			before_id = row[1];
 		end
 		if not before_id then
-- 
cgit v1.2.3


From 2a65eae651302a17c925e0340e59e73976aa07fb Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Tue, 28 May 2019 00:56:30 +0200
Subject: mod_storage_sql: Ignore shadowed error variable [luacheck]

---
 plugins/mod_storage_sql.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index ad2de840..518e2654 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -153,7 +153,7 @@ end
 local archive_item_limit = module:get_option_number("storage_archive_item_limit");
 local archive_item_count_cache = cache.new(module:get_option("storage_archive_item_limit_cache_size", 1000));
 
--- luacheck: ignore 512 431/user 431/store
+-- luacheck: ignore 512 431/user 431/store 431/err
 local map_store = {};
 map_store.__index = map_store;
 map_store.remove = {};
-- 
cgit v1.2.3


From 39cb87a158a017441e129ed8514f83bfbfdae64f Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 23 Aug 2019 01:04:00 +0200
Subject: mod_storage_*: Tweak :summary API to allow future expansion with more
 fields

Eg might want to include last message, timestamp, chat state or other info.
---
 plugins/mod_storage_sql.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 518e2654..d6779946 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -446,12 +446,14 @@ function archive_store:summary(username, query)
 		return engine:select(sql_query, unpack(args));
 	end);
 	if not ok then return ok, result end
-	local summary = {};
+	local counts = {};
 	for row in result do
 		local with, count = row[1], row[2];
-		summary[with] = count;
+		counts[with] = count;
 	end
-	return summary;
+	return {
+		counts = counts;
+	};
 end
 
 function archive_store:delete(username, query)
-- 
cgit v1.2.3


From d3c559bcc89ef91ebecde3cc3b4520873a98ea4d Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 23 Aug 2019 01:10:27 +0200
Subject: mod_storage_*: Include timestamp of latest message in :summary API

Clients may want to show a list of conversations ordered by how
timestamp of most recent message.

The counts allow a badge with unread message counter.
---
 plugins/mod_storage_sql.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index d6779946..dc960cad 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -424,7 +424,7 @@ function archive_store:summary(username, query)
 	local user,store = username,self.store;
 	local ok, result = engine:transaction(function()
 		local sql_query = [[
-		SELECT DISTINCT "with", COUNT(*)
+		SELECT DISTINCT "with", COUNT(*), MAX("when")
 		FROM "prosodyarchive"
 		WHERE %s
 		GROUP BY "with"
@@ -447,12 +447,15 @@ function archive_store:summary(username, query)
 	end);
 	if not ok then return ok, result end
 	local counts = {};
+	local latest = {};
 	for row in result do
 		local with, count = row[1], row[2];
 		counts[with] = count;
+		latest[with] = row[3];
 	end
 	return {
 		counts = counts;
+		latest = latest;
 	};
 end
 
-- 
cgit v1.2.3


From 9d5e31fd481a38bc7e346697cdacb8ef5cbd1ae5 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 23 Aug 2019 01:15:44 +0200
Subject: mod_storage_*: Also include timestmap of first message in :summary
 API

For completeness along with most recent timestamp. Might be nice to be
able to order by oldest unread message.
---
 plugins/mod_storage_sql.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'plugins/mod_storage_sql.lua')

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index dc960cad..666cee41 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -424,7 +424,7 @@ function archive_store:summary(username, query)
 	local user,store = username,self.store;
 	local ok, result = engine:transaction(function()
 		local sql_query = [[
-		SELECT DISTINCT "with", COUNT(*), MAX("when")
+		SELECT DISTINCT "with", COUNT(*), MIN("when"), MAX("when")
 		FROM "prosodyarchive"
 		WHERE %s
 		GROUP BY "with"
@@ -447,14 +447,16 @@ function archive_store:summary(username, query)
 	end);
 	if not ok then return ok, result end
 	local counts = {};
-	local latest = {};
+	local earliest, latest = {}, {};
 	for row in result do
 		local with, count = row[1], row[2];
 		counts[with] = count;
-		latest[with] = row[3];
+		earliest[with] = row[3];
+		latest[with] = row[4];
 	end
 	return {
 		counts = counts;
+		earliest = earliest;
 		latest = latest;
 	};
 end
-- 
cgit v1.2.3