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: Fix use of incorrect event on occupant join

Browse source
This commit is contained in:
daurnimator 2014-06-17 15:18:43 -04:00
parent 75d78ae9e4
commit 1694d8908a
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -130,7 +130,7 @@ local function send_history(room, stanza)
end
-- Send history on join
module:hook("muc-occupant-joined", function(event)
module:hook("muc-occupant-session-new", function(event)
send_history(event.room, event.stanza);
end, 50); -- Before subject(20)

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

@ -487,8 +487,11 @@ function room_mt:handle_presence_to_occupant(origin, stanza)
self:route_stanza(pr);
end
if orig_occupant == nil and is_first_dest_session then
module:fire_event("muc-occupant-joined", {room = self; nick = dest_occupant.nick; stanza = stanza;});
if orig_occupant == nil then
if is_first_dest_session then
module:fire_event("muc-occupant-joined", {room = self; nick = dest_occupant.nick; stanza = stanza;});
end
module:fire_event("muc-occupant-session-new", {room = self; nick = dest_occupant.nick; stanza = stanza; jid = real_jid;});
end
end
elseif type ~= 'result' then -- bad type

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

@ -66,7 +66,7 @@ local function set_subject(room, from, subject)
end
-- Send subject to joining user
module:hook("muc-occupant-joined", function(event)
module:hook("muc-occupant-session-new", function(event)
send_subject(event.room, event.stanza.attr.from);
end, 20);