projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MUC: Assign occupants unavailable presence on room destruction, fixes destruction...
[prosody.git]
/
plugins
/
muc
/
muc.lib.lua
diff --git
a/plugins/muc/muc.lib.lua
b/plugins/muc/muc.lib.lua
index 60b12ac835088b0a5bb57e15ac9ae00d06fa5136..434127b4f2fd4e87ba2996284b9abfaf3fc0074a 100644
(file)
--- a/
plugins/muc/muc.lib.lua
+++ b/
plugins/muc/muc.lib.lua
@@
-8,7
+8,7
@@
--
local select = select;
--
local select = select;
-local pairs
, ipairs = pairs, i
pairs;
+local pairs
=
pairs;
local next = next;
local setmetatable = setmetatable;
local next = next;
local setmetatable = setmetatable;
@@
-19,10
+19,11
@@
local jid_bare = require "util.jid".bare;
local jid_prep = require "util.jid".prep;
local jid_join = require "util.jid".join;
local st = require "util.stanza";
local jid_prep = require "util.jid".prep;
local jid_join = require "util.jid".join;
local st = require "util.stanza";
-local log = require "util.logger".init("mod_muc");
local base64 = require "util.encodings".base64;
local md5 = require "util.hashes".md5;
local base64 = require "util.encodings".base64;
local md5 = require "util.hashes".md5;
+local log = module._log;
+
local occupant_lib = module:require "muc/occupant"
local muc_util = module:require "muc/util";
local is_kickable_error = muc_util.is_kickable_error;
local occupant_lib = module:require "muc/occupant"
local muc_util = module:require "muc/util";
local is_kickable_error = muc_util.is_kickable_error;
@@
-35,6
+36,10
@@
function room_mt:__tostring()
return "MUC room ("..self.jid..")";
end
return "MUC room ("..self.jid..")";
end
+function room_mt.save()
+ -- overriden by mod_muc.lua
+end
+
function room_mt:get_occupant_jid(real_jid)
return self._jid_nick[real_jid]
end
function room_mt:get_occupant_jid(real_jid)
return self._jid_nick[real_jid]
end
@@
-75,7
+80,8
@@
do
if next_occupant_jid == nil then return nil end
return next_occupant_jid, occupant_lib.copy(raw_occupant);
end
if next_occupant_jid == nil then return nil end
return next_occupant_jid, occupant_lib.copy(raw_occupant);
end
- function room_mt:each_occupant(read_only)
+ -- FIXME Explain what 'read_only' is supposed to be
+ function room_mt:each_occupant(read_only) -- luacheck: ignore 212
return next_copied_occupant, self._occupants, nil;
end
end
return next_copied_occupant, self._occupants, nil;
end
end
@@
-123,7
+129,7
@@
end
function room_mt:route_to_occupant(occupant, stanza)
local to = stanza.attr.to;
function room_mt:route_to_occupant(occupant, stanza)
local to = stanza.attr.to;
- for jid
, pr
in occupant:each_session() do
+ for jid in occupant:each_session() do
stanza.attr.to = jid;
self:route_stanza(stanza);
end
stanza.attr.to = jid;
self:route_stanza(stanza);
end
@@
-150,7
+156,7
@@
function room_mt:build_item_list(occupant, x, is_anonymous, nick, actor_nick, ac
if is_anonymous then
add_item(x, affiliation, role, nil, nick, actor_nick, actor_jid, reason);
else
if is_anonymous then
add_item(x, affiliation, role, nil, nick, actor_nick, actor_jid, reason);
else
- for real_jid
, session
in occupant:each_session() do
+ for real_jid in occupant:each_session() do
add_item(x, affiliation, role, real_jid, nick, actor_nick, actor_jid, reason);
end
end
add_item(x, affiliation, role, real_jid, nick, actor_nick, actor_jid, reason);
end
end
@@
-249,8
+255,8
@@
function room_mt:publicise_occupant_status(occupant, base_x, nick, actor, reason
end
-- General populance
end
-- General populance
- for nick, n_occupant in self:each_occupant() do
- if nick ~= occupant.nick then
+ for
occupant_
nick, n_occupant in self:each_occupant() do
+ if
occupant_
nick ~= occupant.nick then
local pr;
if can_see_real_jids(whois, n_occupant) then
pr = get_full_p();
local pr;
if can_see_real_jids(whois, n_occupant) then
pr = get_full_p();
@@
-309,16
+315,17
@@
function room_mt:get_disco_info(stanza)
local form = dataform.new {
{ name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/muc#roominfo" };
};
local form = dataform.new {
{ name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/muc#roominfo" };
};
- module:fire_event("muc-disco#info", {room = self; reply = reply; form = form;});
- reply:add_child(form:form(nil, "result"));
+ local formdata = {};
+ module:fire_event("muc-disco#info", {room = self; reply = reply; form = form, formdata = formdata ;});
+ reply:add_child(form:form(formdata, "result"));
return reply;
end
module:hook("muc-disco#info", function(event)
event.reply:tag("feature", {var = "http://jabber.org/protocol/muc"}):up();
end);
module:hook("muc-disco#info", function(event)
return reply;
end
module:hook("muc-disco#info", function(event)
event.reply:tag("feature", {var = "http://jabber.org/protocol/muc"}):up();
end);
module:hook("muc-disco#info", function(event)
-
local count = iterators.count(event.room:each_occupant()
);
-
table.insert(event.form, { name = "muc#roominfo_occupants", label = "Number of occupants", value = tostring(count) }
);
+
table.insert(event.form, { name = "muc#roominfo_occupants", label = "Number of occupants" }
);
+
event.formdata["muc#roominfo_occupants"] = tostring(iterators.count(event.room:each_occupant())
);
end);
function room_mt:get_disco_items(stanza)
end);
function room_mt:get_disco_items(stanza)
@@
-329,7
+336,7
@@
function room_mt:get_disco_items(stanza)
return reply;
end
return reply;
end
-function room_mt:handle_kickable(origin, stanza)
+function room_mt:handle_kickable(origin, stanza)
-- luacheck: ignore 212
local real_jid = stanza.attr.from;
local occupant = self:get_occupant_by_real_jid(real_jid);
if occupant == nil then return nil; end
local real_jid = stanza.attr.from;
local occupant = self:get_occupant_by_real_jid(real_jid);
if occupant == nil then return nil; end
@@
-388,7
+395,8
@@
function room_mt:handle_presence_to_occupant(origin, stanza)
if type == "unavailable" and orig_occupant == nil then return true; end -- Unavailable from someone not in the room
end
local is_first_dest_session;
if type == "unavailable" and orig_occupant == nil then return true; end -- Unavailable from someone not in the room
end
local is_first_dest_session;
- if type == "unavailable" then
+ if type == "unavailable" then -- luacheck: ignore 542
+ -- FIXME Why the empty if branch?
-- dest_occupant = nil
elseif orig_occupant and orig_occupant.nick == stanza.attr.to then -- Just a presence update
log("debug", "presence update for %s from session %s", orig_occupant.nick, real_jid);
-- dest_occupant = nil
elseif orig_occupant and orig_occupant.nick == stanza.attr.to then -- Just a presence update
log("debug", "presence update for %s from session %s", orig_occupant.nick, real_jid);
@@
-487,7
+495,13
@@
function room_mt:handle_presence_to_occupant(origin, stanza)
self:publicise_occupant_status(orig_occupant, orig_x, dest_nick);
if is_last_orig_session then
self:publicise_occupant_status(orig_occupant, orig_x, dest_nick);
if is_last_orig_session then
- module:fire_event("muc-occupant-left", {room = self; nick = orig_occupant.nick; occupant = orig_occupant;});
+ module:fire_event("muc-occupant-left", {
+ room = self;
+ nick = orig_occupant.nick;
+ occupant = orig_occupant;
+ origin = origin;
+ stanza = stanza;
+ });
end
end
end
end
@@
-504,7
+518,7
@@
function room_mt:handle_presence_to_occupant(origin, stanza)
if orig_occupant == nil then
-- Send occupant list to newly joined user
if orig_occupant == nil then
-- Send occupant list to newly joined user
- self:send_occupant_list(real_jid, function(nick, occupant)
+ self:send_occupant_list(real_jid, function(nick, occupant)
-- luacheck: ignore 212
-- Don't include self
return occupant:get_presence(real_jid) == nil;
end)
-- Don't include self
return occupant:get_presence(real_jid) == nil;
end)
@@
-525,9
+539,22
@@
function room_mt:handle_presence_to_occupant(origin, stanza)
if orig_occupant == nil then
if is_first_dest_session then
if orig_occupant == nil then
if is_first_dest_session then
- module:fire_event("muc-occupant-joined", {room = self; nick = dest_occupant.nick; occupant = dest_occupant;});
+ module:fire_event("muc-occupant-joined", {
+ room = self;
+ nick = dest_occupant.nick;
+ occupant = dest_occupant;
+ stanza = stanza;
+ origin = origin;
+ });
end
end
- module:fire_event("muc-occupant-session-new", {room = self; nick = dest_occupant.nick; occupant = dest_occupant; stanza = stanza; jid = real_jid;});
+ module:fire_event("muc-occupant-session-new", {
+ room = self;
+ nick = dest_occupant.nick;
+ occupant = dest_occupant;
+ stanza = stanza;
+ origin = origin;
+ jid = real_jid;
+ });
end
end
elseif type ~= 'result' then -- bad type
end
end
elseif type ~= 'result' then -- bad type
@@
-546,7
+573,7
@@
function room_mt:handle_iq_to_occupant(origin, stanza)
if (type == "error" or type == "result") then
do -- deconstruct_stanza_id
if not occupant then return nil; end
if (type == "error" or type == "result") then
do -- deconstruct_stanza_id
if not occupant then return nil; end
- local from_jid,
id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(.+)%z(.
*)%z(.+)$");
+ local from_jid,
orig_id, to_jid_hash = (base64.decode(id) or ""):match("^(%Z+)%z(%Z
*)%z(.+)$");
if not(from == from_jid or from == jid_bare(from_jid)) then return nil; end
local from_occupant_jid = self:get_occupant_jid(from_jid);
if from_occupant_jid == nil then return nil; end
if not(from == from_jid or from == jid_bare(from_jid)) then return nil; end
local from_occupant_jid = self:get_occupant_jid(from_jid);
if from_occupant_jid == nil then return nil; end
@@
-558,7
+585,7
@@
function room_mt:handle_iq_to_occupant(origin, stanza)
end
end
if session_jid == nil then return nil; end
end
end
if session_jid == nil then return nil; end
- stanza.attr.from, stanza.attr.to, stanza.attr.id = from_occupant_jid, session_jid, id;
+ stanza.attr.from, stanza.attr.to, stanza.attr.id = from_occupant_jid, session_jid,
orig_
id;
end
log("debug", "%s sent private iq stanza to %s (%s)", from, to, stanza.attr.to);
self:route_stanza(stanza);
end
log("debug", "%s sent private iq stanza to %s (%s)", from, to, stanza.attr.to);
self:route_stanza(stanza);
@@
-644,11
+671,11
@@
function room_mt:process_form(origin, stanza)
if form.attr.type == "cancel" then
origin.send(st.reply(stanza));
elseif form.attr.type == "submit" then
if form.attr.type == "cancel" then
origin.send(st.reply(stanza));
elseif form.attr.type == "submit" then
- local fields;
+ local fields
, errors, present
;
if form.tags[1] == nil then -- Instant room
if form.tags[1] == nil then -- Instant room
- fields
=
{};
+ fields
, present = {},
{};
else
else
- fields = self:get_form_layout(stanza.attr.from):data(form);
+ fields
, errors, present
= self:get_form_layout(stanza.attr.from):data(form);
if fields.FORM_TYPE ~= "http://jabber.org/protocol/muc#roomconfig" then
origin.send(st.error_reply(stanza, "cancel", "bad-request", "Form is not of type room configuration"));
return true;
if fields.FORM_TYPE ~= "http://jabber.org/protocol/muc#roomconfig" then
origin.send(st.error_reply(stanza, "cancel", "bad-request", "Form is not of type room configuration"));
return true;
@@
-666,8
+693,13
@@
function room_mt:process_form(origin, stanza)
return true;
end
module:fire_event("muc-config-submitted", event);
return true;
end
module:fire_event("muc-config-submitted", event);
+ for submitted_field in pairs(present) do
+ event.field, event.value = submitted_field, fields[submitted_field];
+ module:fire_event("muc-config-submitted/"..submitted_field, event);
+ end
+ event.field, event.value = nil, nil;
- if self.save then self:save(true); end
+ self:save(true);
origin.send(st.reply(stanza));
if next(event.status_codes) then
origin.send(st.reply(stanza));
if next(event.status_codes) then
@@
-689,12
+721,13
@@
end
function room_mt:clear(x)
x = x or st.stanza("x", {xmlns='http://jabber.org/protocol/muc#user'});
local occupants_updated = {};
function room_mt:clear(x)
x = x or st.stanza("x", {xmlns='http://jabber.org/protocol/muc#user'});
local occupants_updated = {};
- for nick, occupant in self:each_occupant() do
+ for nick, occupant in self:each_occupant() do
-- luacheck: ignore 213
occupant.role = nil;
self:save_occupant(occupant);
occupants_updated[occupant] = true;
end
for occupant in pairs(occupants_updated) do
occupant.role = nil;
self:save_occupant(occupant);
occupants_updated[occupant] = true;
end
for occupant in pairs(occupants_updated) do
+ occupant:set_session(occupant.jid, st.presence({type="unavailable"}), true);
self:publicise_occupant_status(occupant, x);
module:fire_event("muc-occupant-left", { room = self; nick = occupant.nick; occupant = occupant;});
end
self:publicise_occupant_status(occupant, x);
module:fire_event("muc-occupant-left", { room = self; nick = occupant.nick; occupant = occupant;});
end
@@
-723,6
+756,9
@@
end
function room_mt:handle_admin_query_set_command(origin, stanza)
local item = stanza.tags[1].tags[1];
function room_mt:handle_admin_query_set_command(origin, stanza)
local item = stanza.tags[1].tags[1];
+ if not item then
+ origin.send(st.error_reply(stanza, "cancel", "bad-request"));
+ end
if item.attr.jid then -- Validate provided JID
item.attr.jid = jid_prep(item.attr.jid);
if not item.attr.jid then
if item.attr.jid then -- Validate provided JID
item.attr.jid = jid_prep(item.attr.jid);
if not item.attr.jid then
@@
-747,8
+783,12
@@
function room_mt:handle_admin_query_set_command(origin, stanza)
else
success, errtype, err = nil, "cancel", "bad-request";
end
else
success, errtype, err = nil, "cancel", "bad-request";
end
- if not success then origin.send(st.error_reply(stanza, errtype, err)); end
- origin.send(st.reply(stanza));
+ room:save();
+ if not success then
+ origin.send(st.error_reply(stanza, errtype, err));
+ else
+ origin.send(st.reply(stanza));
+ end
return true;
end
return true;
end
@@
-762,7
+802,7
@@
function room_mt:handle_admin_query_get_command(origin, stanza)
if _aff and _aff_rank and not _rol then
-- You need to be at least an admin, and be requesting info about your affifiliation or lower
-- e.g. an admin can't ask for a list of owners
if _aff and _aff_rank and not _rol then
-- You need to be at least an admin, and be requesting info about your affifiliation or lower
-- e.g. an admin can't ask for a list of owners
- local affiliation_rank = valid_affiliations[affiliation];
+ local affiliation_rank = valid_affiliations[affiliation
or "none"
];
if affiliation_rank >= valid_affiliations.admin and affiliation_rank >= _aff_rank then
local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin");
for jid in self:each_affiliation(_aff or "none") do
if affiliation_rank >= valid_affiliations.admin and affiliation_rank >= _aff_rank then
local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin");
for jid in self:each_affiliation(_aff or "none") do
@@
-872,7
+912,7
@@
end
-- Need visitor role or higher to invite
module:hook("muc-pre-invite", function(event)
local room, stanza = event.room, event.stanza;
-- Need visitor role or higher to invite
module:hook("muc-pre-invite", function(event)
local room, stanza = event.room, event.stanza;
- local _from
, _to = stanza.attr.from, stanza.attr.to
;
+ local _from
= stanza.attr.from
;
local inviter = room:get_occupant_by_real_jid(_from);
local role = inviter and inviter.role or room:get_default_role(room:get_affiliation(_from));
if valid_roles[role or "none"] <= valid_roles.visitor then
local inviter = room:get_occupant_by_real_jid(_from);
local role = inviter and inviter.role or room:get_default_role(room:get_affiliation(_from));
if valid_roles[role or "none"] <= valid_roles.visitor then
@@
-944,7
+984,7
@@
function room_mt:handle_mediated_decline(origin, stanza)
:up()
:up();
if not module:fire_event("muc-decline", {room = self, stanza = decline, origin = origin, incoming = stanza}) then
:up()
:up();
if not module:fire_event("muc-decline", {room = self, stanza = decline, origin = origin, incoming = stanza}) then
-
local
declinee = decline.attr.to; -- re-fetch, in case event modified it
+ declinee = decline.attr.to; -- re-fetch, in case event modified it
local occupant
if jid_bare(declinee) == self.jid then -- declinee jid is already an in-room jid
occupant = self:get_occupant_by_nick(declinee);
local occupant
if jid_bare(declinee) == self.jid then -- declinee jid is already an in-room jid
occupant = self:get_occupant_by_nick(declinee);
@@
-980,7
+1020,7
@@
function room_mt:handle_message_to_room(origin, stanza)
local x = stanza:get_child("x", "http://jabber.org/protocol/muc#user");
if x then
local payload = x.tags[1];
local x = stanza:get_child("x", "http://jabber.org/protocol/muc#user");
if x then
local payload = x.tags[1];
- if payload == nil then
+ if payload == nil then
--luacheck: ignore 542
-- fallthrough
elseif payload.name == "invite" and payload.attr.to then
return self:handle_mediated_invite(origin, stanza)
-- fallthrough
elseif payload.name == "invite" and payload.attr.to then
return self:handle_mediated_invite(origin, stanza)
@@
-993,7
+1033,7
@@
function room_mt:handle_message_to_room(origin, stanza)
end
end
end
end
-function room_mt:route_stanza(stanza)
+function room_mt:route_stanza(stanza)
-- luacheck: ignore 212
module:send(stanza);
end
module:send(stanza);
end
@@
-1067,7
+1107,7
@@
function room_mt:set_affiliation(actor, jid, affiliation, reason)
local role = self:get_default_role(affiliation);
local role_rank = valid_roles[role or "none"];
local occupants_updated = {}; -- Filled with old roles
local role = self:get_default_role(affiliation);
local role_rank = valid_roles[role or "none"];
local occupants_updated = {}; -- Filled with old roles
- for nick, occupant in self:each_occupant() do
+ for nick, occupant in self:each_occupant() do
-- luacheck: ignore 213
if occupant.bare_jid == jid or (
-- Outcast can be by host.
is_host_only and affiliation == "outcast" and select(2, jid_split(occupant.bare_jid)) == host
if occupant.bare_jid == jid or (
-- Outcast can be by host.
is_host_only and affiliation == "outcast" and select(2, jid_split(occupant.bare_jid)) == host
@@
-1103,14
+1143,14
@@
function room_mt:set_affiliation(actor, jid, affiliation, reason)
(old_role ~= "moderator" and occupant.role == "moderator") then -- Has gained or lost moderator status
-- Send everyone else's presences (as jid visibility has changed)
for real_jid in occupant:each_session() do
(old_role ~= "moderator" and occupant.role == "moderator") then -- Has gained or lost moderator status
-- Send everyone else's presences (as jid visibility has changed)
for real_jid in occupant:each_session() do
- self:send_occupant_list(real_jid, function(occupant_jid, occupant)
+ self:send_occupant_list(real_jid, function(occupant_jid, occupant)
--luacheck: ignore 212 433
return occupant.bare_jid ~= jid;
end);
end
end
end
return occupant.bare_jid ~= jid;
end);
end
end
end
- if self.save then self:save(); end
+ self:save(true);
module:fire_event("muc-set-affiliation", {
room = self;
module:fire_event("muc-set-affiliation", {
room = self;
@@
-1189,12
+1229,19
@@
function _M.new_room(jid, config)
jid = jid;
_jid_nick = {};
_occupants = {};
jid = jid;
_jid_nick = {};
_occupants = {};
- _data = {
- };
+ _data = config or {};
_affiliations = {};
}, room_mt);
end
_affiliations = {};
}, room_mt);
end
+function room_mt:freeze()
+ return {
+ jid = self.jid;
+ _data = self._data;
+ _affiliations = self._affiliations;
+ }
+end
+
_M.room_mt = room_mt;
return _M;
_M.room_mt = room_mt;
return _M;