Mercurial > prosody-hg
changeset 14192:e58de351880f
Merge 13.0->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 26 May 2026 11:47:33 +0100 |
| parents | dbbafef0748f (current diff) e86ede52bfbe (diff) |
| children | 3b26b8772fb1 |
| files | |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_debug_stanzas/watcher.lib.lua Mon May 25 21:14:24 2026 +0100 +++ b/plugins/mod_debug_stanzas/watcher.lib.lua Tue May 26 11:47:33 2026 +0100 @@ -59,8 +59,8 @@ if #active_filter.downstream == 0 then filters.remove_filter(session, "stanzas/in", active_filter.filter_in); filters.remove_filter(session, "stanzas/out", active_filter.filter_out); + active_filters[session] = nil; end - active_filters[session] = nil; end local function unsubscribe_all_from_session(session, reason)
--- a/plugins/mod_vcard.lua Mon May 25 21:14:24 2026 +0100 +++ b/plugins/mod_vcard.lua Tue May 26 11:47:33 2026 +0100 @@ -68,5 +68,6 @@ local photo_b64 = photo:get_child_text("BINVAL"); local photo_raw = photo_b64 and base64.decode(photo_b64); + if not photo_raw then return end return (sha1(photo_raw, true)); end
--- a/util/timer.lua Mon May 25 21:14:24 2026 +0100 +++ b/util/timer.lua Tue May 26 11:47:33 2026 +0100 @@ -109,7 +109,7 @@ local function reschedule(id, delay) local current_time = get_time(); local event_time = current_time + delay; - h:reprioritize(id, delay); + h:reprioritize(id, event_time); if next_time == nil or event_time < next_time then next_time = event_time; _add_task(next_time - current_time, _on_timer);