aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/muc')
-rw-r--r--plugins/muc/description.lib.lua43
-rw-r--r--plugins/muc/muc.lib.lua28
2 files changed, 47 insertions, 24 deletions
diff --git a/plugins/muc/description.lib.lua b/plugins/muc/description.lib.lua
new file mode 100644
index 00000000..30852922
--- /dev/null
+++ b/plugins/muc/description.lib.lua
@@ -0,0 +1,43 @@
+-- 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 function get_description(room)
+ return room._data.description;
+end
+
+local function set_description(room, description)
+ if description == "" then description = nil; end
+ if get_description(room) == description then return false; end
+ room._data.description = description;
+ if room.save then room:save(true); end
+ return true;
+end
+
+local function add_form_option(event)
+ table.insert(event.form, {
+ name = "muc#roomconfig_roomdesc";
+ type = "text-single";
+ label = "Description";
+ value = get_description(event.room) or "";
+ });
+end
+module:hook("muc-disco#info", add_form_option);
+module:hook("muc-config-form", add_form_option);
+
+module:hook("muc-config-submitted", function(event)
+ local new = event.fields["muc#roomconfig_roomdesc"];
+ if new ~= nil and set_description(event.room, new) then
+ event.status_codes["104"] = true;
+ end
+end);
+
+return {
+ get = get_description;
+ set = set_description;
+};
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 07069130..ef572cfd 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -430,9 +430,6 @@ module:hook("muc-disco#info", function(event)
event.reply:tag("feature", {var = event.room:get_whois() ~= "anyone" and "muc_semianonymous" or "muc_nonanonymous"}):up();
end);
module:hook("muc-disco#info", function(event)
- table.insert(event.form, { name = "muc#roominfo_description", label = "Description", value = event.room:get_description() });
-end);
-module:hook("muc-disco#info", function(event)
local count = 0; for _ in event.room:each_occupant() do count = count + 1; end
table.insert(event.form, { name = "muc#roominfo_occupants", label = "Number of occupants", value = tostring(count) });
end);
@@ -495,16 +492,6 @@ end
function room_mt:get_name()
return self._data.name or jid_split(self.jid);
end
-function room_mt:set_description(description)
- if description == "" or type(description) ~= "string" then description = nil; end
- if self._data.description ~= description then
- self._data.description = description;
- if self.save then self:save(true); end
- end
-end
-function room_mt:get_description()
- return self._data.description;
-end
function room_mt:set_password(password)
if password == "" or type(password) ~= "string" then password = nil; end
if self._data.password ~= password then
@@ -928,14 +915,6 @@ module:hook("muc-config-form", function(event)
end);
module:hook("muc-config-form", function(event)
table.insert(event.form, {
- name = 'muc#roomconfig_roomdesc',
- type = 'text-single',
- label = 'Description',
- value = event.room:get_description() or "",
- });
-end);
-module:hook("muc-config-form", function(event)
- table.insert(event.form, {
name = 'muc#roomconfig_persistentroom',
type = 'boolean',
label = 'Make Room Persistent?',
@@ -1050,9 +1029,6 @@ 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("description", "muc#roomconfig_roomdesc");
-end);
-module:hook("muc-config-submitted", function(event)
event.update_option("persistent", "muc#roomconfig_persistentroom");
end);
module:hook("muc-config-submitted", function(event)
@@ -1558,6 +1534,10 @@ function room_mt:set_role(actor, occupant_jid, role, reason)
return true;
end
+local description = module:require "muc/description";
+room_mt.get_description = description.get;
+room_mt.set_description = description.set;
+
local _M = {}; -- module "muc"
function _M.new_room(jid, config)