mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

plugins/muc/muc.lib: Move sending of occupant list to joining user out of hook, and into main flow: It has to occur before publication of their status

Browse source
This commit is contained in:
daurnimator 2014-04-21 17:51:32 -04:00
parent 9592b3a68c
commit 09fa17a7ef
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/muc/history.lib.lua
View file

@ -131,7 +131,7 @@ end
-- Send history on join
module:hook("muc-occupant-joined", function(event)
send_history(event.room, event.stanza);
end, 50); -- Between occupant list (80) and subject(20)
end, 50); -- Before subject(20)
-- add to history
module:hook("muc-broadcast-message", function(event)

17
plugins/muc/muc.lib.lua
View file

@ -320,15 +320,6 @@ module:hook("muc-occupant-pre-join", function(event)
end
end, -10);
-- Send occupant list to newly joined user
module:hook("muc-occupant-joined", function(event)
local real_jid = event.stanza.attr.from;
event.room:send_occupant_list(real_jid, function(nick, occupant)
-- Don't include self
return occupant:get_presence(real_jid) == nil;
end);
end, 80);
function room_mt:handle_presence_to_occupant(origin, stanza)
local type = stanza.attr.type;
if type == "error" then -- error, kick em out!
@ -457,6 +448,14 @@ function room_mt:handle_presence_to_occupant(origin, stanza)
dest_x:tag("status", {code = "100"}):up();
end
self:save_occupant(dest_occupant);
if orig_occupant == nil and is_first_dest_session then
-- Send occupant list to newly joined user
self:send_occupant_list(real_jid, function(nick, occupant)
-- Don't include self
return occupant:get_presence(real_jid) == nil;
end)
end
self:publicise_occupant_status(dest_occupant, dest_x);
if orig_occupant ~= nil and orig_occupant ~= dest_occupant and not is_last_orig_session then -- If user is swapping and wasn't last original session