if not is_first_dest_session then -- User is swapping into another pre-existing session
log("debug", "session %s is swapping into multisession %s, showing it leave.", real_jid, dest_occupant.nick);
-- Show the other session leaving
- local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";})
- :tag("status"):text("you are joining pre-existing session " .. dest_nick):up();
+ local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";});
add_item(x, self:get_affiliation(bare_jid), "none");
local pr = st.presence{from = dest_occupant.nick, to = real_jid, type = "unavailable"}
+ :tag("status"):text("you are joining pre-existing session " .. dest_nick):up()
:add_child(x);
self:route_stanza(pr);
end
end
self:save_occupant(dest_occupant);
- if orig_occupant == nil then
+ if orig_occupant == nil or muc_x then
-- Send occupant list to newly joined user
self:send_occupant_list(real_jid, function(nick, occupant) -- luacheck: ignore 212
-- Don't include self
self:route_stanza(pr);
end
- if orig_occupant == nil then
+ if orig_occupant == nil or muc_x then
if is_first_dest_session then
module:fire_event("muc-occupant-joined", {
room = self;
end
event.field, event.value = nil, nil;
- self:save();
+ self:save(true);
origin.send(st.reply(stanza));
if next(event.status_codes) then
else
success, errtype, err = nil, "cancel", "bad-request";
end
- self:save();
+ self:save(true);
if not success then
origin.send(st.error_reply(stanza, errtype, err));
else
-- 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 or "none"];
- if affiliation_rank >= valid_affiliations.admin and affiliation_rank >= _aff_rank then
+ if affiliation_rank >= valid_affiliations.admin and affiliation_rank >= _aff_rank
+ or self:get_members_only() and self:get_whois() == "anyone" and affiliation_rank >= valid_affiliations.member then
local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin");
for jid in self:each_affiliation(_aff or "none") do
reply:tag("item", {affiliation = _aff, jid = jid}):up();
end
end
- self:save();
+ self:save(true);
module:fire_event("muc-set-affiliation", {
room = self;
end
function room_mt:freeze(live)
- local frozen = {
+ local frozen, state = {
_jid = self.jid;
_data = self._data;
};
frozen[user] = affiliation;
end
if live then
+ state = {};
for nick, occupant in self:each_occupant() do
- frozen[nick] = {
+ state[nick] = {
bare_jid = occupant.bare_jid;
role = occupant.role;
jid = occupant.jid;
}
for jid, presence in occupant:each_session() do
- frozen[jid] = st.preserialize(presence);
+ state[jid] = st.preserialize(presence);
end
end
local history = self._history;
if history then
- frozen._last_message = st.preserialize(history[#history].stanza);
- frozen._last_message_at = history[#history].timestamp;
+ state._last_message = st.preserialize(history[#history].stanza);
+ state._last_message_at = history[#history].timestamp;
end
end
- return frozen;
+ return frozen, state;
end
-function _M.restore_room(frozen)
+function _M.restore_room(frozen, state)
-- COMPAT
if frozen.jid and frozen._affiliations then
local room = _M.new_room(frozen.jid, frozen._data);
local room_jid = frozen._jid;
local room = _M.new_room(room_jid, frozen._data);
- if frozen._last_message and frozen._last_message_at then
+ if state and state._last_message and state._last_message_at then
room._history = {
- { stanza = st.deserialize(frozen._last_message),
- timestamp = frozen._last_message_at, },
+ { stanza = st.deserialize(state._last_message),
+ timestamp = state._last_message_at, },
};
end
local occupant_sessions = {};
local room_name, room_host = jid_split(room_jid);
for jid, data in pairs(frozen) do
+ local node, host, resource = jid_split(jid);
+ if host:sub(1,1) ~= "_" and not resource and type(data) == "string" then
+ -- bare jid: affiliation
+ room._affiliations[jid] = data;
+ end
+ end
+ for jid, data in pairs(state or frozen) do
local node, host, resource = jid_split(jid);
if node or host:sub(1,1) ~= "_" then
- if not resource and type(data) == "string" then
- -- bare jid: affiliation
- room._affiliations[jid] = data;
- elseif host == room_host and node == room_name and resource and type(data) == "table" then
+ if host == room_host and node == room_name and resource and type(data) == "table" then
-- full room jid: bare real jid and role
local bare_jid = data.bare_jid;
local occupant = occupant_lib.new(bare_jid, jid);