# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1725034561 -7200
# Node ID 662dfff658a0eddaa0a05025272f2c27fbe02950
# Parent  4bf889e94831878cfd5a0907542d9aa8c74a2cae# Parent  0b6af170617be5f138819ac92553b6780c915816
Merge 0.12->trunk

diff -r 4bf889e94831 -r 662dfff658a0 plugins/mod_invites.lua
--- a/plugins/mod_invites.lua	Mon Aug 26 22:26:59 2024 +0200
+++ b/plugins/mod_invites.lua	Fri Aug 30 18:16:01 2024 +0200
@@ -193,7 +193,7 @@
 		type = token_info and token_info.type or "roster";
 		uri = token_info and token_info.uri or get_uri("roster", username.."@"..module.host, token);
 		additional_data = token_info and token_info.additional_data or nil;
-		reusable = token_info.reusable;
+		reusable = token_info and token_info.reusable or false;
 	}, valid_invite_mt);
 end
 
diff -r 4bf889e94831 -r 662dfff658a0 util/prosodyctl/cert.lua
--- a/util/prosodyctl/cert.lua	Mon Aug 26 22:26:59 2024 +0200
+++ b/util/prosodyctl/cert.lua	Fri Aug 30 18:16:01 2024 +0200
@@ -163,7 +163,7 @@
 	local attrs = lfs.attributes(to);
 	if attrs then -- Move old file out of the way
 		local backup = to..".bkp~"..os.date("%FT%T", attrs.change);
-		os.rename(to, backup);
+		assert(os.rename(to, backup));
 	end
 	-- FIXME friendlier error handling, maybe move above backup back?
 	local input = assert(io.open(from));