MUC: A little cleanup.

[prosody.git] / plugins / muc / mod_muc.lua

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 60602050dc25e63a3ecb189c3b6be6e1a5302218..8ef7a5b3a55bbc9f07fa3a4394c3032b780baccf 100644 (file)
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -23,8 +23,6 @@ if restrict_room_creation then
        end
 end
 local muc_new_room = module:require "muc".new_room;
-local register_component = require "core.componentmanager".register_component;
-local deregister_component = require "core.componentmanager".deregister_component;
 local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
 local st = require "util.stanza";
@@ -35,7 +33,7 @@ local um_is_admin = require "core.usermanager".is_admin;
 rooms = {};
 local rooms = rooms;
 local persistent_rooms = datamanager.load(nil, muc_host, "persistent") or {};
-local component;
+local component = hosts[module.host];
 
 -- Configurable options
 local max_history_messages = module:get_option_number("max_history_messages");
@@ -60,6 +58,9 @@ local function room_save(room, forced)
                room._data.history = history;
        elseif forced then
                datamanager.store(node, muc_host, "config", nil);
+               if not next(room._occupants) then -- Room empty
+                       rooms[room.jid] = nil;
+               end
        end
        if forced then datamanager.store(nil, muc_host, "persistent", persistent_rooms); end
 end
@@ -99,7 +100,8 @@ local function get_disco_items(stanza)
        return reply; -- TODO cache disco reply
 end
 
-local function handle_to_domain(origin, stanza)
+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
@@ -117,54 +119,46 @@ local function handle_to_domain(origin, stanza)
                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"));
        end
+       return true;
 end
 
 function stanza_handler(event)
        local origin, stanza = event.origin, event.stanza;
-       local to_node, to_host, to_resource = jid_split(stanza.attr.to);
-       if to_node then
-               local bare = to_node.."@"..to_host;
-               if to_host == muc_host or bare == muc_host then
-                       local room = rooms[bare];
-                       if not room then
-                               if not(restrict_room_creation) or
-                                 (restrict_room_creation == "admin" and is_admin(stanza.attr.from)) or
-                                 (restrict_room_creation == "local" and select(2, jid_split(stanza.attr.from)) == module.host:gsub("^[^%.]+%.", "")) then
-                                       room = muc_new_room(bare, {
-                                               history_length = max_history_messages;
-                                       });
-                                       room.route_stanza = room_route_stanza;
-                                       room.save = room_save;
-                                       rooms[bare] = room;
-                               end
-                       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
-                                       rooms[bare] = nil; -- discard room
-                               end
-                       else
-                               origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
-                       end
-               else --[[not for us?]] end
-               return true;
+       local bare = jid_bare(stanza.attr.to);
+       local room = rooms[bare];
+       if not room then
+               if not(restrict_room_creation) or
+                 (restrict_room_creation == "admin" and is_admin(stanza.attr.from)) or
+                 (restrict_room_creation == "local" and select(2, jid_split(stanza.attr.from)) == module.host:gsub("^[^%.]+%.", "")) then
+                       room = muc_new_room(bare, {
+                               history_length = max_history_messages;
+                       });
+                       room.route_stanza = room_route_stanza;
+                       room.save = room_save;
+                       rooms[bare] = room;
+               end
+       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
+                       rooms[bare] = nil; -- discard room
+               end
+       else
+               origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
        end
-       -- to the main muc domain
-       handle_to_domain(origin, stanza);
        return true;
 end
-module:hook("iq/bare", stanza_handler);
-module:hook("message/bare", stanza_handler);
-module:hook("presence/bare", stanza_handler);
-module:hook("iq/full", stanza_handler);
-module:hook("message/full", stanza_handler);
-module:hook("presence/full", stanza_handler);
-module:hook("iq/host", stanza_handler);
-module:hook("message/host", stanza_handler);
-module:hook("presence/host", stanza_handler);
+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);
 
-component = register_component(muc_host, function() end);
-function component.send(stanza) -- FIXME do a generic fix
+hosts[module.host].send = function(stanza) -- FIXME do a generic fix
        if stanza.attr.type == "result" or stanza.attr.type == "error" then
                core_post_stanza(component, stanza);
        else error("component.send only supports result and error stanzas at the moment"); end
@@ -172,9 +166,6 @@ end
 
 prosody.hosts[module:get_host()].muc = { rooms = rooms };
 
-module.unload = function()
-       deregister_component(muc_host);
-end
 module.save = function()
        return {rooms = rooms};
 end