From: Kim Alvefur <zash@zash.se>
Date: Sun, 15 May 2016 14:55:19 +0000 (+0200)
Subject: MUC: Send participant list and subject on explicit joins (thanks daurnimator)
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=74c88eed6701d02bf77a59aeedb8d8204c41bc17

MUC: Send participant list and subject on explicit joins (thanks daurnimator)
---

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;