aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-01-18 18:11:13 +0100
committerKim Alvefur <zash@zash.se>2014-01-18 18:11:13 +0100
commit5de535c834c2b641697751743b358064ffe1e99f (patch)
treed63600780116cd32ea8401bf9b4aaadaf9502ca4
parent514a6edb7ecf5329816b743cc2b0c22fdf58ab88 (diff)
downloadprosody-5de535c834c2b641697751743b358064ffe1e99f.tar.gz
prosody-5de535c834c2b641697751743b358064ffe1e99f.zip
MUC: Split out sending of the topic into method separate from sending history
-rw-r--r--plugins/muc/muc.lib.lua3
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index ac04eb54..462d6893 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -187,6 +187,8 @@ function room_mt:send_history(to, stanza)
self:_route_stanza(msg);
end
end
+end
+function room_mt:send_subject(to)
if self._data['subject'] then
self:_route_stanza(st.message({type='groupchat', from=self._data['subject_from'] or self.jid, to=to}):tag("subject"):text(self._data['subject']));
end
@@ -516,6 +518,7 @@ function room_mt:handle_to_occupant(origin, stanza) -- PM, vCards, etc
pr.attr.to = from;
self:_route_stanza(pr);
self:send_history(from, stanza);
+ self:send_subject(from);
elseif not affiliation then -- registration required for entering members-only room
local reply = st.error_reply(stanza, "auth", "registration-required"):up();
reply.tags[1].attr.code = "407";