Software `/` code `/` prosody

Comparison

plugins/muc/mod_muc.lua @ 9626:4d3ab7153153 0.11

MUC: Use defaults from config in create_room() if no config provided

author	Matthew Wild <mwild1@gmail.com>
date	Thu, 15 Nov 2018 10:25:48 +0000
parent	9240:f9a83aca4421
child	9647:0f43b901c854
child	10646:85585910d468

comparison

equal deleted inserted replaced

-:cc9dff0212f4
+:4d3ab7153153
 	end
 	room_miss();
 	return restore_room(room_jid);
 end
-function create_room(room_jid, config)
+local function set_room_defaults(room, lang)
-	local exists = get_room_from_jid(room_jid);
-	if exists then
-		return nil, "room-exists";
-	end
-	local room = muclib.new_room(room_jid, config);
-	module:fire_event("muc-room-created", {
-		room = room;
-	});
-	return track_room(room);
-end
-function all_rooms()
-	return coroutine.wrap(function ()
-		local seen = {}; -- Don't iterate over persistent rooms twice
-		for room in live_rooms() do
-			coroutine.yield(room);
-			seen[room.jid] = true;
-		end
-		local all_persistent_rooms, err = persistent_rooms_storage:get(nil);
-		if not all_persistent_rooms then
-			if err then
-				module:log("error", "Error loading list of persistent rooms, only rooms live in memory were iterated over");
-				module:log("debug", "%s", debug.traceback(err));
-			end
-			return nil;
-		end
-		for room_jid in pairs(all_persistent_rooms) do
-			if not seen[room_jid] then
-				local room = restore_room(room_jid);
-				if room then
-					coroutine.yield(room);
-				else
-					module:log("error", "Missing data for room '%s', omitting from iteration", room_jid);
-				end
-			end
-		end
-	end);
-end
-function live_rooms()
-	return rooms:values();
-end
-function each_room(live_only)
-	if live_only then
-		return live_rooms();
-	end
-	return all_rooms();
-end
-module:hook("host-disco-items", function(event)
-	local reply = event.reply;
-	module:log("debug", "host-disco-items called");
-	if next(room_items_cache) ~= nil then
-		for jid, room_name in pairs(room_items_cache) do
-			reply:tag("item", { jid = jid, name = room_name }):up();
-		end
-	else
-		for room in all_rooms() do
-			if not room:get_hidden() then
-				local jid, room_name = room.jid, room:get_name();
-				room_items_cache[jid] = room_name;
-				reply:tag("item", { jid = jid, name = room_name }):up();
-			end
-		end
-	end
-end);
-module:hook("muc-room-pre-create", function (event)
-	local room = event.room;
 	room:set_public(module:get_option_boolean("muc_room_default_public", false));
 	room:set_persistent(module:get_option_boolean("muc_room_default_persistent", room:get_persistent()));
 	room:set_members_only(module:get_option_boolean("muc_room_default_members_only", room:get_members_only()));
 	room:set_allow_member_invites(module:get_option_boolean("muc_room_default_allow_member_invites",
 		room:get_allow_member_invites()));
 	room:set_moderated(module:get_option_boolean("muc_room_default_moderated", room:get_moderated()));
 	room:set_whois(module:get_option_boolean("muc_room_default_public_jids",
 		room:get_whois() == "anyone") and "anyone" or "moderators");
 	room:set_changesubject(module:get_option_boolean("muc_room_default_change_subject", room:get_changesubject()));
 	room:set_historylength(module:get_option_number("muc_room_default_history_length", room:get_historylength()));
-	room:set_language(event.stanza.attr["xml:lang"] or module:get_option_string("muc_room_default_language"));
+	room:set_language(lang or module:get_option_string("muc_room_default_language"));
+end
+function create_room(room_jid, config)
+	local exists = get_room_from_jid(room_jid);
+	if exists then
+		return nil, "room-exists";
+	end
+	local room = muclib.new_room(room_jid, config);
+	if not config then
+		set_room_defaults(room);
+	end
+	module:fire_event("muc-room-created", {
+		room = room;
+	});
+	return track_room(room);
+end
+function all_rooms()
+	return coroutine.wrap(function ()
+		local seen = {}; -- Don't iterate over persistent rooms twice
+		for room in live_rooms() do
+			coroutine.yield(room);
+			seen[room.jid] = true;
+		end
+		local all_persistent_rooms, err = persistent_rooms_storage:get(nil);
+		if not all_persistent_rooms then
+			if err then
+				module:log("error", "Error loading list of persistent rooms, only rooms live in memory were iterated over");
+				module:log("debug", "%s", debug.traceback(err));
+			end
+			return nil;
+		end
+		for room_jid in pairs(all_persistent_rooms) do
+			if not seen[room_jid] then
+				local room = restore_room(room_jid);
+				if room then
+					coroutine.yield(room);
+				else
+					module:log("error", "Missing data for room '%s', omitting from iteration", room_jid);
+				end
+			end
+		end
+	end);
+end
+function live_rooms()
+	return rooms:values();
+end
+function each_room(live_only)
+	if live_only then
+		return live_rooms();
+	end
+	return all_rooms();
+end
+module:hook("host-disco-items", function(event)
+	local reply = event.reply;
+	module:log("debug", "host-disco-items called");
+	if next(room_items_cache) ~= nil then
+		for jid, room_name in pairs(room_items_cache) do
+			reply:tag("item", { jid = jid, name = room_name }):up();
+		end
+	else
+		for room in all_rooms() do
+			if not room:get_hidden() then
+				local jid, room_name = room.jid, room:get_name();
+				room_items_cache[jid] = room_name;
+				reply:tag("item", { jid = jid, name = room_name }):up();
+			end
+		end
+	end
+end);
+module:hook("muc-room-pre-create", function (event)
+	set_room_defaults(event.room, event.stanza.attr["xml:lang"]);
 end, 1);
 module:hook("muc-room-pre-create", function(event)
 	local origin, stanza = event.origin, event.stanza;
 	if not track_room(event.room) then

prosody

4d3ab7153153

plugins/muc/mod_muc.lua

Software / code / prosody

Comparison

plugins/muc/mod_muc.lua @ 9626:4d3ab7153153 0.11

Software `/` code `/` prosody