Changeset

--- a/CHANGES	Sun Feb 09 16:27:28 2025 +0100
+++ b/CHANGES	Wed Feb 12 12:34:29 2025 +0000
@@ -1,6 +1,9 @@
 TRUNK
 =====
 
+13.0.x
+======
+
 ## New
 
 ### Administration

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/mod_account_activity.lua	Wed Feb 12 12:34:29 2025 +0000
@@ -0,0 +1,109 @@
+local jid = require "util.jid";
+local time = os.time;
+
+local store = module:open_store(nil, "keyval+");
+
+module:hook("authentication-success", function(event)
+	local session = event.session;
+	if session.username then
+		store:set_key(session.username, "timestamp", time());
+	end
+end);
+
+module:hook("resource-unbind", function(event)
+	local session = event.session;
+	if session.username then
+		store:set_key(session.username, "timestamp", time());
+	end
+end);
+
+local user_sessions = prosody.hosts[module.host].sessions;
+function get_last_active(username) --luacheck: ignore 131/get_last_active
+	if user_sessions[username] then
+		return os.time(), true; -- Currently connected
+	else
+		local last_activity = store:get(username);
+		if not last_activity then return nil; end
+		return last_activity.timestamp;
+	end
+end
+
+module:add_item("shell-command", {
+	section = "user";
+	section_desc = "View user activity data";
+	name = "activity";
+	desc = "View the last recorded user activity for an account";
+	args = { { name = "jid"; type = "string" } };
+	host_selector = "jid";
+	handler = function(self, userjid) --luacheck: ignore 212/self
+		local username = jid.prepped_split(userjid);
+		local last_timestamp, is_online = get_last_active(username);
+		if not last_timestamp then
+			return true, "No activity";
+		end
+
+		return true, ("%s (%s)"):format(os.date("%Y-%m-%d %H:%M:%S", last_timestamp), (is_online and "online" or "offline"));
+	end;
+});
+
+module:add_item("shell-command", {
+	section = "migrate";
+	section_desc = "Perform data migrations";
+	name = "account_activity_lastlog2";
+	desc = "Migrate account activity information from mod_lastlog2";
+	args = { { name = "host"; type = "string" } };
+	host_selector = "host";
+	handler = function(self, host) --luacheck: ignore 212/host
+		local lastlog2 = module:open_store("lastlog2", "keyval+");
+		local n_updated, n_errors, n_skipped = 0, 0, 0;
+
+		local async = require "util.async";
+
+		local p = require "util.promise".new(function (resolve)
+			local async_runner = async.runner(function ()
+				local n = 0;
+				for username in lastlog2:items() do
+					n = n + 1;
+					if n % 100 == 0 then
+						self.session.print(("Processed %d..."):format(n));
+						async.sleep(0);
+					end
+					local lastlog2_data = lastlog2:get(username);
+					if lastlog2_data then
+						local current_data, err = store:get(username);
+						if not current_data then
+							if not err then
+								current_data = {};
+							else
+								n_errors = n_errors + 1;
+							end
+						end
+						if current_data then
+							local imported_timestamp = current_data.timestamp;
+							local latest;
+							for k, v in pairs(lastlog2_data) do
+								if k ~= "registered" and (not latest or v.timestamp > latest) then
+									latest = v.timestamp;
+								end
+							end
+							if latest and (not imported_timestamp or imported_timestamp < latest) then
+								local ok, err = store:set_key(username, "timestamp", latest);
+								if ok then
+									n_updated = n_updated + 1;
+								else
+									self.session.print(("WW: Failed to import %q: %s"):format(username, err));
+									n_errors = n_errors + 1;
+								end
+							else
+								n_skipped = n_skipped + 1;
+							end
+						end
+					end
+				end
+				return resolve(("%d accounts imported, %d errors, %d skipped"):format(n_updated, n_errors, n_skipped));
+			end);
+			async_runner:run(true);
+		end);
+		return p;
+	end;
+});