Changeset

--- a/core/modulemanager.lua	Sun Nov 17 16:16:53 2019 +0100
+++ b/core/modulemanager.lua	Sat Nov 23 23:12:01 2019 +0100
@@ -79,6 +79,11 @@
 		modules:add("admin_telnet");
 	end
 
+	if modules:contains("vcard") and modules:contains("vcard_legacy") then
+		log("error", "The mod_vcard_legacy plugin replaces mod_vcard but both are enabled. Please update your config.");
+		modules:remove("vcard");
+	end
+
 	return modules, component;
 end
 

--- a/plugins/muc/muc.lib.lua	Sun Nov 17 16:16:53 2019 +0100
+++ b/plugins/muc/muc.lib.lua	Sat Nov 23 23:12:01 2019 +0100
@@ -549,6 +549,9 @@
 			log("debug", "no occupant found for %s; creating new occupant object for %s", dest_jid, real_jid);
 			is_first_dest_session = true;
 			dest_occupant = self:new_occupant(bare_jid, dest_jid);
+			if orig_occupant then
+				dest_occupant.role = orig_occupant.role;
+			end
 		else
 			is_first_dest_session = false;
 		end

--- a/prosodyctl	Sun Nov 17 16:16:53 2019 +0100
+++ b/prosodyctl	Sat Nov 23 23:12:01 2019 +0100
@@ -972,6 +972,10 @@
 				print("    For more information see https://prosody.im/doc/storage");
 			end
 		end
+		if all_modules:contains("vcard") and all_modules:contains("vcard_legacy") then
+			print("    Both mod_vcard_legacy and mod_vcard are enabled but they conflict");
+			print("    with each other. Remove one.");
+		end
 		for host, host_config in pairs(config) do --luacheck: ignore 213/host
 			if type(rawget(host_config, "storage")) == "string" and rawget(host_config, "default_storage") then
 				print("");