From 68f64d281702713a8a342807b6b4b51616f3d40d Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Wed, 16 Apr 2014 13:54:51 -0400
Subject: plugins/muc: Move subject code to seperate module

---
 plugins/muc/subject.lib.lua | 93 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 plugins/muc/subject.lib.lua

(limited to 'plugins/muc/subject.lib.lua')

diff --git a/plugins/muc/subject.lib.lua b/plugins/muc/subject.lib.lua
new file mode 100644
index 00000000..a42a18c5
--- /dev/null
+++ b/plugins/muc/subject.lib.lua
@@ -0,0 +1,93 @@
+-- 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 st = require "util.stanza";
+
+local function create_subject_message(from, subject)
+	return st.message({from = from; type = "groupchat"})
+		:tag("subject"):text(subject):up();
+end
+
+local function get_changesubject(room)
+	return room._data.changesubject;
+end
+
+local function set_changesubject(room, changesubject)
+	changesubject = changesubject and true or nil;
+	if get_changesubject(room) == changesubject then return false; end
+	room._data.changesubject = changesubject;
+	if room.save then room:save(true); end
+	return true;
+end
+
+module:hook("muc-config-form", function(event)
+	table.insert(event.form, {
+		name = "muc#roomconfig_changesubject";
+		type = "boolean";
+		label = "Allow Occupants to Change Subject?";
+		value = get_changesubject(event.room);
+	});
+end);
+
+module:hook("muc-config-submitted", function(event)
+	local new = event.fields["muc#roomconfig_changesubject"];
+	if new ~= nil and set_changesubject(event.room, new) then
+		event.status_codes["104"] = true;
+	end
+end);
+
+local function get_subject(room)
+	return room._data.subject_from, room._data.subject;
+end
+
+local function send_subject(room, to)
+	local msg = create_subject_message(get_subject(room));
+	msg.attr.to = to;
+	room:route_stanza(msg);
+end
+
+local function set_subject(room, from, subject)
+	if subject == "" then subject = nil; end
+	local old_from, old_subject = get_subject(room);
+	if old_subject == subject and old_from == from then return false; end
+	room._data.subject_from = from;
+	room._data.subject = subject;
+	if room.save then room:save(); end
+	local msg = create_subject_message(from, subject);
+	room:broadcast_message(msg);
+	return true;
+end
+
+-- Send subject to joining user
+module:hook("muc-occupant-joined", function(event)
+	event.room:send_subject(event.stanza.attr.from);
+end, 20);
+
+-- Role check for subject changes
+module:hook("muc-subject-change", function(event)
+	local room, stanza = event.room, event.stanza;
+	local occupant = room:get_occupant_by_real_jid(stanza.attr.from);
+	if occupant.role == "moderator" or
+		( occupant.role == "participant" and get_changesubject(room) ) then -- and participant
+		local subject = stanza:get_child_text("subject");
+		set_subject(room, occupant.nick, subject);
+		return true;
+	else
+		event.origin.send(st.error_reply(stanza, "auth", "forbidden"));
+		return true;
+	end
+end);
+
+return {
+	get_changesubject = get_changesubject;
+	set_changesubject = set_changesubject;
+	get = get_subject;
+	set = set_subject;
+	send = send_subject;
+};
-- 
cgit v1.2.3


From 70a87e5d5e5fe24252d03a5263243c19745ea72d Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Fri, 18 Apr 2014 12:20:07 -0400
Subject: plugins/muc/subject.lib: If subject is not set by an occupant, it
 should come from room jid itself

---
 plugins/muc/subject.lib.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins/muc/subject.lib.lua')

diff --git a/plugins/muc/subject.lib.lua b/plugins/muc/subject.lib.lua
index a42a18c5..44fc915c 100644
--- a/plugins/muc/subject.lib.lua
+++ b/plugins/muc/subject.lib.lua
@@ -43,7 +43,8 @@ module:hook("muc-config-submitted", function(event)
 end);
 
 local function get_subject(room)
-	return room._data.subject_from, room._data.subject;
+	-- a <message/> stanza from the room JID (or from the occupant JID of the entity that set the subject)
+	return room._data.subject_from or room.jid, room._data.subject;
 end
 
 local function send_subject(room, to)
@@ -66,7 +67,7 @@ end
 
 -- Send subject to joining user
 module:hook("muc-occupant-joined", function(event)
-	event.room:send_subject(event.stanza.attr.from);
+	send_subject(event.room, event.stanza.attr.from);
 end, 20);
 
 -- Role check for subject changes
-- 
cgit v1.2.3