X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmuc%2Fmuc.lib.lua;h=baa72a56f6da07648e8445581737c86377942797;hb=74c88eed6701d02bf77a59aeedb8d8204c41bc17;hp=eb992aa3d42616358906101d45ccf822b87386f3;hpb=65e4b7b33de42357340f2fe9733807c8b9d57219;p=prosody.git

diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index eb992aa3..baa72a56 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -577,7 +577,7 @@ function room_mt:handle_normal_presence(origin, stanza)
 		end
 		self:save_occupant(dest_occupant);
 
-		if orig_occupant == nil then
+		if orig_occupant == nil or muc_x then
 			-- Send occupant list to newly joined user
 			self:send_occupant_list(real_jid, function(nick, occupant) -- luacheck: ignore 212
 				-- Don't include self
@@ -598,7 +598,7 @@ function room_mt:handle_normal_presence(origin, stanza)
 			self:route_stanza(pr);
 		end
 
-		if orig_occupant == nil then
+		if orig_occupant == nil or muc_x then
 			if is_first_dest_session then
 				module:fire_event("muc-occupant-joined", {
 					room = self;