Changeset

--- a/plugins/mod_announce.lua	Thu Jun 10 16:48:21 2010 +0100
+++ b/plugins/mod_announce.lua	Fri Jun 11 12:07:25 2010 +0100
@@ -11,6 +11,30 @@
 local is_admin = require "core.usermanager".is_admin;
 local admins = set.new(config.get(module:get_host(), "core", "admins"));
 
+function send_to_online(message, server)
+	if server then
+		sessions = { [server] = hosts[server] };
+	else
+		sessions = hosts;
+	end
+
+	local c = 0;
+	for hostname, host_session in pairs(sessions) do
+		if host_session.sessions then
+			message.attr.from = hostname;
+			for username in pairs(host_session.sessions) do
+				c = c + 1;
+				message.attr.to = username.."@"..hostname;
+				core_post_stanza(host_session, message);
+			end
+		end
+	end
+
+	return c;
+end
+
+
+-- Old <message>-based jabberd-style announcement sending
 function handle_announcement(data)
 	local origin, stanza = data.origin, data.stanza;
 	local host, resource = select(2, jid.split(stanza.attr.to));
@@ -31,15 +55,47 @@
 	message.attr.type = "headline";
 	message.attr.from = host;
 	
-	local c = 0;
-	for user in pairs(host_session.sessions) do
-		c = c + 1;
-		message.attr.to = user.."@"..host;
-		core_post_stanza(host_session, message);
-	end
-	
+	local c = send_to_online(message, host);
 	module:log("info", "Announcement sent to %d online users", c);
 	return true;
 end
+module:hook("message/host", handle_announcement);
 
-module:hook("message/host", handle_announcement);
+-- Ad-hoc command (XEP-0133)
+local dataforms_new = require "util.dataforms".new;
+local announce_layout = dataforms_new{
+	title = "Making an Announcement";
+	instructions = "Fill out this form to make an announcement to all\nactive users of this service.";
+
+	{ name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/admin" };
+	{ name = "subject", type = "text-single", label = "Subject" };
+	{ name = "announcement", type = "text-multi", required = true, label = "Announcement" };
+};
+
+function announce_handler(self, data, state)
+	if state then
+		if data.action == "cancel" then
+			return { status = "canceled" };
+		end
+
+		local fields = announce_layout:data(data.form);
+
+		module:log("info", "Sending server announcement to all online users");
+		local message = st.message({type = "headline"}, fields.announcement):up()
+			:tag("subject"):text(fields.subject or "Announcement");
+		
+		local count = send_to_online(message, data.to);
+		
+		module:log("info", "Announcement sent to %d online users", count);
+		return { status = "completed", info = ("Announcement sent to %d online users"):format(count) };
+	else
+		return { status = "executing", form = announce_layout }, "executing";
+	end
+
+	return true;
+end
+
+local adhoc_new = module:require "adhoc".new;
+local announce_desc = adhoc_new("Send Announcement to Online Users", "http://jabber.org/protocol/admin#announce", announce_handler, "admin");
+module:add_item("adhoc", announce_desc);
+