Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 26 Apr 2014 23:02:54 +0000 (01:02 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 26 Apr 2014 23:02:54 +0000 (01:02 +0200)
12 files changed:
core/moduleapi.lua
net/http.lua
net/server_event.lua
net/server_select.lua
plugins/mod_muc_unique.lua [new file with mode: 0644]
plugins/mod_pep_plus.lua [new file with mode: 0644]
plugins/mod_pubsub/mod_pubsub.lua
plugins/mod_pubsub/pubsub.lib.lua
plugins/muc/mod_muc.lua
plugins/muc/muc.lib.lua
util/indexedbheap.lua [new file with mode: 0644]
util/timer.lua

index 65e00d419134b3c5388fa212c30c217c67cb62f5..5a24f69cf9c00c70ec5ce0925c93a192fa41679c 100644 (file)
@@ -16,8 +16,10 @@ local timer = require "util.timer";
 
 local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
 local error, setmetatable, type = error, setmetatable, type;
-local ipairs, pairs, select, unpack = ipairs, pairs, select, unpack;
+local ipairs, pairs, select = ipairs, pairs, select;
 local tonumber, tostring = tonumber, tostring;
+local pack = table.pack or function(...) return {n=select("#",...), ...}; end -- table.pack is only in 5.2
+local unpack = table.unpack or unpack; -- renamed in 5.2
 
 local prosody = prosody;
 local hosts = prosody.hosts;
@@ -347,11 +349,29 @@ function api:send(stanza)
        return core_post_stanza(hosts[self.host], stanza);
 end
 
-function api:add_timer(delay, callback)
-       return timer.add_task(delay, function (t)
-               if self.loaded == false then return; end
-               return callback(t);
-       end);
+local timer_methods = { }
+local timer_mt = {
+       __index = timer_methods;
+}
+function timer_methods:stop( )
+       timer.stop(self.id);
+end
+timer_methods.disarm = timer_methods.stop
+function timer_methods:reschedule(delay)
+       timer.reschedule(self.id, delay)
+end
+
+local function timer_callback(now, id, t)
+       if t.module_env.loaded == false then return; end
+       return t.callback(now, unpack(t, 1, t.n));
+end
+
+function api:add_timer(delay, callback, ...)
+       local t = pack(...)
+       t.module_env = self;
+       t.callback = callback;
+       t.id = timer.add_task(delay, timer_callback, t);
+       return setmetatable(t, timer_mt);
 end
 
 local path_sep = package.config:sub(1,1);
index ab9ec7b6c86f6b4e45c8d8457d0b74bc16ca1b1e..b87c9396473f2c337dc33cf567ce91b670742a21 100644 (file)
@@ -6,7 +6,6 @@
 -- COPYING file in the source package for more information.
 --
 
-local socket = require "socket"
 local b64 = require "util.encodings".base64.encode;
 local url = require "socket.url"
 local httpstream_new = require "net.http.parser".new;
@@ -160,21 +159,17 @@ function request(u, ex, callback)
        end
        local port_number = port and tonumber(port) or (using_https and 443 or 80);
 
-       -- Connect the socket, and wrap it with net.server
-       local conn = socket.tcp();
-       conn:settimeout(10);
-       local ok, err = conn:connect(host, port_number);
-       if not ok and err ~= "timeout" then
-               callback(nil, 0, req);
-               return nil, err;
-       end
-
        local sslctx = false;
        if using_https then
                sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2" } };
        end
 
-       req.handler, req.conn = assert(server.wrapclient(conn, host, port_number, listener, "*a", sslctx));
+       local handler, conn = server.addclient(host, port_number, listener, "*a", sslctx)
+       if not handler then
+               callback(nil, 0, req);
+               return nil, conn;
+       end
+       req.handler, req.conn = handler, conn
        req.write = function (...) return req.handler:write(...); end
 
        req.callback = function (content, code, request, response) log("debug", "Calling callback, status %s", code or "---"); return select(2, xpcall(function () return callback(content, code, request, response) end, handleerr)); end
index 5333099776674de86a591e58b582052d77dc6b03..a3087847ee094e32931e8dde7e9cc0c8976531c3 100644 (file)
@@ -44,8 +44,9 @@ local setmetatable = use "setmetatable"
 local t_insert = table.insert
 local t_concat = table.concat
 
-local ssl = use "ssl"
+local has_luasec, ssl = pcall ( require , "ssl" )
 local socket = use "socket" or require "socket"
+local getaddrinfo = socket.dns.getaddrinfo
 
 local log = require ("util.logger").init("socket")
 
@@ -128,7 +129,7 @@ do
                return self:_destroy();
        end
 
-       function interface_mt:_start_connection(plainssl) -- should be called from addclient
+       function interface_mt:_start_connection(plainssl) -- called from wrapclient
                        local callback = function( event )
                                if EV_TIMEOUT == event then  -- timeout during connection
                                        self.fatalerror = "connection timeout"
@@ -136,7 +137,7 @@ do
                                        self:_close()
                                        debug( "new connection failed. id:", self.id, "error:", self.fatalerror )
                                else
-                                       if plainssl and ssl then  -- start ssl session
+                                       if plainssl and has_luasec then  -- start ssl session
                                                self:starttls(self._sslctx, true)
                                        else  -- normal connection
                                                self:_start_session(true)
@@ -507,7 +508,7 @@ do
                        _sslctx = sslctx; -- parameters
                        _usingssl = false;  -- client is using ssl;
                }
-               if not ssl then interface.starttls = false; end
+               if not has_luasec then interface.starttls = false; end
                interface.id = tostring(interface):match("%x+$");
                interface.writecallback = function( event )  -- called on write events
                        --vdebug( "new client write event, id/ip/port:", interface, ip, port )
@@ -690,7 +691,7 @@ do
                                interface._connections = interface._connections + 1  -- increase connection count
                                local clientinterface = handleclient( client, client_ip, client_port, interface, pattern, listener, sslctx )
                                --vdebug( "client id:", clientinterface, "startssl:", startssl )
-                               if ssl and sslctx then
+                               if has_luasec and sslctx then
                                        clientinterface:starttls(sslctx, true)
                                else
                                        clientinterface:_start_session( true )
@@ -711,25 +712,17 @@ do
 end
 
 local addserver = ( function( )
-       return function( addr, port, listener, pattern, sslcfg, startssl )  -- TODO: check arguments
-               --vdebug( "creating new tcp server with following parameters:", addr or "nil", port or "nil", sslcfg or "nil", startssl or "nil")
+       return function( addr, port, listener, pattern, sslctx, startssl )  -- TODO: check arguments
+               --vdebug( "creating new tcp server with following parameters:", addr or "nil", port or "nil", sslctx or "nil", startssl or "nil")
+               if sslctx and not has_luasec then
+                       debug "fatal error: luasec not found"
+                       return nil, "luasec not found"
+               end
                local server, err = socket.bind( addr, port, cfg.ACCEPT_QUEUE )  -- create server socket
                if not server then
                        debug( "creating server socket on "..addr.." port "..port.." failed:", err )
                        return nil, err
                end
-               local sslctx
-               if sslcfg then
-                       if not ssl then
-                               debug "fatal error: luasec not found"
-                               return nil, "luasec not found"
-                       end
-                       sslctx, err = sslcfg
-                       if err then
-                               debug( "error while creating new ssl context for server socket:", err )
-                               return nil, err
-                       end
-               end
                local interface = handleserver( server, addr, port, pattern, listener, sslctx, startssl )  -- new server handler
                debug( "new server created with id:", tostring(interface))
                return interface
@@ -745,37 +738,34 @@ do
                --function handleclient( client, ip, port, server, pattern, listener, _, sslctx )  -- creates an client interface
        end
 
-       function addclient( addr, serverport, listener, pattern, localaddr, localport, sslcfg, startssl )
-               local client, err = socket.tcp()  -- creating new socket
+       function addclient( addr, serverport, listener, pattern, sslctx, typ )
+               if sslctx and not has_luasec then
+                       debug "need luasec, but not available"
+                       return nil, "luasec not found"
+               end
+               if getaddrinfo and not typ then
+                       local addrinfo, err = getaddrinfo(addr)
+                       if not addrinfo then return nil, err end
+                       if addrinfo[1] and addrinfo[1].family == "inet6" then
+                               typ = "tcp6"
+                       end
+               end
+               local create = socket[typ or "tcp"]
+               if type( create ) ~= "function"  then
+                       return nil, "invalid socket type"
+               end
+               local client, err = create()  -- creating new socket
                if not client then
                        debug( "cannot create socket:", err )
                        return nil, err
                end
                client:settimeout( 0 )  -- set nonblocking
-               if localaddr then
-                       local res, err = client:bind( localaddr, localport, -1 )
-                       if not res then
-                               debug( "cannot bind client:", err )
-                               return nil, err
-                       end
-               end
-               local sslctx
-               if sslcfg then  -- handle ssl/new context
-                       if not ssl then
-                               debug "need luasec, but not available"
-                               return nil, "luasec not found"
-                       end
-                       sslctx, err = sslcfg
-                       if err then
-                               debug( "cannot create new ssl context:", err )
-                               return nil, err
-                       end
-               end
                local res, err = client:connect( addr, serverport )  -- connect
                if res or ( err == "timeout" ) then
-                       local ip, port = client:getsockname( )
-                       local interface = wrapclient( client, ip, serverport, listener, pattern, sslctx, startssl )
-                       interface:_start_connection( startssl )
+                       if client.getsockname then
+                               addr = client:getsockname( )
+                       end
+                       local interface = wrapclient( client, addr, serverport, listener, pattern, sslctx )
                        debug( "new connection id:", interface.id )
                        return interface, err
                else
index daad0f50fb7fd05abcf7f0dd25bb2d985ba643a2..4a36617cf2f34bfaea531621b3a4f0dcfed8f339 100644 (file)
@@ -48,13 +48,14 @@ local coroutine_yield = coroutine.yield
 
 --// extern libs //--
 
-local luasec = use "ssl"
+local has_luasec, luasec = pcall ( require , "ssl" )
 local luasocket = use "socket" or require "socket"
 local luasocket_gettime = luasocket.gettime
+local getaddrinfo = luasocket.dns.getaddrinfo
 
 --// extern lib methods //--
 
-local ssl_wrap = ( luasec and luasec.wrap )
+local ssl_wrap = ( has_luasec and luasec.wrap )
 local socket_bind = luasocket.bind
 local socket_sleep = luasocket.sleep
 local socket_select = luasocket.select
@@ -586,7 +587,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
                        end
                )
        end
-       if luasec then
+       if has_luasec then
                handler.starttls = function( self, _sslctx)
                        if _sslctx then
                                handler:set_sslctx(_sslctx);
@@ -639,7 +640,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
        _socketlist[ socket ] = handler
        _readlistlen = addsocket(_readlist, socket, _readlistlen)
 
-       if sslctx and luasec then
+       if sslctx and has_luasec then
                out_put "server.lua: auto-starting ssl negotiation..."
                handler.autostart_ssl = true;
                local ok, err = handler:starttls(sslctx);
@@ -714,22 +715,23 @@ end
 ----------------------------------// PUBLIC //--
 
 addserver = function( addr, port, listeners, pattern, sslctx ) -- this function provides a way for other scripts to reg a server
+       addr = addr or "*"
        local err
        if type( listeners ) ~= "table" then
                err = "invalid listener table"
-       end
-       if type( port ) ~= "number" or not ( port >= 0 and port <= 65535 ) then
+       elseif type ( addr ) ~= "string" then
+               err = "invalid address"
+       elseif type( port ) ~= "number" or not ( port >= 0 and port <= 65535 ) then
                err = "invalid port"
        elseif _server[ addr..":"..port ] then
                err = "listeners on '[" .. addr .. "]:" .. port .. "' already exist"
-       elseif sslctx and not luasec then
+       elseif sslctx and not has_luasec then
                err = "luasec not found"
        end
        if err then
                out_error( "server.lua, [", addr, "]:", port, ": ", err )
                return nil, err
        end
-       addr = addr or "*"
        local server, err = socket_bind( addr, port, _tcpbacklog )
        if err then
                out_error( "server.lua, [", addr, "]:", port, ": ", err )
@@ -930,17 +932,44 @@ local wrapclient = function( socket, ip, serverport, listeners, pattern, sslctx
        return handler, socket
 end
 
-local addclient = function( address, port, listeners, pattern, sslctx )
-       local client, err = luasocket.tcp( )
+local addclient = function( address, port, listeners, pattern, sslctx, typ )
+       local err
+       if type( listeners ) ~= "table" then
+               err = "invalid listener table"
+       elseif type ( address ) ~= "string" then
+               err = "invalid address"
+       elseif type( port ) ~= "number" or not ( port >= 0 and port <= 65535 ) then
+               err = "invalid port"
+       elseif sslctx and not has_luasec then
+               err = "luasec not found"
+       end
+       if getaddrinfo and not typ then
+               local addrinfo, err = getaddrinfo(address)
+               if not addrinfo then return nil, err end
+               if addrinfo[1] and addrinfo[1].family == "inet6" then
+                       typ = "tcp6"
+               end
+       end
+       local create = luasocket[typ or "tcp"]
+       if type( create ) ~= "function"  then
+               err = "invalid socket type"
+       end
+
+       if err then
+               out_error( "server.lua, addclient: ", err )
+               return nil, err
+       end
+
+       local client, err = create( )
        if err then
                return nil, err
        end
        client:settimeout( 0 )
-       _, err = client:connect( address, port )
-       if err then -- try again
+       local ok, err = client:connect( address, port )
+       if ok or err == "timeout" then
                return wrapclient( client, address, port, listeners, pattern, sslctx )
        else
-               return wrapconnection( nil, listeners, client, address, port, "clientport", pattern, sslctx )
+               return nil, err
        end
 end
 
diff --git a/plugins/mod_muc_unique.lua b/plugins/mod_muc_unique.lua
new file mode 100644 (file)
index 0000000..b27fcff
--- /dev/null
@@ -0,0 +1,11 @@
+-- XEP-0307: Unique Room Names for Multi-User Chat
+local uuid_gen = require "util.uuid".generate;
+module:add_feature "http://jabber.org/protocol/muc#unique"
+module:hook("iq-get/host/http://jabber.org/protocol/muc#unique:unique", function()
+       local origin, stanza = event.origin, event.stanza;
+       origin.send(st.reply(stanza)
+               :tag("unique", {xmlns = "http://jabber.org/protocol/muc#unique"})
+               :text(uuid_gen()) -- FIXME Random UUIDs can theoretically have collisions
+       );
+       return true;
+end,-1);
diff --git a/plugins/mod_pep_plus.lua b/plugins/mod_pep_plus.lua
new file mode 100644 (file)
index 0000000..4a74e43
--- /dev/null
@@ -0,0 +1,368 @@
+local pubsub = require "util.pubsub";
+local jid_bare = require "util.jid".bare;
+local jid_split = require "util.jid".split;
+local set_new = require "util.set".new;
+local st = require "util.stanza";
+local calculate_hash = require "util.caps".calculate_hash;
+local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed;
+
+local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
+local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event";
+local xmlns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner";
+
+local lib_pubsub = module:require "pubsub";
+local handlers = lib_pubsub.handlers;
+local pubsub_error_reply = lib_pubsub.pubsub_error_reply;
+
+local services = {};
+local recipients = {};
+local hash_map = {};
+
+function module.save()
+       return { services = services };
+end
+
+function module.restore(data)
+       services = data.services;
+end
+
+local function subscription_presence(user_bare, recipient)
+       local recipient_bare = jid_bare(recipient);
+       if (recipient_bare == user_bare) then return true; end
+       local username, host = jid_split(user_bare);
+       return is_contact_subscribed(username, host, recipient_bare);
+end
+
+local function get_broadcaster(name)
+       local function simple_broadcast(kind, node, jids, item)
+               if item then
+                       item = st.clone(item);
+                       item.attr.xmlns = nil; -- Clear the pubsub namespace
+               end
+               local message = st.message({ from = name, type = "headline" })
+                       :tag("event", { xmlns = xmlns_pubsub_event })
+                               :tag(kind, { node = node })
+                                       :add_child(item);
+               for jid in pairs(jids) do
+                       module:log("debug", "Sending notification to %s from %s: %s", jid, name, tostring(item));
+                       message.attr.to = jid;
+                       module:send(message);
+               end
+       end
+       return simple_broadcast;
+end
+
+local function get_pep_service(name)
+       if services[name] then
+               return services[name];
+       end
+       services[name] = pubsub.new({
+               capabilities = {
+                       none = {
+                               create = false;
+                               publish = false;
+                               retract = false;
+                               get_nodes = false;
+
+                               subscribe = false;
+                               unsubscribe = false;
+                               get_subscription = false;
+                               get_subscriptions = false;
+                               get_items = false;
+
+                               subscribe_other = false;
+                               unsubscribe_other = false;
+                               get_subscription_other = false;
+                               get_subscriptions_other = false;
+
+                               be_subscribed = true;
+                               be_unsubscribed = true;
+
+                               set_affiliation = false;
+                       };
+                       subscriber = {
+                               create = false;
+                               publish = false;
+                               retract = false;
+                               get_nodes = true;
+
+                               subscribe = true;
+                               unsubscribe = true;
+                               get_subscription = true;
+                               get_subscriptions = true;
+                               get_items = true;
+
+                               subscribe_other = false;
+                               unsubscribe_other = false;
+                               get_subscription_other = false;
+                               get_subscriptions_other = false;
+
+                               be_subscribed = true;
+                               be_unsubscribed = true;
+
+                               set_affiliation = false;
+                       };
+                       publisher = {
+                               create = false;
+                               publish = true;
+                               retract = true;
+                               get_nodes = true;
+
+                               subscribe = true;
+                               unsubscribe = true;
+                               get_subscription = true;
+                               get_subscriptions = true;
+                               get_items = true;
+
+                               subscribe_other = false;
+                               unsubscribe_other = false;
+                               get_subscription_other = false;
+                               get_subscriptions_other = false;
+
+                               be_subscribed = true;
+                               be_unsubscribed = true;
+
+                               set_affiliation = false;
+                       };
+                       owner = {
+                               create = true;
+                               publish = true;
+                               retract = true;
+                               delete = true;
+                               get_nodes = true;
+
+                               subscribe = true;
+                               unsubscribe = true;
+                               get_subscription = true;
+                               get_subscriptions = true;
+                               get_items = true;
+
+
+                               subscribe_other = true;
+                               unsubscribe_other = true;
+                               get_subscription_other = true;
+                               get_subscriptions_other = true;
+
+                               be_subscribed = true;
+                               be_unsubscribed = true;
+
+                               set_affiliation = true;
+                       };
+               };
+
+               autocreate_on_publish = true;
+               autocreate_on_subscribe = true;
+
+               broadcaster = get_broadcaster(name);
+               get_affiliation = function (jid)
+                       if jid_bare(jid) == name then
+                               return "owner";
+                       elseif subscription_presence(name, jid) then
+                               return "subscriber";
+                       end
+               end;
+
+               normalize_jid = jid_bare;
+       });
+       return services[name];
+end
+
+function handle_pubsub_iq(event)
+       local origin, stanza = event.origin, event.stanza;
+       local pubsub = stanza.tags[1];
+       local action = pubsub.tags[1];
+       if not action then
+               return origin.send(st.error_reply(stanza, "cancel", "bad-request"));
+       end
+       local service_name = stanza.attr.to or origin.username.."@"..origin.host
+       local service = get_pep_service(service_name);
+       local handler = handlers[stanza.attr.type.."_"..action.name];
+       if handler then
+               handler(origin, stanza, action, service);
+               return true;
+       end
+end
+
+module:hook("iq/bare/"..xmlns_pubsub..":pubsub", handle_pubsub_iq);
+module:hook("iq/bare/"..xmlns_pubsub_owner..":pubsub", handle_pubsub_iq);
+
+module:add_identity("pubsub", "pep", module:get_option_string("name", "Prosody"));
+module:add_feature("http://jabber.org/protocol/pubsub#publish");
+
+local function get_caps_hash_from_presence(stanza, current)
+       local t = stanza.attr.type;
+       if not t then
+               local child = stanza:get_child("c", "http://jabber.org/protocol/caps");
+               if child then
+                       local attr = child.attr;
+                       if attr.hash then -- new caps
+                               if attr.hash == 'sha-1' and attr.node and attr.ver then
+                                       return attr.ver, attr.node.."#"..attr.ver;
+                               end
+                       else -- legacy caps
+                               if attr.node and attr.ver then
+                                       return attr.node.."#"..attr.ver.."#"..(attr.ext or ""), attr.node.."#"..attr.ver;
+                               end
+                       end
+               end
+               return; -- no or bad caps
+       elseif t == "unavailable" or t == "error" then
+               return;
+       end
+       return current; -- no caps, could mean caps optimization, so return current
+end
+
+local function resend_last_item(jid, node, service)
+       local ok, items = service:get_items(node, jid);
+       if not ok then return; end
+       for i, id in ipairs(items) do
+               service.config.broadcaster("items", node, { [jid] = true }, items[id]);
+       end
+end
+
+local function update_subscriptions(recipient, service_name, nodes)
+       local service = get_pep_service(service_name);
+
+       recipients[service_name] = recipients[service_name] or {};
+       nodes = nodes or set_new();
+       local old = recipients[service_name][recipient];
+
+       if old and type(old) == table then
+               for node in pairs((old - nodes):items()) do
+                       service:remove_subscription(node, recipient, recipient);
+               end
+       end
+
+       for node in nodes:items() do
+               service:add_subscription(node, recipient, recipient);
+               resend_last_item(recipient, node, service);
+       end
+       recipients[service_name][recipient] = nodes;
+end
+
+module:hook("presence/bare", function(event)
+       -- inbound presence to bare JID recieved
+       local origin, stanza = event.origin, event.stanza;
+       local user = stanza.attr.to or (origin.username..'@'..origin.host);
+       local t = stanza.attr.type;
+       local self = not stanza.attr.to;
+       local service = get_pep_service(user);
+
+       if not t then -- available presence
+               if self or subscription_presence(user, stanza.attr.from) then
+                       local recipient = stanza.attr.from;
+                       local current = recipients[user] and recipients[user][recipient];
+                       local hash, query_node = get_caps_hash_from_presence(stanza, current);
+                       if current == hash or (current and current == hash_map[hash]) then return; end
+                       if not hash then
+                               update_subscriptions(recipient, user);
+                       else
+                               recipients[user] = recipients[user] or {};
+                               if hash_map[hash] then
+                                       update_subscriptions(recipient, user, hash_map[hash]);
+                               else
+                                       recipients[user][recipient] = hash;
+                                       local from_bare = origin.type == "c2s" and origin.username.."@"..origin.host;
+                                       if self or origin.type ~= "c2s" or (recipients[from_bare] and recipients[from_bare][origin.full_jid]) ~= hash then
+                                               -- COMPAT from ~= stanza.attr.to because OneTeam can't deal with missing from attribute
+                                               origin.send(
+                                                       st.stanza("iq", {from=user, to=stanza.attr.from, id="disco", type="get"})
+                                                               :tag("query", {xmlns = "http://jabber.org/protocol/disco#info", node = query_node})
+                                               );
+                                       end
+                               end
+                       end
+               end
+       elseif t == "unavailable" then
+               update_subscriptions(stanza.attr.from, user);
+       elseif not self and t == "unsubscribe" then
+               local from = jid_bare(stanza.attr.from);
+               local subscriptions = recipients[user];
+               if subscriptions then
+                       for subscriber in pairs(subscriptions) do
+                               if jid_bare(subscriber) == from then
+                                       update_subscriptions(subscriber, user);
+                               end
+                       end
+               end
+       end
+end, 10);
+
+module:hook("iq-result/bare/disco", function(event)
+       local origin, stanza = event.origin, event.stanza;
+       local disco = stanza:get_child("query", "http://jabber.org/protocol/disco#info");
+       if not disco then
+               return;
+       end
+
+       -- Process disco response
+       local self = not stanza.attr.to;
+       local user = stanza.attr.to or (origin.username..'@'..origin.host);
+       local contact = stanza.attr.from;
+       local current = recipients[user] and recipients[user][contact];
+       if type(current) ~= "string" then return; end -- check if waiting for recipient's response
+       local ver = current;
+       if not string.find(current, "#") then
+               ver = calculate_hash(disco.tags); -- calculate hash
+       end
+       local notify = set_new();
+       for _, feature in pairs(disco.tags) do
+               if feature.name == "feature" and feature.attr.var then
+                       local nfeature = feature.attr.var:match("^(.*)%+notify$");
+                       if nfeature then notify:add(nfeature); end
+               end
+       end
+       hash_map[ver] = notify; -- update hash map
+       if self then
+               for jid, item in pairs(origin.roster) do -- for all interested contacts
+                       if item.subscription == "both" or item.subscription == "from" then
+                               if not recipients[jid] then recipients[jid] = {}; end
+                               update_subscriptions(contact, jid, notify);
+                       end
+               end
+       end
+       update_subscriptions(contact, user, notify);
+end);
+
+module:hook("account-disco-info-node", function(event)
+       local reply, stanza, origin = event.reply, event.stanza, event.origin;
+       local service_name = stanza.attr.to or origin.username.."@"..origin.host
+       local service = get_pep_service(service_name);
+       local node = event.node;
+       local ok = service:get_items(node, jid_bare(stanza.attr.from) or true);
+       if not ok then return; end
+       event.exists = true;
+       reply:tag('identity', {category='pubsub', type='leaf'}):up();
+end);
+
+module:hook("account-disco-info", function(event)
+       local reply = event.reply;
+       reply:tag('identity', {category='pubsub', type='pep'}):up();
+       reply:tag('feature', {var='http://jabber.org/protocol/pubsub#publish'}):up();
+end);
+
+module:hook("account-disco-items-node", function(event)
+       local reply, stanza, origin = event.reply, event.stanza, event.origin;
+       local node = event.node;
+       local service_name = stanza.attr.to or origin.username.."@"..origin.host
+       local service = get_pep_service(service_name);
+       local ok, ret = service:get_items(node, jid_bare(stanza.attr.from) or true);
+       if not ok then return; end
+       event.exists = true;
+       for _, id in ipairs(ret) do
+               reply:tag("item", { jid = service_name, name = id }):up();
+       end
+end);
+
+module:hook("account-disco-items", function(event)
+       local reply, stanza, origin = event.reply, event.stanza, event.origin;
+
+       local service_name = reply.attr.from or origin.username.."@"..origin.host
+       local service = get_pep_service(service_name);
+       local ok, ret = service:get_nodes(jid_bare(stanza.attr.from));
+       if not ok then return; end
+
+       for node, node_obj in pairs(ret) do
+               reply:tag("item", { jid = service_name, node = node, name = node_obj.config.name }):up();
+       end
+end);
index c6dbe83156d39e74d1aa0e37d69d6617c2b135f9..33e729afb5c3c6af5e778242ff2bfe271de921ee 100644 (file)
@@ -100,7 +100,7 @@ module:hook("host-disco-items-node", function (event)
                return;
        end
 
-       for id, item in pairs(ret) do
+       for _, id in ipairs(ret) do
                reply:tag("item", { jid = module.host, name = id }):up();
        end
        event.exists = true;
index 2b015e34983c7ff3bd6ee9602d145f2e9bcb537d..4e9acd6866e0ce4bbdf4a9f4adc58bb9431dae7c 100644 (file)
@@ -42,8 +42,8 @@ function handlers.get_items(origin, stanza, items, service)
        end
 
        local data = st.stanza("items", { node = node });
-       for _, entry in pairs(results) do
-               data:add_child(entry);
+       for _, id in ipairs(results) do
+               data:add_child(results[id]);
        end
        local reply;
        if data then
index c514bafd375b36e810ba3d9887e460f19984abee..8759cba4994ab4f68f6ecf93242cd4bd99bf7b08 100644 (file)
@@ -31,7 +31,6 @@ local muc_new_room = muclib.new_room;
 local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
 local st = require "util.stanza";
-local uuid_gen = require "util.uuid".generate;
 local um_is_admin = require "core.usermanager".is_admin;
 local hosts = prosody.hosts;
 
@@ -47,6 +46,7 @@ muclib.set_max_history_length(module:get_option_number("max_history_messages"));
 module:depends("disco");
 module:add_identity("conference", "text", muc_name);
 module:add_feature("http://jabber.org/protocol/muc");
+module:depends "muc_unique"
 
 local function is_admin(jid)
        return um_is_admin(jid, module.host);
@@ -64,7 +64,6 @@ function muclib.room_mt:set_affiliation(actor, jid, affiliation, callback, reaso
        return _set_affiliation(self, actor, jid, affiliation, callback, reason);
 end
 
-local function room_route_stanza(room, stanza) module:send(stanza); end
 local function room_save(room, forced)
        local node = jid_split(room.jid);
        persistent_rooms[room.jid] = room._data.persistent;
@@ -89,14 +88,13 @@ end
 
 function create_room(jid)
        local room = muc_new_room(jid);
-       room.route_stanza = room_route_stanza;
        room.save = room_save;
        rooms[jid] = room;
        if lock_rooms then
-               room.locked = true;
+               room:lock();
                if lock_room_timeout and lock_room_timeout > 0 then
                        module:add_timer(lock_room_timeout, function ()
-                               if room.locked then
+                               if room:is_locked() then
                                        room:destroy(); -- Not unlocked in time
                                end
                        end);
@@ -106,6 +104,14 @@ function create_room(jid)
        return room;
 end
 
+function forget_room(jid)
+       rooms[jid] = nil;
+end
+
+function get_room_from_jid(room_jid)
+       return rooms[room_jid]
+end
+
 local persistent_errors = false;
 for jid in pairs(persistent_rooms) do
        local node = jid_split(jid);
@@ -123,8 +129,8 @@ end
 if persistent_errors then persistent_rooms_storage:set(nil, persistent_rooms); end
 
 local host_room = muc_new_room(muc_host);
-host_room.route_stanza = room_route_stanza;
 host_room.save = room_save;
+rooms[muc_host] = host_room;
 
 module:hook("host-disco-items", function(event)
        local reply = event.reply;
@@ -136,65 +142,72 @@ module:hook("host-disco-items", function(event)
        end
 end);
 
-local function handle_to_domain(event)
-       local origin, stanza = event.origin, event.stanza;
-       local type = stanza.attr.type;
-       if type == "error" or type == "result" then return; end
-       if stanza.name == "iq" and type == "get" then
-               local xmlns = stanza.tags[1].attr.xmlns;
-               local node = stanza.tags[1].attr.node;
-               if xmlns == "http://jabber.org/protocol/muc#unique" then
-                       origin.send(st.reply(stanza):tag("unique", {xmlns = xmlns}):text(uuid_gen())); -- FIXME Random UUIDs can theoretically have collisions
-               else
-                       origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- TODO disco/etc
-               end
-       else
-               host_room:handle_stanza(origin, stanza);
-               --origin.send(st.error_reply(stanza, "cancel", "service-unavailable", "The muc server doesn't deal with messages and presence directed at it"));
+module:hook("muc-room-destroyed",function(event)
+       local room = event.room
+       forget_room(room.jid)
+end)
+
+module:hook("muc-occupant-left",function(event)
+       local room = event.room
+       if not next(room._occupants) and not persistent_rooms[room.jid] then -- empty, non-persistent room
+               module:fire_event("muc-room-destroyed", { room = room });
        end
-       return true;
-end
+end);
 
-function stanza_handler(event)
+-- Watch presence to create rooms
+local function attempt_room_creation(event)
        local origin, stanza = event.origin, event.stanza;
-       local bare = jid_bare(stanza.attr.to);
-       local room = rooms[bare];
-       if not room then
-               if stanza.name ~= "presence" then
-                       origin.send(st.error_reply(stanza, "cancel", "item-not-found"));
-                       return true;
-               end
-               if not(restrict_room_creation) or
-                 is_admin(stanza.attr.from) or
-                 (restrict_room_creation == "local" and select(2, jid_split(stanza.attr.from)) == module.host:gsub("^[^%.]+%.", "")) then
-                       room = create_room(bare);
-               end
+       local room_jid = jid_bare(stanza.attr.to);
+       if stanza.attr.type == nil and
+               get_room_from_jid(room_jid) == nil and
+               (
+                       not(restrict_room_creation) or
+                       is_admin(stanza.attr.from) or
+                       (
+                               restrict_room_creation == "local" and
+                               select(2, jid_split(stanza.attr.from)) == module.host:gsub("^[^%.]+%.", "")
+                       )
+               ) then
+               create_room(room_jid);
        end
-       if room then
-               room:handle_stanza(origin, stanza);
-               if not next(room._occupants) and not persistent_rooms[room.jid] then -- empty, non-persistent room
-                       module:fire_event("muc-room-destroyed", { room = room });
-                       rooms[bare] = nil; -- discard room
-               end
-       else
-               origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
-       end
-       return true;
 end
-module:hook("iq/bare", stanza_handler, -1);
-module:hook("message/bare", stanza_handler, -1);
-module:hook("presence/bare", stanza_handler, -1);
-module:hook("iq/full", stanza_handler, -1);
-module:hook("message/full", stanza_handler, -1);
-module:hook("presence/full", stanza_handler, -1);
-module:hook("iq/host", handle_to_domain, -1);
-module:hook("message/host", handle_to_domain, -1);
-module:hook("presence/host", handle_to_domain, -1);
+module:hook("presence/full", attempt_room_creation, -1)
+module:hook("presence/bare", attempt_room_creation, -1)
+module:hook("presence/host", attempt_room_creation, -1)
 
-hosts[module.host].send = function(stanza) -- FIXME do a generic fix
-       if stanza.attr.type == "result" or stanza.attr.type == "error" then
-               module:send(stanza);
-       else error("component.send only supports result and error stanzas at the moment"); end
+for event_name, method in pairs {
+       -- Normal room interactions
+       ["iq-get/bare/http://jabber.org/protocol/disco#info:query"] = "handle_disco_info_get_query" ;
+       ["iq-get/bare/http://jabber.org/protocol/disco#items:query"] = "handle_disco_items_get_query" ;
+       ["iq-set/bare/http://jabber.org/protocol/muc#admin:query"] = "handle_admin_query_set_command" ;
+       ["iq-get/bare/http://jabber.org/protocol/muc#admin:query"] = "handle_admin_query_get_command" ;
+       ["iq-set/bare/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_set_to_room" ;
+       ["iq-get/bare/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_get_to_room" ;
+       ["message/bare"] = "handle_message_to_room" ;
+       ["presence/bare"] = "handle_presence_to_room" ;
+       -- Host room
+       ["iq-get/host/http://jabber.org/protocol/disco#info:query"] = "handle_disco_info_get_query" ;
+       ["iq-get/host/http://jabber.org/protocol/disco#items:query"] = "handle_disco_items_get_query" ;
+       ["iq-set/host/http://jabber.org/protocol/muc#admin:query"] = "handle_admin_query_set_command" ;
+       ["iq-get/host/http://jabber.org/protocol/muc#admin:query"] = "handle_admin_query_get_command" ;
+       ["iq-set/host/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_set_to_room" ;
+       ["iq-get/host/http://jabber.org/protocol/muc#owner:query"] = "handle_owner_query_get_to_room" ;
+       ["message/host"] = "handle_message_to_room" ;
+       ["presence/host"] = "handle_presence_to_room" ;
+       -- Direct to occupant (normal rooms and host room)
+       ["presence/full"] = "handle_presence_to_occupant" ;
+       ["iq/full"] = "handle_iq_to_occupant" ;
+       ["message/full"] = "handle_message_to_occupant" ;
+} do
+       module:hook(event_name, function (event)
+               local origin, stanza = event.origin, event.stanza;
+               local room = get_room_from_jid(jid_bare(stanza.attr.to))
+               if room == nil then
+                       origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
+                       return true;
+               end
+               return room[method](room, origin, stanza);
+       end, -2)
 end
 
 hosts[module:get_host()].muc = { rooms = rooms };
index 8cf8d882e5895962a2a3e779267a52e9d6cc4e46..5debb4a36ada98541951e43ce976fd3878c5f432 100644 (file)
@@ -1,6 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
+-- Copyright (C) 2014 Daurnimator
 --
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -9,6 +10,7 @@
 local select = select;
 local pairs, ipairs = pairs, ipairs;
 
+local gettime = os.time;
 local datetime = require "util.datetime";
 
 local dataform = require "util.dataforms";
@@ -23,44 +25,42 @@ local setmetatable = setmetatable;
 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;
@@ -69,6 +69,10 @@ function room_mt:__tostring()
        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";
@@ -81,6 +85,26 @@ function room_mt:get_default_role(affiliation)
        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];
@@ -90,51 +114,49 @@ function room_mt:broadcast_presence(stanza, sid, code, nick)
                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
-       end
-       stanza.attr.to = to;
-       if historic then -- add to history
-               return self:save_to_history(stanza)
-       end
-end
-function room_mt:save_to_history(stanza)
-       local history = self._data['history'];
-       if not history then history = {}; self._data['history'] = history; 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)
-       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
+       module:fire_event("muc-broadcast-message", {room = self, stanza = stanza, historic = historic});
+       self:broadcast(stanza);
 end
+
+-- add to history
+module:hook("muc-broadcast-message", function(event)
+       if event.historic then
+               local room = event.room
+               local history = room._data['history'];
+               if not history then history = {}; room._data['history'] = history; end
+               local stanza = st.clone(event.stanza);
+               stanza.attr.to = "";
+               local ts = gettime();
+               local stamp = datetime.datetime(ts);
+               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, timestamp = ts };
+               t_insert(history, entry);
+               while #history > room:get_historylength() do t_remove(history, 1) end
+       end
+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
+       return self:broadcast(stanza, function(rnick, occupant) return rnick ~= nick end)
+end
+
+-- Broadcast a stanza to all occupants in the room.
+-- optionally checks conditional called with nicl
+function room_mt:broadcast(stanza, cond_func)
+       for nick, occupant in pairs(self._occupants) do
+               if cond_func == nil or cond_func(nick, occupant) then
+                       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]);
@@ -145,52 +167,88 @@ function room_mt:send_occupant_list(to)
                end
        end
 end
-function room_mt:send_history(to, stanza)
-       local history = self._data['history']; -- send discussion history
-       if history then
-               local x_tag = stanza and stanza:get_child("x", "http://jabber.org/protocol/muc");
-               local history_tag = x_tag and x_tag:get_child("history", "http://jabber.org/protocol/muc");
 
-               local maxchars = history_tag and tonumber(history_tag.attr.maxchars);
-               if maxchars then maxchars = math.floor(maxchars); end
+local function parse_history(stanza)
+       local x_tag = stanza:get_child("x", "http://jabber.org/protocol/muc");
+       local history_tag = x_tag and x_tag:get_child("history", "http://jabber.org/protocol/muc");
+       if not history_tag then
+               return nil, 20, nil
+       end
+
+       local maxchars = tonumber(history_tag.attr.maxchars);
 
-               local maxstanzas = math.floor(history_tag and tonumber(history_tag.attr.maxstanzas) or #history);
-               if not history_tag then maxstanzas = 20; end
+       local maxstanzas = tonumber(history_tag.attr.maxstanzas);
 
-               local seconds = history_tag and tonumber(history_tag.attr.seconds);
-               if seconds then seconds = datetime.datetime(os.time() - math.floor(seconds)); end
+       -- messages received since the UTC datetime specified
+       local since = history_tag.attr.since;
+       if since then
+               since = datetime.parse(since);
+       end
 
-               local since = history_tag and history_tag.attr.since;
-               if since then since = datetime.parse(since); since = since and datetime.datetime(since); end
-               if seconds and (not since or since < seconds) then since = seconds; end
+       -- messages received in the last "X" seconds.
+       local seconds = tonumber(history_tag.attr.seconds);
+       if seconds then
+               seconds = gettime() - seconds
+               if since then
+                       since = math.max(since, seconds);
+               else
+                       since = seconds;
+               end
+       end
 
-               local n = 0;
-               local charcount = 0;
+       return maxchars, maxstanzas, since
+end
 
-               for i=#history,1,-1 do
-                       local entry = history[i];
-                       if maxchars then
-                               if not entry.chars then
-                                       entry.stanza.attr.to = "";
-                                       entry.chars = #tostring(entry.stanza);
-                               end
-                               charcount = charcount + entry.chars + #to;
-                               if charcount > maxchars then break; end
+module:hook("muc-get-history", function(event)
+       local room = event.room
+       local history = room._data['history']; -- send discussion history
+       if not history then return nil end
+       local history_len = #history
+
+       local to = event.to
+       local maxchars = event.maxchars
+       local maxstanzas = event.maxstanzas or history_len
+       local since = event.since
+       local n = 0;
+       local charcount = 0;
+       for i=history_len,1,-1 do
+               local entry = history[i];
+               if maxchars then
+                       if not entry.chars then
+                               entry.stanza.attr.to = "";
+                               entry.chars = #tostring(entry.stanza);
                        end
-                       if since and since > entry.stamp then break; end
-                       if n + 1 > maxstanzas then break; end
-                       n = n + 1;
-               end
-               for i=#history-n+1,#history do
-                       local msg = history[i].stanza;
-                       msg.attr.to = to;
-                       self:_route_stanza(msg);
+                       charcount = charcount + entry.chars + #to;
+                       if charcount > maxchars then break; end
                end
+               if since and since > entry.timestamp then break; end
+               if n + 1 > maxstanzas then break; end
+               n = n + 1;
        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']));
+
+       local i = history_len-n+1
+       function event:next_stanza()
+               if i > history_len then return nil end
+               local entry = history[i]
+               local msg = entry.stanza
+               msg.attr.to = to;
+               i = i + 1
+               return msg
+       end
+       return true;
+end)
+
+function room_mt:send_history(stanza)
+       local maxchars, maxstanzas, since = parse_history(stanza)
+       local event = {
+               room = self;
+               to = stanza.attr.from; -- `to` is required to calculate the character count for `maxchars`
+               maxchars = maxchars, maxstanzas = maxstanzas, since = since;
+               next_stanza = function() end; -- events should define this iterator
+       }
+       module:fire_event("muc-get-history", event)
+       for msg in event.next_stanza , event do
+               self:_route_stanza(msg);
        end
 end
 
@@ -204,7 +262,7 @@ function room_mt:get_disco_info(stanza)
                :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 = "" },
@@ -219,25 +277,44 @@ function room_mt:get_disco_items(stanza)
        end
        return reply;
 end
+
+function room_mt:get_subject()
+       return self._data['subject'], self._data['subject_from']
+end
+local function create_subject_message(subject)
+       return st.message({type='groupchat'})
+               :tag('subject'):text(subject):up();
+end
+function room_mt:send_subject(to)
+       local from, subject = self:get_subject()
+       if subject then
+               local msg = create_subject_message(subject)
+               msg.attr.from = from
+               msg.attr.to = to
+               self:_route_stanza(msg);
+       end
+end
 function room_mt:set_subject(current_nick, subject)
        if subject == "" then subject = nil; end
        self._data['subject'] = subject;
        self._data['subject_from'] = current_nick;
        if self.save then self:save(); end
-       local msg = st.message({type='groupchat', from=current_nick})
-               :tag('subject'):text(subject):up();
+       local msg = create_subject_message(subject)
+       msg.attr.from = current_nick
        self:broadcast_message(msg, false);
        return true;
 end
 
-local function build_unavailable_presence_from_error(stanza)
+function room_mt:handle_kickable(origin, stanza)
        local type, condition, text = stanza:get_error();
        local error_message = "Kicked: "..(condition and condition:gsub("%-", " ") or "presence error");
        if text then
                error_message = error_message..": "..text;
        end
-       return st.presence({type='unavailable', from=stanza.attr.from, to=stanza.attr.to})
+       local kick_stanza = st.presence({type='unavailable', from=stanza.attr.from, to=stanza.attr.to})
                :tag('status'):text(error_message);
+       self:handle_unavailable_to_occupant(origin, kick_stanza); -- send unavailable
+       return true;
 end
 
 function room_mt:set_name(name)
@@ -351,237 +428,309 @@ function room_mt:get_whois()
        return self._data.whois;
 end
 
-local function construct_stanza_id(room, stanza)
-       local from_jid, to_nick = stanza.attr.from, stanza.attr.to;
-       local from_nick = room._jid_nick[from_jid];
-       local occupant = room._occupants[to_nick];
-       local to_jid = occupant.jid;
+function room_mt:handle_unavailable_to_occupant(origin, stanza)
+       local from = stanza.attr.from;
+       local current_nick = self:get_occupant_jid(from);
+       if not current_nick then
+               return true; -- discard
+       end
+       local pr = get_filtered_presence(stanza);
+       pr.attr.from = current_nick;
+       log("debug", "%s leaving %s", current_nick, self.jid);
+       self._jid_nick[from] = nil;
+       local occupant = self._occupants[current_nick];
+       local new_jid = next(occupant.sessions);
+       if new_jid == from then new_jid = next(occupant.sessions, new_jid); end
+       if new_jid then
+               local jid = occupant.jid;
+               occupant.jid = new_jid;
+               occupant.sessions[from] = nil;
+               pr.attr.to = from;
+               pr:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
+                       :tag("item", {affiliation=occupant.affiliation or "none", role='none'}):up()
+                       :tag("status", {code='110'}):up();
+               self:_route_stanza(pr);
+               if jid ~= new_jid then
+                       pr = st.clone(occupant.sessions[new_jid])
+                               :tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
+                               :tag("item", {affiliation=occupant.affiliation or "none", role=occupant.role or "none"});
+                       pr.attr.from = current_nick;
+                       self:broadcast_except_nick(pr, current_nick);
+               end
+       else
+               occupant.role = 'none';
+               self:broadcast_presence(pr, from);
+               self._occupants[current_nick] = nil;
+               module:fire_event("muc-occupant-left", { room = self; nick = current_nick; });
+       end
+       return true;
+end
+
+function room_mt:handle_occupant_presence(origin, stanza)
+       local from = stanza.attr.from;
+       local pr = get_filtered_presence(stanza);
+       local current_nick = stanza.attr.to
+       pr.attr.from = current_nick;
+       log("debug", "%s broadcasted presence", current_nick);
+       self._occupants[current_nick].sessions[from] = pr;
+       self:broadcast_presence(pr, from);
+       return true;
+end
 
-       return from_nick, to_jid, base64.encode(to_jid.."\0"..stanza.attr.id.."\0"..md5(from_jid));
+function room_mt:handle_change_nick(origin, stanza, current_nick, to)
+       local from = stanza.attr.from;
+       local occupant = self._occupants[current_nick];
+       local is_multisession = next(occupant.sessions, next(occupant.sessions));
+       if self._occupants[to] or is_multisession then
+               log("debug", "%s couldn't change nick", current_nick);
+               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
+               local to_nick = select(3, jid_split(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] = occupant;
+               self._jid_nick[from] = to;
+               local pr = get_filtered_presence(stanza);
+               pr.attr.from = to;
+               self._occupants[to].sessions[from] = pr;
+               self:broadcast_presence(pr, from);
+               return true;
+       end
 end
-local function deconstruct_stanza_id(room, stanza)
-       local from_jid_possiblybare, to_nick = stanza.attr.from, stanza.attr.to;
-       local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(.+)%z(.*)%z(.+)$");
-       local from_nick = room._jid_nick[from_jid];
 
-       if not(from_nick) then return; end
-       if not(from_jid_possiblybare == from_jid or from_jid_possiblybare == jid_bare(from_jid)) then return; end
+module:hook("muc-occupant-pre-join", function(event)
+       return module:fire_event("muc-occupant-pre-join/affiliation", event)
+               or module:fire_event("muc-occupant-pre-join/password", event)
+               or module:fire_event("muc-occupant-pre-join/locked", event)
+               or module:fire_event("muc-occupant-pre-join/nick-conflict", event)
+end, -1)
+
+module:hook("muc-occupant-pre-join/password", function(event)
+       local room, stanza = event.room, event.stanza;
+       local from, to = stanza.attr.from, stanza.attr.to;
+       local password = stanza:get_child("x", "http://jabber.org/protocol/muc");
+       password = password and password:get_child_text("password", "http://jabber.org/protocol/muc");
+       if not password or password == "" then password = nil; end
+       if room:get_password() ~= password then
+               local from, to = stanza.attr.from, stanza.attr.to;
+               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";
+               event.origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
+               return true;
+       end
+end, -1)
+
+module:hook("muc-occupant-pre-join/nick-conflict", function(event)
+       local room, stanza = event.room, event.stanza;
+       local from, to = stanza.attr.from, stanza.attr.to;
+       local occupant = room._occupants[to]
+       if occupant -- occupant already exists
+               and jid_bare(from) ~= jid_bare(occupant.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";
+               event.origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
+               return true;
+       end
+end, -1)
+
+module:hook("muc-occupant-pre-join/locked", function(event)
+       if event.room:is_locked() then -- Deny entry
+               event.origin.send(st.error_reply(event.stanza, "cancel", "item-not-found"));
+               return true;
+       end
+end, -1)
 
-       local occupant = room._occupants[to_nick];
-       for to_jid in pairs(occupant and occupant.sessions or {}) do
-               if md5(to_jid) == to_jid_hash then
-                       return from_nick, to_jid, id;
+function room_mt:handle_join(origin, stanza)
+       local from, to = stanza.attr.from, stanza.attr.to;
+       local affiliation = self:get_affiliation(from);
+       if affiliation == nil and next(self._affiliations) == nil then -- new room, no owners
+               affiliation = "owner";
+               self._affiliations[jid_bare(from)] = affiliation;
+               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
+       end
+       if module:fire_event("muc-occupant-pre-join", {
+               room = self;
+               origin = origin;
+               stanza = stanza;
+               affiliation = affiliation;
+       }) then return true; end
+       log("debug", "%s joining as %s", from, to);
+
+       local role = self:get_default_role(affiliation)
+       if role then -- new occupant
+               local is_merge = not not self._occupants[to]
+               if not is_merge then
+                       self._occupants[to] = {affiliation=affiliation, role=role, jid=from, sessions={[from]=get_filtered_presence(stanza)}};
+               else
+                       self._occupants[to].sessions[from] = get_filtered_presence(stanza);
                end
+               self._jid_nick[from] = to;
+               self:send_occupant_list(from);
+               local pr = get_filtered_presence(stanza);
+               pr.attr.from = to;
+               pr:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
+                       :tag("item", {affiliation=affiliation or "none", role=role or "none"}):up();
+               if not is_merge then
+                       self:broadcast_except_nick(pr, to);
+               end
+               pr:tag("status", {code='110'}):up();
+               if self:get_whois() == 'anyone' then
+                       pr:tag("status", {code='100'}):up();
+               end
+               if self:is_locked() then
+                       pr:tag("status", {code='201'}):up();
+               end
+               pr.attr.to = from;
+               self:_route_stanza(pr);
+               self:send_history(from, stanza);
+               self:send_subject(from);
+               return true;
        end
 end
 
+-- registration required for entering members-only room
+module:hook("muc-occupant-pre-join/affiliation", function(event)
+       if event.affiliation == nil and event.room:get_members_only() then
+               local reply = st.error_reply(event.stanza, "auth", "registration-required"):up();
+               reply.tags[1].attr.code = "407";
+               event.origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
+               return true;
+       end
+end, -1)
+
+-- banned
+module:hook("muc-occupant-pre-join/affiliation", function(event)
+       if event.affiliation == "outcast" then
+               local reply = st.error_reply(event.stanza, "auth", "forbidden"):up();
+               reply.tags[1].attr.code = "403";
+               event.origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
+               return true;
+       end
+end, -1)
 
-function room_mt:handle_to_occupant(origin, stanza) -- PM, vCards, etc
+function room_mt:handle_available_to_occupant(origin, stanza)
        local from, to = stanza.attr.from, stanza.attr.to;
-       local room = jid_bare(to);
-       local current_nick = self._jid_nick[from];
-       local type = stanza.attr.type;
-       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
-               local pr = get_filtered_presence(stanza);
-               pr.attr.from = current_nick;
-               if type == "error" then -- error, kick em out!
-                       if current_nick then
-                               log("debug", "kicking %s from %s", current_nick, room);
-                               self:handle_to_occupant(origin, build_unavailable_presence_from_error(stanza));
+       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
+                               return self:handle_occupant_presence(origin, stanza)
+                       else -- change nick
+                               return self:handle_change_nick(origin, stanza, current_nick, to)
                        end
-               elseif type == "unavailable" then -- unavailable
-                       if current_nick then
-                               log("debug", "%s leaving %s", current_nick, room);
-                               self._jid_nick[from] = nil;
-                               local occupant = self._occupants[current_nick];
-                               local new_jid = next(occupant.sessions);
-                               if new_jid == from then new_jid = next(occupant.sessions, new_jid); end
-                               if new_jid then
-                                       local jid = occupant.jid;
-                                       occupant.jid = new_jid;
-                                       occupant.sessions[from] = nil;
-                                       pr.attr.to = from;
-                                       pr:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
-                                               :tag("item", {affiliation=occupant.affiliation or "none", role='none'}):up()
-                                               :tag("status", {code='110'}):up();
-                                       self:_route_stanza(pr);
-                                       if jid ~= new_jid then
-                                               pr = st.clone(occupant.sessions[new_jid])
-                                                       :tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
-                                                       :tag("item", {affiliation=occupant.affiliation or "none", role=occupant.role or "none"});
-                                               pr.attr.from = current_nick;
-                                               self:broadcast_except_nick(pr, current_nick);
-                                       end
-                               else
-                                       occupant.role = 'none';
-                                       self:broadcast_presence(pr, from);
-                                       self._occupants[current_nick] = nil;
-                               end
-                       end
-               elseif not type then -- available
-                       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
-                                               log("debug", "%s broadcasted presence", current_nick);
-                                               self._occupants[current_nick].sessions[from] = pr;
-                                               self:broadcast_presence(pr, from);
-                                       else -- change nick
-                                               local occupant = self._occupants[current_nick];
-                                               local is_multisession = next(occupant.sessions, next(occupant.sessions));
-                                               if self._occupants[to] or is_multisession then
-                                                       log("debug", "%s couldn't change nick", current_nick);
-                                                       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"}));
-                                               else
-                                                       local data = self._occupants[current_nick];
-                                                       local to_nick = select(3, jid_split(to));
-                                                       if to_nick then
-                                                               log("debug", "%s (%s) changing nick to %s", current_nick, data.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._jid_nick[from] = to;
-                                                               pr.attr.from = to;
-                                                               self._occupants[to].sessions[from] = pr;
-                                                               self:broadcast_presence(pr, from);
-                                                       else
-                                                               --TODO malformed-jid
-                                                       end
-                                               end
-                                       end
-                               --else -- possible rejoin
-                               --      log("debug", "%s had connection replaced", current_nick);
-                               --      self:handle_to_occupant(origin, st.presence({type='unavailable', from=from, to=to})
-                               --              :tag('status'):text('Replaced by new connection'):up()); -- send unavailable
-                               --      self:handle_to_occupant(origin, stanza); -- resend available
-                               --end
-                       else -- enter room
-                               local new_nick = to;
-                               local is_merge;
-                               if self._occupants[to] then
-                                       if jid_bare(from) ~= jid_bare(self._occupants[to].jid) then
-                                               new_nick = nil;
-                                       end
-                                       is_merge = true;
-                               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"}));
-                               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"}));
-                               else
-                                       log("debug", "%s joining as %s", from, to);
-                                       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
-                                               end
-                                       elseif self.locked then -- Deny entry
-                                               origin.send(st.error_reply(stanza, "cancel", "item-not-found"));
-                                               return;
-                                       end
-                                       local affiliation = self:get_affiliation(from);
-                                       local role = self:get_default_role(affiliation)
-                                       if role then -- new occupant
-                                               if not is_merge then
-                                                       self._occupants[to] = {affiliation=affiliation, role=role, jid=from, sessions={[from]=get_filtered_presence(stanza)}};
-                                               else
-                                                       self._occupants[to].sessions[from] = get_filtered_presence(stanza);
-                                               end
-                                               self._jid_nick[from] = to;
-                                               self:send_occupant_list(from);
-                                               pr.attr.from = to;
-                                               pr:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
-                                                       :tag("item", {affiliation=affiliation or "none", role=role or "none"}):up();
-                                               if not is_merge then
-                                                       self:broadcast_except_nick(pr, to);
-                                               end
-                                               pr:tag("status", {code='110'}):up();
-                                               if self._data.whois == 'anyone' then
-                                                       pr:tag("status", {code='100'}):up();
-                                               end
-                                               if self.locked then
-                                                       pr:tag("status", {code='201'}):up();
-                                               end
-                                               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";
-                                               origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
-                                       else -- banned
-                                               local reply = st.error_reply(stanza, "auth", "forbidden"):up();
-                                               reply.tags[1].attr.code = "403";
-                                               origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
-                                       end
+               --else -- possible rejoin
+               --      log("debug", "%s had connection replaced", current_nick);
+               --      self:handle_to_occupant(origin, st.presence({type='unavailable', from=from, to=to})
+               --              :tag('status'):text('Replaced by new connection'):up()); -- send unavailable
+               --      self:handle_to_occupant(origin, stanza); -- resend available
+               --end
+       else -- enter room
+               return self:handle_join(origin, stanza)
+       end
+end
+
+function room_mt:handle_presence_to_occupant(origin, stanza)
+       local type = stanza.attr.type;
+       if type == "error" then -- error, kick em out!
+               return self:handle_kickable(origin, stanza)
+       elseif type == "unavailable" then -- unavailable
+               return self:handle_unavailable_to_occupant(origin, stanza)
+       elseif not type then -- available
+               return self:handle_available_to_occupant(origin, stanza)
+       elseif type ~= 'result' then -- bad type
+               if type ~= 'visible' and type ~= 'invisible' then -- COMPAT ejabberd can broadcast or forward XEP-0018 presences
+                       origin.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME correct error?
+               end
+       end
+       return true;
+end
+
+function room_mt:handle_iq_to_occupant(origin, stanza)
+       local from, to = stanza.attr.from, stanza.attr.to;
+       local type = stanza.attr.type;
+       local id = stanza.attr.id;
+       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
+                       if not current_nick or not o_data then return nil; end
+                       local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(.+)%z(.*)%z(.+)$");
+                       if not(from == from_jid or from == jid_bare(from_jid)) then return nil; end
+                       local session_jid
+                       for to_jid in pairs(o_data.sessions) do
+                               if md5(to_jid) == to_jid_hash then
+                                       session_jid = to_jid;
+                                       break;
                                end
                        end
-               elseif type ~= 'result' then -- bad type
-                       if type ~= 'visible' and type ~= 'invisible' then -- COMPAT ejabberd can broadcast or forward XEP-0018 presences
-                               origin.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME correct error?
-                       end
+                       if session_jid == nil then return nil; end
+                       stanza.attr.from, stanza.attr.to, stanza.attr.id = current_nick, session_jid, id
                end
-       elseif not current_nick then -- not in room
-               if (type == "error" or type == "result") and stanza.name == "iq" then
-                       local id = stanza.attr.id;
-                       stanza.attr.from, stanza.attr.to, stanza.attr.id = deconstruct_stanza_id(self, stanza);
-                       if stanza.attr.id then
-                               self:_route_stanza(stanza);
-                       end
-                       stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id;
-               elseif type ~= "error" then
+               log("debug", "%s sent private iq stanza to %s (%s)", from, to, stanza.attr.to);
+               self:_route_stanza(stanza);
+               stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id;
+               return true;
+       else -- Type is "get" or "set"
+               if not current_nick then
                        origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
+                       return true;
                end
-       elseif stanza.name == "message" and type == "groupchat" then -- groupchat messages not allowed in PM
-               origin.send(st.error_reply(stanza, "modify", "bad-request"));
-       elseif current_nick and stanza.name == "message" and type == "error" and is_kickable_error(stanza) then
-               log("debug", "%s kicked from %s for sending an error message", current_nick, self.jid);
-               self:handle_to_occupant(origin, build_unavailable_presence_from_error(stanza)); -- send unavailable
-       else -- private stanza
-               local o_data = self._occupants[to];
-               if o_data then
-                       log("debug", "%s sent private stanza to %s (%s)", from, to, o_data.jid);
-                       if stanza.name == "iq" then
-                               local id = stanza.attr.id;
-                               if stanza.attr.type == "get" or stanza.attr.type == "set" then
-                                       stanza.attr.from, stanza.attr.to, stanza.attr.id = construct_stanza_id(self, stanza);
-                               else
-                                       stanza.attr.from, stanza.attr.to, stanza.attr.id = deconstruct_stanza_id(self, stanza);
-                               end
-                               if type == 'get' and stanza.tags[1].attr.xmlns == 'vcard-temp' then
-                                       stanza.attr.to = jid_bare(stanza.attr.to);
-                               end
-                               if stanza.attr.id then
-                                       self:_route_stanza(stanza);
-                               end
-                               stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id;
-                       else -- message
-                               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;
-                       end
-               elseif type ~= "error" and type ~= "result" then -- recipient not in room
+               if not o_data then -- recipient not in room
                        origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Recipient not in room"));
+                       return true;
+               end
+               do -- construct_stanza_id
+                       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);
+               if stanza.tags[1].attr.xmlns == 'vcard-temp' then
+                       stanza.attr.to = jid_bare(stanza.attr.to);
+               end
+               self:_route_stanza(stanza);
+               stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id;
+               return true;
+       end
+end
+
+function room_mt:handle_message_to_occupant(origin, stanza)
+       local from, to = stanza.attr.from, stanza.attr.to;
+       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
+                       origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
                end
+               return true;
        end
+       if type == "groupchat" then -- groupchat messages not allowed in PM
+               origin.send(st.error_reply(stanza, "modify", "bad-request"));
+               return true;
+       elseif type == "error" and is_kickable_error(stanza) then
+               log("debug", "%s kicked from %s for sending an error message", current_nick, self.jid);
+               return self:handle_kickable(origin, stanza); -- send unavailable
+       end
+
+       local o_data = self._occupants[to];
+       if not o_data then
+               origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Recipient not in room"));
+               return true;
+       end
+       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;
+       self:route_to_occupant(o_data, stanza)
+       stanza.attr.from = from;
+       return true;
 end
 
 function room_mt:send_form(origin, stanza)
@@ -591,6 +740,7 @@ function room_mt:send_form(origin, stanza)
 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.",
@@ -634,8 +784,8 @@ function room_mt:get_form_layout(actor)
                        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' }
                        }
                },
                {
@@ -668,8 +818,7 @@ end
 
 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
@@ -704,9 +853,8 @@ function room_mt:process_form(origin, stanza)
        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));
 
@@ -737,211 +885,296 @@ function room_mt:destroy(newjid, reason, password)
                        self._jid_nick[jid] = nil;
                end
                self._occupants[nick] = nil;
+               module:fire_event("muc-occupant-left", { room = self; nick = nick; });
        end
        self:set_persistent(false);
        module:fire_event("muc-room-destroyed", { room = self });
 end
 
-function room_mt:handle_to_room(origin, stanza) -- presence changes and groupchat messages, along with disco/etc
-       local type = stanza.attr.type;
-       local xmlns = stanza.tags[1] and stanza.tags[1].attr.xmlns;
-       if stanza.name == "iq" then
-               if xmlns == "http://jabber.org/protocol/disco#info" and type == "get" and not stanza.tags[1].attr.node then
-                       origin.send(self:get_disco_info(stanza));
-               elseif xmlns == "http://jabber.org/protocol/disco#items" and type == "get" and not stanza.tags[1].attr.node then
-                       origin.send(self:get_disco_items(stanza));
-               elseif xmlns == "http://jabber.org/protocol/muc#admin" then
-                       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];
-                       if item and item.name == "item" then
-                               if type == "set" then
-                                       local callback = function() origin.send(st.reply(stanza)); end
-                                       if item.attr.jid then -- Validate provided JID
-                                               item.attr.jid = jid_prep(item.attr.jid);
-                                               if not item.attr.jid then
-                                                       origin.send(st.error_reply(stanza, "modify", "jid-malformed"));
-                                                       return;
-                                               end
-                                       end
-                                       if not item.attr.jid and item.attr.nick then -- COMPAT Workaround for Miranda sending 'nick' instead of 'jid' when changing affiliation
-                                               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];
-                                               if nick then item.attr.nick = select(3, jid_split(nick)); end
-                                       end
-                                       local reason = item.tags[1] and item.tags[1].name == "reason" and #item.tags[1] == 1 and item.tags[1][1];
-                                       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
-                                       elseif item.attr.role and item.attr.nick and not item.attr.affiliation then
-                                               local success, errtype, err = self:set_role(actor, self.jid.."/"..item.attr.nick, item.attr.role, callback, reason);
-                                               if not success then origin.send(st.error_reply(stanza, errtype, err)); end
-                                       else
-                                               origin.send(st.error_reply(stanza, "cancel", "bad-request"));
-                                       end
-                               elseif type == "get" then
-                                       local _aff = item.attr.affiliation;
-                                       local _rol = item.attr.role;
-                                       if _aff and not _rol then
-                                               if affiliation == "owner" or (affiliation == "admin" and _aff ~= "owner" and _aff ~= "admin") then
-                                                       local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin");
-                                                       for jid, affiliation in pairs(self._affiliations) do
-                                                               if affiliation == _aff then
-                                                                       reply:tag("item", {affiliation = _aff, jid = jid}):up();
-                                                               end
-                                                       end
-                                                       origin.send(reply);
-                                               else
-                                                       origin.send(st.error_reply(stanza, "auth", "forbidden"));
-                                               end
-                                       elseif _rol and not _aff then
-                                               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
-                                                               if occupant.role == _rol then
-                                                                       reply:tag("item", {
-                                                                               nick = select(3, jid_split(occupant_jid)),
-                                                                               role = _rol or "none",
-                                                                               affiliation = occupant.affiliation or "none",
-                                                                               jid = occupant.jid
-                                                                               }):up();
-                                                               end
-                                                       end
-                                                       origin.send(reply);
-                                               else
-                                                       origin.send(st.error_reply(stanza, "auth", "forbidden"));
-                                               end
-                                       else
-                                               origin.send(st.error_reply(stanza, "cancel", "bad-request"));
-                                       end
+function room_mt:handle_disco_info_get_query(origin, stanza)
+       origin.send(self:get_disco_info(stanza));
+       return true;
+end
+
+function room_mt:handle_disco_items_get_query(origin, stanza)
+       origin.send(self:get_disco_items(stanza));
+       return true;
+end
+
+function room_mt:handle_admin_query_set_command(origin, stanza)
+       local item = stanza.tags[1].tags[1];
+       if item.attr.jid then -- Validate provided JID
+               item.attr.jid = jid_prep(item.attr.jid);
+               if not item.attr.jid then
+                       origin.send(st.error_reply(stanza, "modify", "jid-malformed"));
+                       return true;
+               end
+       end
+       if not item.attr.jid and item.attr.nick then -- COMPAT Workaround for Miranda sending 'nick' instead of 'jid' when changing affiliation
+               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: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: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
+               return true;
+       elseif item.attr.role and item.attr.nick and not item.attr.affiliation then
+               local success, errtype, err = self:set_role(actor, self.jid.."/"..item.attr.nick, item.attr.role, callback, reason);
+               if not success then origin.send(st.error_reply(stanza, errtype, err)); end
+               return true;
+       else
+               origin.send(st.error_reply(stanza, "cancel", "bad-request"));
+               return true;
+       end
+end
+
+function room_mt:handle_admin_query_get_command(origin, stanza)
+       local actor = stanza.attr.from;
+       local affiliation = self:get_affiliation(actor);
+       local item = stanza.tags[1].tags[1];
+       local _aff = item.attr.affiliation;
+       local _rol = item.attr.role;
+       if _aff and not _rol then
+               if affiliation == "owner" or (affiliation == "admin" and _aff ~= "owner" and _aff ~= "admin") then
+                       local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin");
+                       for jid, affiliation in pairs(self._affiliations) do
+                               if affiliation == _aff then
+                                       reply:tag("item", {affiliation = _aff, jid = jid}):up();
                                end
-                       elseif type == "set" or type == "get" then
-                               origin.send(st.error_reply(stanza, "cancel", "bad-request"));
                        end
-               elseif xmlns == "http://jabber.org/protocol/muc#owner" and (type == "get" or type == "set") and stanza.tags[1].name == "query" then
-                       if self:get_affiliation(stanza.attr.from) ~= "owner" then
-                               origin.send(st.error_reply(stanza, "auth", "forbidden", "Only owners can configure rooms"));
-                       elseif stanza.attr.type == "get" then
-                               self:send_form(origin, stanza);
-                       elseif stanza.attr.type == "set" then
-                               local child = stanza.tags[1].tags[1];
-                               if not child then
-                                       origin.send(st.error_reply(stanza, "modify", "bad-request"));
-                               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
-                                       self:destroy(newjid, reason, password);
-                                       origin.send(st.reply(stanza));
-                               else
-                                       self:process_form(origin, stanza);
+                       origin.send(reply);
+                       return true;
+               else
+                       origin.send(st.error_reply(stanza, "auth", "forbidden"));
+                       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
+                       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
+                               if occupant.role == _rol then
+                                       reply:tag("item", {
+                                               nick = select(3, jid_split(occupant_jid)),
+                                               role = _rol or "none",
+                                               affiliation = occupant.affiliation or "none",
+                                               jid = occupant.jid
+                                               }):up();
                                end
                        end
-               elseif type == "set" or type == "get" then
-                       origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+                       origin.send(reply);
+                       return true;
+               else
+                       origin.send(st.error_reply(stanza, "auth", "forbidden"));
+                       return true;
                end
-       elseif stanza.name == "message" and type == "groupchat" then
+       else
+               origin.send(st.error_reply(stanza, "cancel", "bad-request"));
+               return true;
+       end
+end
+
+function room_mt:handle_owner_query_get_to_room(origin, stanza)
+       if self:get_affiliation(stanza.attr.from) ~= "owner" then
+               origin.send(st.error_reply(stanza, "auth", "forbidden", "Only owners can configure rooms"));
+               return true;
+       end
+
+       self:send_form(origin, stanza);
+       return true;
+end
+function room_mt:handle_owner_query_set_to_room(origin, stanza)
+       if self:get_affiliation(stanza.attr.from) ~= "owner" then
+               origin.send(st.error_reply(stanza, "auth", "forbidden", "Only owners can configure rooms"));
+               return true;
+       end
+
+       local child = stanza.tags[1].tags[1];
+       if not child then
+               origin.send(st.error_reply(stanza, "modify", "bad-request"));
+               return true;
+       elseif child.name == "destroy" then
+               local newjid = child.attr.jid;
+               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;
+       else
+               self:process_form(origin, stanza);
+               return true;
+       end
+end
+
+function room_mt:handle_groupchat_to_room(origin, stanza)
+       local from = stanza.attr.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"));
+               return true;
+       elseif occupant.role == "visitor" then
+               origin.send(st.error_reply(stanza, "auth", "forbidden"));
+               return true;
+       else
                local from = stanza.attr.from;
-               local current_nick = self._jid_nick[from];
-               local occupant = self._occupants[current_nick];
-               if not occupant then -- not in room
-                       origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
-               elseif occupant.role == "visitor" then
-                       origin.send(st.error_reply(stanza, "auth", "forbidden"));
-               else
-                       local from = stanza.attr.from;
-                       stanza.attr.from = current_nick;
-                       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:set_subject(current_nick, subject);
-                               else
-                                       stanza.attr.from = from;
-                                       origin.send(st.error_reply(stanza, "auth", "forbidden"));
-                               end
+               stanza.attr.from = current_nick;
+               local subject = stanza:get_child_text("subject");
+               if subject then
+                       if occupant.role == "moderator" or
+                               ( self:get_changesubject() and occupant.role == "participant" ) then -- and participant
+                               self:set_subject(current_nick, subject);
                        else
-                               self:broadcast_message(stanza, self:get_historylength() > 0 and stanza:get_child("body"));
+                               stanza.attr.from = from;
+                               origin.send(st.error_reply(stanza, "auth", "forbidden"));
                        end
-                       stanza.attr.from = from;
+               else
+                       self:broadcast_message(stanza, self:get_historylength() > 0 and stanza:get_child("body"));
                end
-       elseif stanza.name == "message" and type == "error" and is_kickable_error(stanza) then
-               local current_nick = self._jid_nick[stanza.attr.from];
-               log("debug", "%s kicked from %s for sending an error message", current_nick, self.jid);
-               self:handle_to_occupant(origin, build_unavailable_presence_from_error(stanza)); -- send unavailable
-       elseif stanza.name == "presence" then -- hack - some buggy clients send presence updates to the room rather than their nick
+               stanza.attr.from = from;
+               return true;
+       end
+end
+
+-- 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:get_occupant_jid(stanza.attr.from);
+       local handled
+       if current_nick then
                local to = stanza.attr.to;
-               local current_nick = self._jid_nick[stanza.attr.from];
-               if current_nick then
-                       stanza.attr.to = current_nick;
-                       self:handle_to_occupant(origin, stanza);
-                       stanza.attr.to = to;
-               elseif type ~= "error" and type ~= "result" then
-                       origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+               stanza.attr.to = current_nick;
+               handled = self:handle_presence_to_occupant(origin, stanza);
+               stanza.attr.to = to;
+       end
+       return handled;
+end
+
+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;
+       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
-       elseif stanza.name == "message" and not(type == "chat" or type == "error" or type == "groupchat" or type == "headline") and #stanza.tags == 1
-               and self._jid_nick[stanza.attr.from] and stanza.tags[1].name == "x" and stanza.tags[1].attr.xmlns == "http://jabber.org/protocol/muc#user" then
-               local x = stanza.tags[1];
-               local payload = (#x.tags == 1 and x.tags[1]);
-               if payload and payload.name == "invite" and payload.attr.to then
-                       local _from, _to = stanza.attr.from, stanza.attr.to;
-                       local _invitee = jid_prep(payload.attr.to);
-                       if _invitee then
-                               local _reason = payload.tags[1] and payload.tags[1].name == 'reason' and #payload.tags[1].tags == 0 and payload.tags[1][1];
-                               local invite = st.message({from = _to, to = _invitee, id = stanza.attr.id})
-                                       :tag('x', {xmlns='http://jabber.org/protocol/muc#user'})
-                                               :tag('invite', {from=_from})
-                                                       :tag('reason'):text(_reason or ""):up()
-                                               :up();
-                                               if self:get_password() then
-                                                       invite:tag("password"):text(self:get_password()):up();
-                                               end
-                                       invite:up()
-                                       :tag('x', {xmlns="jabber:x:conference", jid=_to}) -- COMPAT: Some older clients expect this
-                                               :text(_reason or "")
-                                       :up()
-                                       :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);
-                       else
-                               origin.send(st.error_reply(stanza, "cancel", "jid-malformed"));
-                       end
-               else
-                       origin.send(st.error_reply(stanza, "cancel", "bad-request"));
+               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('invite', {from=_from})
+                                       :tag('reason'):text(_reason or ""):up()
+                               :up();
+               local password = self:get_password()
+               if password then
+                       invite:tag("password"):text(password):up();
                end
+                       invite:up()
+                       :tag('x', {xmlns="jabber:x:conference", jid=_to}) -- COMPAT: Some older clients expect this
+                               :text(_reason or "")
+                       :up()
+                       :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();
+               module:fire_event("muc-invite", { room = self, stanza = invite, origin = origin, incoming = stanza });
+               return true;
        else
-               if type == "error" or type == "result" then return; end
-               origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+               origin.send(st.error_reply(stanza, "cancel", "jid-malformed"));
+               return true;
        end
 end
 
-function room_mt:handle_stanza(origin, stanza)
-       local to_node, to_host, to_resource = jid_split(stanza.attr.to);
-       if to_resource then
-               self:handle_to_occupant(origin, stanza);
+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;
+               -- TODO: Validate declinee
+               local reason = payload:get_child_text("reason")
+               local decline = st.message({from = to, to = declinee, id = stanza.attr.id})
+                       :tag('x', {xmlns='http://jabber.org/protocol/muc#user'})
+                               :tag('decline', {from=from})
+                                       :tag('reason'):text(reason or ""):up()
+                               :up()
+                       :up()
+                       :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();
+               module:fire_event("muc-decline", { room = self, stanza = decline, origin = origin, incoming = stanza });
+               return true;
        else
-               self:handle_to_room(origin, stanza);
+               origin.send(st.error_reply(stanza, "cancel", "jid-malformed"));
+               return true;
        end
 end
 
-function room_mt:route_stanza(stanza) end -- Replace with a routing function, e.g., function(room, stanza) core_route_stanza(origin, stanza); end
+module:hook("muc-decline", function(event)
+       local room, stanza = event.room, event.stanza
+       local occupant = room:get_occupant_by_real_jid(stanza.attr.to);
+       if occupant then
+               room:route_to_occupant(occupant, stanza)
+       else
+               room:route_stanza(stanza);
+       end
+       return true;
+end, -1)
+
+function room_mt:handle_message_to_room(origin, stanza)
+       local type = stanza.attr.type;
+       if type == "groupchat" then
+               return self:handle_groupchat_to_room(origin, stanza)
+       elseif type == "error" and is_kickable_error(stanza) then
+               return self:handle_kickable(origin, stanza)
+       elseif type == nil then
+               local x = stanza:get_child("x", "http://jabber.org/protocol/muc#user");
+               if x then
+                       local payload = x.tags[1];
+                       if payload == nil then
+                               -- fallthrough
+                       elseif payload.name == "invite" and payload.attr.to then
+                               return self:handle_mediated_invite(origin, stanza)
+                       elseif payload.name == "decline" and payload.attr.to then
+                               return self:handle_mediated_decline(origin, stanza)
+                       end
+                       origin.send(st.error_reply(stanza, "cancel", "bad-request"));
+                       return true;
+               end
+       else
+               return nil;
+       end
+end
+
+function room_mt:route_stanza(stanza)
+       module:send(stanza)
+end
 
 function room_mt:get_affiliation(jid)
        local node, host, resource = jid_split(jid);
@@ -1031,7 +1264,7 @@ function room_mt:can_set_role(actor_jid, occupant_jid, role)
 
        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 and actor.role == "moderator" then
                if occupant.affiliation ~= "owner" and occupant.affiliation ~= "admin" then
                        if actor.affiliation == "owner" or actor.affiliation == "admin" then
@@ -1085,11 +1318,11 @@ end
 
 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
@@ -1097,10 +1330,8 @@ function room_mt:_route_stanza(stanza)
                                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
@@ -1111,10 +1342,8 @@ function room_mt:_route_stanza(stanza)
        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
@@ -1124,6 +1353,7 @@ local _M = {}; -- module "muc"
 function _M.new_room(jid, config)
        return setmetatable({
                jid = jid;
+               locked = nil;
                _jid_nick = {};
                _occupants = {};
                _data = {
diff --git a/util/indexedbheap.lua b/util/indexedbheap.lua
new file mode 100644 (file)
index 0000000..c60861e
--- /dev/null
@@ -0,0 +1,157 @@
+
+local setmetatable = setmetatable;
+local math_floor = math.floor;
+local t_remove = table.remove;
+
+local function _heap_insert(self, item, sync, item2, index)
+       local pos = #self + 1;
+       while true do
+               local half_pos = math_floor(pos / 2);
+               if half_pos == 0 or item > self[half_pos] then break; end
+               self[pos] = self[half_pos];
+               sync[pos] = sync[half_pos];
+               index[sync[pos]] = pos;
+               pos = half_pos;
+       end
+       self[pos] = item;
+       sync[pos] = item2;
+       index[item2] = pos;
+end
+
+local function _percolate_up(self, k, sync, index)
+       local tmp = self[k];
+       local tmp_sync = sync[k];
+       while k ~= 1 do
+               local parent = math_floor(k/2);
+               if tmp < self[parent] then break; end
+               self[k] = self[parent];
+               sync[k] = sync[parent];
+               index[sync[k]] = k;
+               k = parent;
+       end
+       self[k] = tmp;
+       sync[k] = tmp_sync;
+       index[tmp_sync] = k;
+       return k;
+end
+
+local function _percolate_down(self, k, sync, index)
+       local tmp = self[k];
+       local tmp_sync = sync[k];
+       local size = #self;
+       local child = 2*k;
+       while 2*k <= size do
+               if child ~= size and self[child] > self[child + 1] then
+                       child = child + 1;
+               end
+               if tmp > self[child] then
+                       self[k] = self[child];
+                       sync[k] = sync[child];
+                       index[sync[k]] = k;
+               else
+                       break;
+               end
+
+               k = child;
+               child = 2*k;
+       end
+       self[k] = tmp;
+       sync[k] = tmp_sync;
+       index[tmp_sync] = k;
+       return k;
+end
+
+local function _heap_pop(self, sync, index)
+       local size = #self;
+       if size == 0 then return nil; end
+
+       local result = self[1];
+       local result_sync = sync[1];
+       index[result_sync] = nil;
+       if size == 1 then
+               self[1] = nil;
+               sync[1] = nil;
+               return result, result_sync;
+       end
+       self[1] = t_remove(self);
+       sync[1] = t_remove(sync);
+       index[sync[1]] = 1;
+
+       _percolate_down(self, 1, sync, index);
+
+       return result, result_sync;
+end
+
+local indexed_heap = {};
+
+function indexed_heap:insert(item, priority, id)
+       if id == nil then
+               id = self.current_id;
+               self.current_id = id + 1;
+       end
+       self.items[id] = item;
+       _heap_insert(self.priorities, priority, self.ids, id, self.index);
+       return id;
+end
+function indexed_heap:pop()
+       local priority, id = _heap_pop(self.priorities, self.ids, self.index);
+       if id then
+               local item = self.items[id];
+               self.items[id] = nil;
+               return priority, item, id;
+       end
+end
+function indexed_heap:peek()
+       return self.priorities[1];
+end
+function indexed_heap:reprioritize(id, priority)
+       local k = self.index[id];
+       if k == nil then return; end
+       self.priorities[k] = priority;
+
+       k = _percolate_up(self.priorities, k, self.ids, self.index);
+       k = _percolate_down(self.priorities, k, self.ids, self.index);
+end
+function indexed_heap:remove_index(k)
+       local result = self.priorities[k];
+       if result == nil then return; end
+
+       local result_sync = self.ids[k];
+       local item = self.items[result_sync];
+       local size = #self.priorities;
+
+       self.priorities[k] = self.priorities[size];
+       self.ids[k] = self.ids[size];
+       self.index[self.ids[k]] = k;
+
+       t_remove(self.priorities);
+       t_remove(self.ids);
+
+       self.index[result_sync] = nil;
+       self.items[result_sync] = nil;
+
+       if size > k then
+               k = _percolate_up(self.priorities, k, self.ids, self.index);
+               k = _percolate_down(self.priorities, k, self.ids, self.index);
+       end
+
+       return result, item, result_sync;
+end
+function indexed_heap:remove(id)
+       return self:remove_index(self.index[id]);
+end
+
+local mt = { __index = indexed_heap };
+
+local _M = {
+       create = function()
+               return setmetatable({
+                       ids = {}; -- heap of ids, sync'd with priorities
+                       items = {}; -- map id->items
+                       priorities = {}; -- heap of priorities
+                       index = {}; -- map of id->index of id in ids
+                       current_id = 1.5
+               }, mt);
+       end
+};
+return _M;
index 0e10e144e9746ed0f974be58605fb1fb43dc19ae..23bd6a37d592da8b47180d2645784841d7df18cc 100644 (file)
@@ -6,6 +6,8 @@
 -- COPYING file in the source package for more information.
 --
 
+local indexedbheap = require "util.indexedbheap";
+local log = require "util.logger".init("timer");
 local server = require "net.server";
 local math_min = math.min
 local math_huge = math.huge
@@ -13,6 +15,9 @@ local get_time = require "socket".gettime;
 local t_insert = table.insert;
 local pairs = pairs;
 local type = type;
+local debug_traceback = debug.traceback;
+local tostring = tostring;
+local xpcall = xpcall;
 
 local data = {};
 local new_data = {};
@@ -78,6 +83,61 @@ else
        end
 end
 
-add_task = _add_task;
+--add_task = _add_task;
+
+local h = indexedbheap.create();
+local params = {};
+local next_time = nil;
+local _id, _callback, _now, _param;
+local function _call() return _callback(_now, _id, _param); end
+local function _traceback_handler(err) log("error", "Traceback[timer]: %s", debug_traceback(tostring(err), 2)); end
+local function _on_timer(now)
+       local peek;
+       while true do
+               peek = h:peek();
+               if peek == nil or peek > now then break; end
+               local _;
+               _, _callback, _id = h:pop();
+               _now = now;
+               _param = params[_id];
+               params[_id] = nil;
+               --item(now, id, _param); -- FIXME pcall
+               local success, err = xpcall(_call, _traceback_handler);
+               if success and type(err) == "number" then
+                       h:insert(_callback, err + now, _id); -- re-add
+                       params[_id] = _param;
+               end
+       end
+       next_time = peek;
+       if peek ~= nil then
+               return peek - now;
+       end
+end
+function add_task(delay, callback, param)
+       local current_time = get_time();
+       local event_time = current_time + delay;
+
+       local id = h:insert(callback, event_time);
+       params[id] = param;
+       if next_time == nil or event_time < next_time then
+               next_time = event_time;
+               _add_task(next_time - current_time, _on_timer);
+       end
+       return id;
+end
+function stop(id)
+       params[id] = nil;
+       return h:remove(id);
+end
+function reschedule(id, delay)
+       local current_time = get_time();
+       local event_time = current_time + delay;
+       h:reprioritize(id, delay);
+       if next_time == nil or event_time < next_time then
+               next_time = event_time;
+               _add_task(next_time - current_time, _on_timer);
+       end
+       return id;
+end
 
 return _M;