aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc/mod_muc.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-11-22 21:57:35 +0000
committerMatthew Wild <mwild1@gmail.com>2012-11-22 21:57:35 +0000
commit97123dfead3682296982ba4ff194c46e415165d1 (patch)
tree207e6a96430138d21967717bcc880229b4c5be56 /plugins/muc/mod_muc.lua
parentf3de3517f61201877b4189ee0ad7513850144ee1 (diff)
parente81f3c8098fe9260a960c7335fe6a023ff722d32 (diff)
downloadprosody-97123dfead3682296982ba4ff194c46e415165d1.tar.gz
prosody-97123dfead3682296982ba4ff194c46e415165d1.zip
Merge 0.9->trunk
Diffstat (limited to 'plugins/muc/mod_muc.lua')
-rw-r--r--plugins/muc/mod_muc.lua15
1 files changed, 4 insertions, 11 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua
index 0f275196..bf29d1ca 100644
--- a/plugins/muc/mod_muc.lua
+++ b/plugins/muc/mod_muc.lua
@@ -37,7 +37,7 @@ local rooms = rooms;
local persistent_rooms = datamanager.load(nil, muc_host, "persistent") or {};
-- Configurable options
-local max_history_messages = module:get_option_number("max_history_messages");
+muclib.set_max_history_length(module:get_option_number("max_history_messages"));
local function is_admin(jid)
return um_is_admin(jid, module.host);
@@ -82,11 +82,8 @@ for jid in pairs(persistent_rooms) do
local node = jid_split(jid);
local data = datamanager.load(node, muc_host, "config");
if data then
- local room = muc_new_room(jid, {
- max_history_length = max_history_messages;
- });
+ local room = muc_new_room(jid);
room._data = data._data;
- room._data.max_history_length = max_history_messages; -- Overwrite old max_history_length in data with current settings
room._affiliations = data._affiliations;
room.route_stanza = room_route_stanza;
room.save = room_save;
@@ -99,9 +96,7 @@ for jid in pairs(persistent_rooms) do
end
if persistent_errors then datamanager.store(nil, muc_host, "persistent", persistent_rooms); end
-local host_room = muc_new_room(muc_host, {
- max_history_length = max_history_messages;
-});
+local host_room = muc_new_room(muc_host);
host_room.route_stanza = room_route_stanza;
host_room.save = room_save;
@@ -154,9 +149,7 @@ function stanza_handler(event)
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, {
- max_history_length = max_history_messages;
- });
+ room = muc_new_room(bare);
room.route_stanza = room_route_stanza;
room.save = room_save;
rooms[bare] = room;