projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
65e4b7b
)
MUC: Send participant list and subject on explicit joins (thanks daurnimator)
author
Kim Alvefur
<zash@zash.se>
Sun, 15 May 2016 14:55:19 +0000
(16:55 +0200)
committer
Kim Alvefur
<zash@zash.se>
Sun, 15 May 2016 14:55:19 +0000
(16:55 +0200)
plugins/muc/muc.lib.lua
patch
|
blob
|
history
diff --git
a/plugins/muc/muc.lib.lua
b/plugins/muc/muc.lib.lua
index eb992aa3d42616358906101d45ccf822b87386f3..baa72a56f6da07648e8445581737c86377942797 100644
(file)
--- 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);
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
-- 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
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;
if is_first_dest_session then
module:fire_event("muc-occupant-joined", {
room = self;