plugins/muc: Move name functions to seperate module

2 files changed, 51 insertions, 24 deletions

diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 62553321..15e3f9c9 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -394,9 +394,6 @@ function room_mt:get_disco_info(stanza)
 	return reply;
 end
 module:hook("muc-disco#info", function(event)
-	event.reply:tag("identity", {category="conference", type="text", name=event.room:get_name()}):up();
-end);
-module:hook("muc-disco#info", function(event)
 	event.reply:tag("feature", {var = "http://jabber.org/protocol/muc"}):up();
 end);
 module:hook("muc-disco#info", function(event)
@@ -467,16 +464,6 @@ function room_mt:handle_kickable(origin, stanza)
 	return true;
 end
 
-function room_mt:set_name(name)
-	if name == "" or type(name) ~= "string" or name == (jid_split(self.jid)) then name = nil; end
-	if self._data.name ~= name then
-		self._data.name = name;
-		if self.save then self:save(true); end
-	end
-end
-function room_mt:get_name()
-	return self._data.name or jid_split(self.jid);
-end
 function room_mt:set_moderated(moderated)
 	moderated = moderated and true or nil;
 	if self._data.moderated ~= moderated then
@@ -853,14 +840,6 @@ function room_mt:get_form_layout(actor)
 end
 module:hook("muc-config-form", function(event)
 	table.insert(event.form, {
-		name = 'muc#roomconfig_roomname',
-		type = 'text-single',
-		label = 'Name',
-		value = event.room:get_name() or "",
-	});
-end);
-module:hook("muc-config-form", function(event)
-	table.insert(event.form, {
 		name = 'muc#roomconfig_persistentroom',
 		type = 'boolean',
 		label = 'Make Room Persistent?',
@@ -961,9 +940,6 @@ function room_mt:process_form(origin, stanza)
 	return true;
 end
 module:hook("muc-config-submitted", function(event)
-	event.update_option("name", "muc#roomconfig_roomname");
-end);
-module:hook("muc-config-submitted", function(event)
 	event.update_option("persistent", "muc#roomconfig_persistentroom");
 end);
 module:hook("muc-config-submitted", function(event)
@@ -1457,6 +1433,10 @@ function room_mt:set_role(actor, occupant_jid, role, reason)
 	return true;
 end
 
+local name = module:require "muc/name";
+room_mt.get_name = name.get;
+room_mt.set_name = name.set;
+
 local description = module:require "muc/description";
 room_mt.get_description = description.get;
 room_mt.set_description = description.set;
diff --git a/plugins/muc/name.lib.lua b/plugins/muc/name.lib.lua
new file mode 100644
index 00000000..49d12467
--- /dev/null
+++ b/plugins/muc/name.lib.lua
@@ -0,0 +1,47 @@
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
+-- Copyright (C) 2014 Daurnimator
+--
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
+local jid_split = require "util.jid".split;
+
+local function get_name(room)
+	return room._data.name or jid_split(room.jid);
+end
+
+local function set_name(room, name)
+	if name == "" or name == (jid_split(room.jid)) then name = nil; end
+	if room._data.name == name then return false; end
+	room._data.name = name;
+	if room.save then room:save(true); end
+	return true;
+end
+
+module:hook("muc-disco#info", function(event)
+	event.reply:tag("identity", {category="conference", type="text", name=get_name(event.room)}):up();
+end);
+
+module:hook("muc-config-form", function(event)
+	table.insert(event.form, {
+		name = "muc#roomconfig_roomname";
+		type = "text-single";
+		label = "Name";
+		value = get_name(event.room) or "";
+	});
+end);
+
+module:hook("muc-config-submitted", function(event)
+	local new = event.fields["muc#roomconfig_roomname"];
+	if new ~= nil and set_name(event.room, new) then
+		event.status_codes["104"] = true;
+	end
+end);
+
+return {
+	get = get_name;
+	set = set_name;
+};