diff options
| author | Kim Alvefur <zash@zash.se> | 2016-05-15 16:55:19 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-05-15 16:55:19 +0200 |
| commit | 50457166c6b52c68f8ab7753a0d62a286d17f276 (patch) | |
| tree | 5bebaf10a521a60a5950635ae2749bf87d064a8b /plugins/muc/muc.lib.lua | |
| parent | 71cc232406a77f70d5801f889af2daf62d6639ef (diff) | |
| download | prosody-50457166c6b52c68f8ab7753a0d62a286d17f276.tar.gz prosody-50457166c6b52c68f8ab7753a0d62a286d17f276.zip | |
MUC: Send participant list and subject on explicit joins (thanks daurnimator)
Diffstat (limited to 'plugins/muc/muc.lib.lua')
| -rw-r--r-- | plugins/muc/muc.lib.lua | 4 |
1 files changed, 2 insertions, 2 deletions
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; |