local base64 = require "util.encodings".base64;
local md5 = require "util.hashes".md5;
-local muc_domain = nil; --module:get_host();
local default_history_length, max_history_length = 20, math.huge;
-------------
-local presence_filters = {["http://jabber.org/protocol/muc"]=true;["http://jabber.org/protocol/muc#user"]=true};
-local function presence_filter(tag)
- if presence_filters[tag.attr.xmlns] then
- return nil;
+local get_filtered_presence do
+ local presence_filters = {
+ ["http://jabber.org/protocol/muc"] = true;
+ ["http://jabber.org/protocol/muc#user"] = true;
+ }
+ local function presence_filter(tag)
+ if presence_filters[tag.attr.xmlns] then
+ return nil;
+ end
+ return tag;
+ end
+ function get_filtered_presence(stanza)
+ return st.clone(stanza):maptags(presence_filter);
end
- return tag;
-end
-
-local function get_filtered_presence(stanza)
- return st.clone(stanza):maptags(presence_filter);
-end
-local kickable_error_conditions = {
- ["gone"] = true;
- ["internal-server-error"] = true;
- ["item-not-found"] = true;
- ["jid-malformed"] = true;
- ["recipient-unavailable"] = true;
- ["redirect"] = true;
- ["remote-server-not-found"] = true;
- ["remote-server-timeout"] = true;
- ["service-unavailable"] = true;
- ["malformed error"] = true;
-};
-
-local function get_error_condition(stanza)
- local _, condition = stanza:get_error();
- return condition or "malformed error";
end
-local function is_kickable_error(stanza)
- local cond = get_error_condition(stanza);
- return kickable_error_conditions[cond] and cond;
+local is_kickable_error do
+ local kickable_error_conditions = {
+ ["gone"] = true;
+ ["internal-server-error"] = true;
+ ["item-not-found"] = true;
+ ["jid-malformed"] = true;
+ ["recipient-unavailable"] = true;
+ ["redirect"] = true;
+ ["remote-server-not-found"] = true;
+ ["remote-server-timeout"] = true;
+ ["service-unavailable"] = true;
+ ["malformed error"] = true;
+ };
+ function is_kickable_error(stanza)
+ local cond = select(2, stanza:get_error()) or "malformed error";
+ return kickable_error_conditions[cond];
+ end
end
------------
local room_mt = {};
room_mt.__index = room_mt;
return "MUC room ("..self.jid..")";
end
+function room_mt:get_occupant_jid(real_jid)
+ return self._jid_nick[real_jid]
+end
+
function room_mt:get_default_role(affiliation)
if affiliation == "owner" or affiliation == "admin" then
return "moderator";
end
end
+function room_mt:lock()
+ self.locked = true
+end
+function room_mt:unlock()
+ module:fire_event("muc-room-unlocked", { room = self });
+ self.locked = nil
+end
+function room_mt:is_locked()
+ return not not self.locked
+end
+
+function room_mt:route_to_occupant(o_data, stanza)
+ local to = stanza.attr.to;
+ for jid in pairs(o_data.sessions) do
+ stanza.attr.to = jid;
+ self:_route_stanza(stanza);
+ end
+ stanza.attr.to = to;
+end
+
function room_mt:broadcast_presence(stanza, sid, code, nick)
stanza = get_filtered_presence(stanza);
local occupant = self._occupants[stanza.attr.from];
stanza:tag("status", {code=code}):up();
end
self:broadcast_except_nick(stanza, stanza.attr.from);
- local me = self._occupants[stanza.attr.from];
- if me then
- stanza:tag("status", {code='110'}):up();
- stanza.attr.to = sid;
- self:_route_stanza(stanza);
- end
+ stanza:tag("status", {code='110'}):up();
+ stanza.attr.to = sid;
+ self:_route_stanza(stanza);
end
function room_mt:broadcast_message(stanza, historic)
- local to = stanza.attr.to;
- for occupant, o_data in pairs(self._occupants) do
- for jid in pairs(o_data.sessions) do
- stanza.attr.to = jid;
- self:_route_stanza(stanza);
- end
+ for occupant_jid, o_data in pairs(self._occupants) do
+ self:route_to_occupant(o_data, stanza)
end
- stanza.attr.to = to;
if historic then -- add to history
return self:save_to_history(stanza)
end
stanza = st.clone(stanza);
stanza.attr.to = "";
local stamp = datetime.datetime();
- stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = muc_domain, stamp = stamp}):up(); -- XEP-0203
- stanza:tag("x", {xmlns = "jabber:x:delay", from = muc_domain, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated)
+ stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = module.host, stamp = stamp}):up(); -- XEP-0203
+ stanza:tag("x", {xmlns = "jabber:x:delay", from = module.host, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated)
local entry = { stanza = stanza, stamp = stamp };
t_insert(history, entry);
while #history > (self._data.history_length or default_history_length) do t_remove(history, 1) end
function room_mt:broadcast_except_nick(stanza, nick)
for rnick, occupant in pairs(self._occupants) do
if rnick ~= nick then
- for jid in pairs(occupant.sessions) do
- stanza.attr.to = jid;
- self:_route_stanza(stanza);
- end
+ self:route_to_occupant(occupant, stanza)
end
end
end
function room_mt:send_occupant_list(to)
- local current_nick = self._jid_nick[to];
+ local current_nick = self:get_occupant_jid(to);
for occupant, o_data in pairs(self._occupants) do
if occupant ~= current_nick then
local pres = get_filtered_presence(o_data.sessions[o_data.jid]);
:tag("feature", {var=self:get_members_only() and "muc_membersonly" or "muc_open"}):up()
:tag("feature", {var=self:get_persistent() and "muc_persistent" or "muc_temporary"}):up()
:tag("feature", {var=self:get_hidden() and "muc_hidden" or "muc_public"}):up()
- :tag("feature", {var=self._data.whois ~= "anyone" and "muc_semianonymous" or "muc_nonanonymous"}):up()
+ :tag("feature", {var=self:get_whois() ~= "anyone" and "muc_semianonymous" or "muc_nonanonymous"}):up()
:add_child(dataform.new({
{ name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/muc#roominfo" },
{ name = "muc#roominfo_description", label = "Description", value = "" },
function room_mt:handle_unavailable_to_occupant(origin, stanza)
local from = stanza.attr.from;
- local current_nick = self._jid_nick[from];
+ local current_nick = self:get_occupant_jid(from);
if not current_nick then
return true; -- discard
end
origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
return true;
else
- local data = self._occupants[current_nick];
local to_nick = select(3, jid_split(to));
- log("debug", "%s (%s) changing nick to %s", current_nick, data.jid, to);
+ log("debug", "%s (%s) changing nick to %s", current_nick, occupant.jid, to);
local p = st.presence({type='unavailable', from=current_nick});
self:broadcast_presence(p, from, '303', to_nick);
self._occupants[current_nick] = nil;
- self._occupants[to] = data;
+ self._occupants[to] = occupant;
self._jid_nick[from] = to;
local pr = get_filtered_presence(stanza);
pr.attr.from = to;
function room_mt:handle_join(origin, stanza)
local from, to = stanza.attr.from, stanza.attr.to;
log("debug", "%s joining as %s", from, to);
+ local password = stanza:get_child("x", "http://jabber.org/protocol/muc");
+ password = password and password:get_child("password", "http://jabber.org/protocol/muc");
+ password = password and password[1] ~= "" and password[1];
+ if self:get_password() and self:get_password() ~= password then
+ log("debug", "%s couldn't join due to invalid password: %s", from, to);
+ local reply = st.error_reply(stanza, "auth", "not-authorized"):up();
+ reply.tags[1].attr.code = "401";
+ origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
+ return true;
+ elseif self._occupants[to] -- occupant already exists
+ and jid_bare(from) ~= jid_bare(self._occupants[to].jid) then -- and has different bare real jid
+ log("debug", "%s couldn't join due to nick conflict: %s", from, to);
+ local reply = st.error_reply(stanza, "cancel", "conflict"):up();
+ reply.tags[1].attr.code = "409";
+ origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
+ return true;
+ end
if not next(self._affiliations) then -- new room, no owners
self._affiliations[jid_bare(from)] = "owner";
- if self.locked and not stanza:get_child("x", "http://jabber.org/protocol/muc") then
- self.locked = nil; -- Older groupchat protocol doesn't lock
+ if self:is_locked() and not stanza:get_child("x", "http://jabber.org/protocol/muc") then
+ self:unlock(); -- Older groupchat protocol doesn't lock
end
- elseif self.locked then -- Deny entry
+ elseif self:is_locked() then -- Deny entry
origin.send(st.error_reply(stanza, "cancel", "item-not-found"));
return true;
end
self:broadcast_except_nick(pr, to);
end
pr:tag("status", {code='110'}):up();
- if self._data.whois == 'anyone' then
+ if self:get_whois() == 'anyone' then
pr:tag("status", {code='100'}):up();
end
- if self.locked then
+ if self:is_locked() then
pr:tag("status", {code='201'}):up();
end
pr.attr.to = from;
function room_mt:handle_available_to_occupant(origin, stanza)
local from, to = stanza.attr.from, stanza.attr.to;
- local current_nick = self._jid_nick[from];
+ local current_nick = self:get_occupant_jid(from);
if current_nick then
--if #pr == #stanza or current_nick ~= to then -- commented because google keeps resending directed presence
if current_nick == to then -- simple presence
-- self:handle_to_occupant(origin, stanza); -- resend available
--end
else -- enter room
- local new_nick = to;
- if self._occupants[to] then
- if jid_bare(from) ~= jid_bare(self._occupants[to].jid) then
- new_nick = nil;
- end
- end
- local password = stanza:get_child("x", "http://jabber.org/protocol/muc");
- password = password and password:get_child("password", "http://jabber.org/protocol/muc");
- password = password and password[1] ~= "" and password[1];
- if self:get_password() and self:get_password() ~= password then
- log("debug", "%s couldn't join due to invalid password: %s", from, to);
- local reply = st.error_reply(stanza, "auth", "not-authorized"):up();
- reply.tags[1].attr.code = "401";
- origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
- return true;
- elseif not new_nick then
- log("debug", "%s couldn't join due to nick conflict: %s", from, to);
- local reply = st.error_reply(stanza, "cancel", "conflict"):up();
- reply.tags[1].attr.code = "409";
- origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
- return true;
- else
- return self:handle_join(origin, stanza)
- end
+ return self:handle_join(origin, stanza)
end
end
local from, to = stanza.attr.from, stanza.attr.to;
local type = stanza.attr.type;
local id = stanza.attr.id;
- local current_nick = self._jid_nick[from];
+ local current_nick = self:get_occupant_jid(from);
local o_data = self._occupants[to];
if (type == "error" or type == "result") then
do -- deconstruct_stanza_id
return true;
end
do -- construct_stanza_id
- stanza.attr.id = base64.encode(to_jid.."\0"..stanza.attr.id.."\0"..md5(from));
+ stanza.attr.id = base64.encode(o_data.jid.."\0"..stanza.attr.id.."\0"..md5(from));
end
stanza.attr.from, stanza.attr.to = current_nick, o_data.jid;
log("debug", "%s sent private iq stanza to %s (%s)", from, to, o_data.jid);
function room_mt:handle_message_to_occupant(origin, stanza)
local from, to = stanza.attr.from, stanza.attr.to;
- local current_nick = self._jid_nick[from];
+ local current_nick = self:get_occupant_jid(from);
local type = stanza.attr.type;
if not current_nick then -- not in room
if type ~= "error" then
log("debug", "%s sent private message stanza to %s (%s)", from, to, o_data.jid);
stanza:tag("x", { xmlns = "http://jabber.org/protocol/muc#user" }):up();
stanza.attr.from = current_nick;
- for jid in pairs(o_data.sessions) do
- stanza.attr.to = jid;
- self:_route_stanza(stanza);
- end
- stanza.attr.from, stanza.attr.to = from, to;
+ self:route_to_occupant(o_data, stanza)
+ stanza.attr.from = from;
return true;
end
-function room_mt:handle_to_occupant(origin, stanza) -- PM, vCards, etc
- local from, to = stanza.attr.from, stanza.attr.to;
- local room = jid_bare(to);
- local current_nick = self._jid_nick[from];
- log("debug", "room: %s, current_nick: %s, stanza: %s", room or "nil", current_nick or "nil", stanza:top_tag());
- if (select(2, jid_split(from)) == muc_domain) then error("Presence from the MUC itself!!!"); end
- if stanza.name == "presence" then
- return self:handle_presence_to_occupant(origin, stanza)
- elseif stanza.name == "iq" then
- return self:handle_iq_to_occupant(origin, stanza)
- elseif stanza.name == "message" then
- return self:handle_message_to_occupant(origin, stanza)
- end
-end
-
function room_mt:send_form(origin, stanza)
origin.send(st.reply(stanza):query("http://jabber.org/protocol/muc#owner")
:add_child(self:get_form_layout(stanza.attr.from):form())
end
function room_mt:get_form_layout(actor)
+ local whois = self:get_whois()
local form = dataform.new({
title = "Configuration for "..self.jid,
instructions = "Complete and submit this form to configure the room.",
type = 'list-single',
label = 'Who May Discover Real JIDs?',
value = {
- { value = 'moderators', label = 'Moderators Only', default = self._data.whois == 'moderators' },
- { value = 'anyone', label = 'Anyone', default = self._data.whois == 'anyone' }
+ { value = 'moderators', label = 'Moderators Only', default = whois == 'moderators' },
+ { value = 'anyone', label = 'Anyone', default = whois == 'anyone' }
}
},
{
function room_mt:process_form(origin, stanza)
local query = stanza.tags[1];
- local form;
- for _, tag in ipairs(query.tags) do if tag.name == "x" and tag.attr.xmlns == "jabber:x:data" then form = tag; break; end end
+ local form = query:get_child("x", "jabber:x:data")
if not form then origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); return; end
if form.attr.type == "cancel" then origin.send(st.reply(stanza)); return; end
if form.attr.type ~= "submit" then origin.send(st.error_reply(stanza, "cancel", "bad-request", "Not a submitted form")); return; end
handle_option("password", "muc#roomconfig_roomsecret");
if self.save then self:save(true); end
- if self.locked then
- module:fire_event("muc-room-unlocked", { room = self });
- self.locked = nil;
+ if self:is_locked() then
+ self:unlock();
end
origin.send(st.reply(stanza));
local occupant = self._occupants[self.jid.."/"..item.attr.nick];
if occupant then item.attr.jid = occupant.jid; end
elseif not item.attr.nick and item.attr.jid then
- local nick = self._jid_nick[item.attr.jid];
+ local nick = self:get_occupant_jid(item.attr.jid);
if nick then item.attr.nick = select(3, jid_split(nick)); end
end
local actor = stanza.attr.from;
local callback = function() origin.send(st.reply(stanza)); end
- local reason = item.tags[1] and item.tags[1].name == "reason" and #item.tags[1] == 1 and item.tags[1][1];
+ local reason = item:get_child_text("reason");
if item.attr.affiliation and item.attr.jid and not item.attr.role then
local success, errtype, err = self:set_affiliation(actor, item.attr.jid, item.attr.affiliation, callback, reason);
if not success then origin.send(st.error_reply(stanza, errtype, err)); end
function room_mt:handle_admin_item_get_command(origin, stanza)
local actor = stanza.attr.from;
local affiliation = self:get_affiliation(actor);
- local current_nick = self._jid_nick[actor];
- local role = current_nick and self._occupants[current_nick].role or self:get_default_role(affiliation);
local item = stanza.tags[1].tags[1];
local _aff = item.attr.affiliation;
local _rol = item.attr.role;
return true;
end
elseif _rol and not _aff then
+ local role = self:get_role(self:get_occupant_jid(actor)) or self:get_default_role(affiliation);
if role == "moderator" then
- -- TODO allow admins and owners not in room? Provide read-only access to everyone who can see the participants anyway?
if _rol == "none" then _rol = nil; end
local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin");
for occupant_jid, occupant in pairs(self._occupants) do
return true;
elseif child.name == "destroy" then
local newjid = child.attr.jid;
- local reason, password;
- for _,tag in ipairs(child.tags) do
- if tag.name == "reason" then
- reason = #tag.tags == 0 and tag[1];
- elseif tag.name == "password" then
- password = #tag.tags == 0 and tag[1];
- end
- end
+ local reason = child:get_child_text("reason");
+ local password = child:get_child_text("password");
self:destroy(newjid, reason, password);
origin.send(st.reply(stanza));
return true;
end
end
-function room_mt:handle_iq_to_room(origin, stanza)
- local type = stanza.attr.type;
- local xmlns = stanza.tags[1] and stanza.tags[1].attr.xmlns;
- if xmlns == "http://jabber.org/protocol/disco#info" and type == "get" and not stanza.tags[1].attr.node then
- return self:handle_disco_info_get_query(origin, stanza)
- elseif xmlns == "http://jabber.org/protocol/disco#items" and type == "get" and not stanza.tags[1].attr.node then
- return self:handle_disco_items_get_query(origin, stanza)
- elseif xmlns == "http://jabber.org/protocol/muc#admin" then
- local item = stanza.tags[1].tags[1];
- if item and item.name == "item" then
- if type == "set" then
- return self:handle_admin_item_set_command(origin, stanza)
- elseif type == "get" then
- return self:handle_admin_item_get_command(origin, stanza)
- end
- elseif type == "set" or type == "get" then
- origin.send(st.error_reply(stanza, "cancel", "bad-request"));
- return true;
- end
- elseif xmlns == "http://jabber.org/protocol/muc#owner" and (type == "get" or type == "set") and stanza.tags[1].name == "query" then
- if stanza.attr.type == "get" then
- return self:handle_owner_query_get_to_room(origin, stanza)
- elseif stanza.attr.type == "set" then
- return self:handle_owner_query_set_to_room(origin, stanza)
- end
- else
- return nil;
- end
-end
-
function room_mt:handle_groupchat_to_room(origin, stanza)
local from = stanza.attr.from;
- local current_nick = self._jid_nick[from];
+ local current_nick = self:get_occupant_jid(from);
local occupant = self._occupants[current_nick];
if not occupant then -- not in room
origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
local subject = stanza:get_child_text("subject");
if subject then
if occupant.role == "moderator" or
- ( self._data.changesubject and occupant.role == "participant" ) then -- and participant
+ ( self:get_changesubject() and occupant.role == "participant" ) then -- and participant
self:set_subject(current_nick, subject);
else
stanza.attr.from = from;
-- hack - some buggy clients send presence updates to the room rather than their nick
function room_mt:handle_presence_to_room(origin, stanza)
- local current_nick = self._jid_nick[stanza.attr.from];
+ local current_nick = self:get_occupant_jid(stanza.attr.from);
local handled
if current_nick then
local to = stanza.attr.to;
return handled;
end
-function room_mt:handle_mediated_invite(origin, stanza, payload)
+function room_mt:handle_mediated_invite(origin, stanza)
+ local payload = stanza:get_child("x", "http://jabber.org/protocol/muc#user"):get_child("invite")
local _from, _to = stanza.attr.from, stanza.attr.to;
- if not self._jid_nick[_from] then -- Should be in room to send invite TODO: allow admins to send at any time
+ local current_nick = self:get_occupant_jid(_from)
+ -- Need visitor role or higher to invite
+ if not self:get_role(current_nick) or not self:get_default_role(self:get_affiliation(_from)) then
origin.send(st.error_reply(stanza, "auth", "forbidden"));
return true;
end
local _invitee = jid_prep(payload.attr.to);
if _invitee then
+ if self:get_whois() == "moderators" then
+ _from = current_nick;
+ end
local _reason = payload:get_child_text("reason")
local invite = st.message({from = _to, to = _invitee, id = stanza.attr.id})
:tag('x', {xmlns='http://jabber.org/protocol/muc#user'})
:tag('body') -- Add a plain message for clients which don't support invites
:text(_from..' invited you to the room '.._to..(_reason and (' ('.._reason..')') or ""))
:up();
- if self:get_members_only() and not self:get_affiliation(_invitee) then
- log("debug", "%s invited %s into members only room %s, granting membership", _from, _invitee, _to);
- self:set_affiliation(_from, _invitee, "member", nil, "Invited by " .. self._jid_nick[_from])
- end
- self:_route_stanza(invite);
+ module:fire_event("muc-invite", { room = self, stanza = invite, origin = origin, incoming = stanza });
return true;
else
origin.send(st.error_reply(stanza, "cancel", "jid-malformed"));
end
end
-function room_mt:handle_mediated_decline(origin, stanza, payload)
+module:hook("muc-invite", function(event)
+ event.room:_route_stanza(event.stanza);
+ return true;
+end, -1)
+
+-- When an invite is sent; add an affiliation for the invitee
+module:hook("muc-invite", function(event)
+ local room, stanza = event.room, event.stanza
+ local invitee = stanza.attr.to
+ if room:get_members_only() and not room:get_affiliation(invitee) then
+ local from = stanza:get_child("x", "http://jabber.org/protocol/muc#user"):get_child("invite").attr.from
+ local current_nick = room:get_occupant_jid(from)
+ log("debug", "%s invited %s into members only room %s, granting membership", from, invitee, room.jid);
+ room:set_affiliation(from, invitee, "member", nil, "Invited by " .. current_nick)
+ end
+end)
+
+function room_mt:handle_mediated_decline(origin, stanza)
+ local payload = stanza:get_child("x", "http://jabber.org/protocol/muc#user"):get_child("decline")
local declinee = jid_prep(payload.attr.to);
if declinee then
local from, to = stanza.attr.from, stanza.attr.to;
:tag('body') -- Add a plain message for clients which don't support declines
:text(from..' declined your invite to the room '..to..(reason and (' ('..reason..')') or ""))
:up();
- self:_route_stanza(decline);
+ module:fire_event("muc-decline", { room = self, stanza = decline, origin = origin, incoming = stanza });
return true;
else
origin.send(st.error_reply(stanza, "cancel", "jid-malformed"));
end
end
+module:hook("muc-decline", function(event)
+ event.room:_route_stanza(event.stanza);
+ return true;
+end, -1)
+
function room_mt:handle_message_to_room(origin, stanza)
local type = stanza.attr.type;
if type == "groupchat" then
if payload == nil then
-- fallthrough
elseif payload.name == "invite" and payload.attr.to then
- return self:handle_mediated_invite(origin, stanza, payload)
+ return self:handle_mediated_invite(origin, stanza)
elseif payload.name == "decline" and payload.attr.to then
- return self:handle_mediated_decline(origin, stanza, payload)
+ return self:handle_mediated_decline(origin, stanza)
end
origin.send(st.error_reply(stanza, "cancel", "bad-request"));
return true;
end
end
-function room_mt:handle_to_room(origin, stanza) -- presence changes and groupchat messages, along with disco/etc
- if stanza.name == "iq" then
- return self:handle_iq_to_room(origin, stanza)
- elseif stanza.name == "message" then
- return self:handle_message_to_room(origin, stanza)
- elseif stanza.name == "presence" then
- return self:handle_presence_to_room(origin, stanza)
- end
-end
-
-function room_mt:handle_stanza(origin, stanza)
- local to_node, to_host, to_resource = jid_split(stanza.attr.to);
- local handled
- if to_resource then
- handled = self:handle_to_occupant(origin, stanza);
- else
- handled = self:handle_to_room(origin, stanza);
- end
-
- if not handled then
- local type = stanza.attr.type
- if stanza.name ~= "iq" or type == "get" or type == "set" then
- origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
- end
- end
-end
-
function room_mt:route_stanza(stanza)
module:send(stanza)
end
if actor_jid == true then return true; end
- local actor = self._occupants[self._jid_nick[actor_jid]];
+ local actor = self._occupants[self:get_occupant_jid(actor_jid)];
if actor.role == "moderator" then
if occupant.affiliation ~= "owner" and occupant.affiliation ~= "admin" then
if actor.affiliation == "owner" or actor.affiliation == "admin" then
function room_mt:_route_stanza(stanza)
local muc_child;
- local to_occupant = self._occupants[self._jid_nick[stanza.attr.to]];
- local from_occupant = self._occupants[stanza.attr.from];
if stanza.name == "presence" then
+ local to_occupant = self._occupants[self:get_occupant_jid(stanza.attr.to)];
+ local from_occupant = self._occupants[stanza.attr.from];
if to_occupant and from_occupant then
- if self._data.whois == 'anyone' then
+ if self:get_whois() == 'anyone' then
muc_child = stanza:get_child("x", "http://jabber.org/protocol/muc#user");
else
if to_occupant.role == "moderator" or jid_bare(to_occupant.jid) == jid_bare(from_occupant.jid) then
end
end
end
- end
- if muc_child then
- for _, item in pairs(muc_child.tags) do
- if item.name == "item" then
+ if muc_child then
+ for item in muc_child:childtags("item") do
if from_occupant == to_occupant then
item.attr.jid = stanza.attr.to;
else
end
self:route_stanza(stanza);
if muc_child then
- for _, item in pairs(muc_child.tags) do
- if item.name == "item" then
- item.attr.jid = nil;
- end
+ for item in muc_child:childtags("item") do
+ item.attr.jid = nil;
end
end
end
function _M.new_room(jid, config)
return setmetatable({
jid = jid;
+ locked = nil;
_jid_nick = {};
_occupants = {};
_data = {
projects / prosody.git / blobdiff