From ad95597ac2378d4e6d6bb09a95ed8cf1ee17e9ec Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Wed, 21 Oct 2009 02:18:17 +0500 Subject: MUC: Added 'name' config option, for specifying the component's name in disco responses. --- plugins/muc/mod_muc.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua index 3e6fafb8..602de0f4 100644 --- a/plugins/muc/mod_muc.lua +++ b/plugins/muc/mod_muc.lua @@ -12,7 +12,8 @@ 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 history_length = 20; local muc_new_room = module:require "muc".new_room; -- cgit v1.2.3 From 2eb8cf191a1cfdeedf38c18b8ad07d2b8f760581 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Wed, 21 Oct 2009 11:29:43 +0500 Subject: mod_lastactivity: Gave a positive priority to the presence event hook. --- plugins/mod_lastactivity.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/mod_lastactivity.lua b/plugins/mod_lastactivity.lua index cb914fe3..a0da9829 100644 --- a/plugins/mod_lastactivity.lua +++ b/plugins/mod_lastactivity.lua @@ -23,7 +23,7 @@ module:hook("pre-presence/bare", function(event) s = s and #s.tags == 0 and s[1] or ""; map[event.origin.username] = {s = s, t = t}; end -end); +end, 10); module:hook("iq/bare/jabber:iq:last:query", function(event) local origin, stanza = event.origin, event.stanza; -- cgit v1.2.3 From 27298d7e5b5d1c40e378f7169e1c96293791c021 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Wed, 21 Oct 2009 11:58:33 +0500 Subject: MUC: Added config option 'restrict_room_creation' to allow restricting room creation to admins. --- plugins/muc/mod_muc.lua | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'plugins') diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua index 602de0f4..856f3cba 100644 --- a/plugins/muc/mod_muc.lua +++ b/plugins/muc/mod_muc.lua @@ -14,20 +14,28 @@ end local muc_host = module:get_host(); 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); @@ -105,14 +113,20 @@ 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 - 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 + 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; -- cgit v1.2.3