aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2014-06-17 15:18:43 -0400
committerdaurnimator <quae@daurnimator.com>2014-06-17 15:18:43 -0400
commit1694d8908a486fdc1fcee99b98cf5a8df65be13b (patch)
treecbc89142bea59e6fbe4308d3e653a65a9bb1594c
parent75d78ae9e40c0d0b972842d30a35387f161823d5 (diff)
downloadprosody-1694d8908a486fdc1fcee99b98cf5a8df65be13b.tar.gz
prosody-1694d8908a486fdc1fcee99b98cf5a8df65be13b.zip
plugins/muc: Fix use of incorrect event on occupant join
-rw-r--r--plugins/muc/history.lib.lua2
-rw-r--r--plugins/muc/muc.lib.lua7
-rw-r--r--plugins/muc/subject.lib.lua2
3 files changed, 7 insertions, 4 deletions
diff --git a/plugins/muc/history.lib.lua b/plugins/muc/history.lib.lua
index 1c14cf84..4129e7fa 100644
--- a/plugins/muc/history.lib.lua
+++ b/plugins/muc/history.lib.lua
@@ -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)
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 85c256a2..c645869e 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -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
diff --git a/plugins/muc/subject.lib.lua b/plugins/muc/subject.lib.lua
index 44fc915c..34f9a5d4 100644
--- a/plugins/muc/subject.lib.lua
+++ b/plugins/muc/subject.lib.lua
@@ -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);