# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1779215263 -3600
# Node ID 4f4c346e4f39e7c04875e03cf3645cd4bed98841
# Parent  78c89ff001bfe79d4991c44978509261b244bba2# Parent  f149652cb5ff2f627d3e97b642a5e5e671f58fae
Merge 13.0->trunk

diff -r 78c89ff001bf -r 4f4c346e4f39 plugins/mod_account_activity.lua
--- a/plugins/mod_account_activity.lua	Wed Apr 29 21:41:10 2026 +0200
+++ b/plugins/mod_account_activity.lua	Tue May 19 19:27:43 2026 +0100
@@ -60,6 +60,8 @@
 	};
 	host_selector = "host";
 	handler = function(self, host, duration, opts) --luacheck: ignore 212/self
+		opts = opts or {};
+
 		local um = require "prosody.core.usermanager";
 		local duration_sec = require "prosody.util.human.io".parse_duration(duration or "");
 		if not duration_sec then
diff -r 78c89ff001bf -r 4f4c346e4f39 plugins/mod_admin_shell.lua
--- a/plugins/mod_admin_shell.lua	Wed Apr 29 21:41:10 2026 +0200
+++ b/plugins/mod_admin_shell.lua	Tue May 19 19:27:43 2026 +0100
@@ -1924,9 +1924,6 @@
 			return promise.reject("Unacceptable password");
 		end
 
-		self.session.print(("PW: %q"):format(raw_password));
-		self.session.print(("PW2: %q"):format(prepped_password));
-
 		local ok, err = um.create_user_with_role(username, prepped_password, host, role);
 		if not ok then
 			return promise.reject("Could not create user: "..err);
@@ -1998,9 +1995,6 @@
 			return promise.reject("Unacceptable password");
 		end
 
-		self.session.print(("PW: %q"):format(raw_password));
-		self.session.print(("PW2: %q"):format(prepped_password));
-
 		local ok, err = um.set_password(username, prepped_password, host, nil);
 		if ok then
 			return "User password changed";
diff -r 78c89ff001bf -r 4f4c346e4f39 plugins/mod_cloud_notify.lua
--- a/plugins/mod_cloud_notify.lua	Wed Apr 29 21:41:10 2026 +0200
+++ b/plugins/mod_cloud_notify.lua	Tue May 19 19:27:43 2026 +0100
@@ -397,8 +397,8 @@
 				id2identifier[stanza_id] = push_identifier;
 				module:send_iq(push_publish):next(handle_push_success, handle_push_error):finally(function ()
 					-- unhook iq handlers for this identifier (if possible)
-					id2node[stanza.attr.id] = nil;
-					id2identifier[stanza.attr.id] = nil;
+					id2node[stanza_id] = nil;
+					id2identifier[stanza_id] = nil;
 				end);
 				pushes = pushes + 1;
 			end