Mercurial > prosody-hg
changeset 14168:4f4c346e4f39
Merge 13.0->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 19 May 2026 19:27:43 +0100 |
| parents | 78c89ff001bf (current diff) f149652cb5ff (diff) |
| children | d975d280baec |
| files | plugins/mod_account_activity.lua plugins/mod_admin_shell.lua |
| diffstat | 3 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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";
--- 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
