added comment to remind us to fix binary output breaking the terminal

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

diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 41c8a749428471bcc6911d2a35a3e0fbefda0864..856f3cba934dbc9a8b1c43fc532005019ee48f53 100644 (file)
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -12,28 +12,35 @@ if module:get_host_type() ~= "component" then
 end
 
 local muc_host = module:get_host();
-local muc_name = "Chatrooms";
+local muc_name = module:get_option("name");
+if type(muc_name) ~= "string" then muc_name = "Prosody Chatrooms"; end
+local restrict_room_creation = module:get_option("restrict_room_creation");
+if restrict_room_creation and restrict_room_creation ~= true then restrict_room_creation = nil; end
 local history_length = 20;
 
 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";
 local uuid_gen = require "util.uuid".generate;
 local datamanager = require "util.datamanager";
+local um_is_admin = require "core.usermanager".is_admin;
 
 local rooms = {};
 local persistent_rooms = datamanager.load(nil, muc_host, "persistent") or {};
 local component;
 
+local function is_admin(jid)
+       return um_is_admin(jid) or um_is_admin(jid, module.host);
+end
+
 local function room_route_stanza(room, stanza) core_post_stanza(component, stanza); end
 local function room_save(room, forced)
        local node = jid_split(room.jid);
        persistent_rooms[room.jid] = room._data.persistent;
-       module:log("debug", "1, %s, %s", room.jid, tostring(room._data.persistent));
        if room._data.persistent then
-               module:log("debug", "2");
                local history = room._data.history;
                room._data.history = nil;
                local data = {
@@ -44,10 +51,8 @@ local function room_save(room, forced)
                datamanager.store(node, muc_host, "config", data);
                room._data.history = history;
        elseif forced then
-               module:log("debug", "3");
                datamanager.store(node, muc_host, "config", nil);
        end
-       module:log("debug", "4");
        if forced then datamanager.store(nil, muc_host, "persistent", persistent_rooms); end
 end
 
@@ -108,18 +113,32 @@ component = register_component(muc_host, function(origin, stanza)
                if to_host == muc_host or bare == muc_host then
                        local room = rooms[bare];
                        if not room then
-                               room = muc_new_room(bare);
-                               room.route_stanza = room_route_stanza;
-                               room.save = room_save;
-                               rooms[bare] = room;
+                               if not(restrict_room_creation) or is_admin(stanza.attr.from) then
+                                       room = muc_new_room(bare);
+                                       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
-                       room:handle_stanza(origin, stanza);
                else --[[not for us?]] end
                return;
        end
        -- to the main muc domain
        handle_to_domain(origin, stanza);
 end);
+function component.send(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
+end
 
 prosody.hosts[module:get_host()].muc = { rooms = rooms };