X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_announce.lua;h=0872bd216462e8e799128326ac8c1062e4d74439;hb=d631eea82c5144b9c2142b32affdb0ba4f878a43;hp=647c642a7a688fd04cf464689da96ba2971f462c;hpb=3066256ddeebd4f6bf4ce333190a52c59537cea7;p=prosody.git

diff --git a/plugins/mod_announce.lua b/plugins/mod_announce.lua
index 647c642a..0872bd21 100644
--- a/plugins/mod_announce.lua
+++ b/plugins/mod_announce.lua
@@ -6,14 +6,14 @@
 -- COPYING file in the source package for more information.
 --
 
-local st, jid, set = require "util.stanza", require "util.jid", require "util.set";
+local st, jid = require "util.stanza", require "util.jid";
 
 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] };
+function send_to_online(message, host)
+	local sessions;
+	if host then
+		sessions = { [host] = hosts[host] };
 	else
 		sessions = hosts;
 	end
@@ -25,7 +25,7 @@ function send_to_online(message, server)
 			for username in pairs(host_session.sessions) do
 				c = c + 1;
 				message.attr.to = username.."@"..hostname;
-				core_post_stanza(host_session, message);
+				module:send(message);
 			end
 		end
 	end
@@ -35,9 +35,9 @@ 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));
+function handle_announcement(event)
+	local origin, stanza = event.origin, event.stanza;
+	local node, host, resource = jid.split(stanza.attr.to);
 	
 	if resource ~= "announce/online" then
 		return; -- Not an announcement
@@ -45,12 +45,11 @@ function handle_announcement(data)
 	
 	if not is_admin(stanza.attr.from) then
 		-- Not an admin? Not allowed!
-		module:log("warn", "Non-admin %s tried to send server announcement", tostring(jid.bare(stanza.attr.from)));
+		module:log("warn", "Non-admin '%s' tried to send server announcement", stanza.attr.from);
 		return;
 	end
 	
 	module:log("info", "Sending server announcement to all online users");
-	local host_session = hosts[host];
 	local message = st.clone(stanza);
 	message.attr.type = "headline";
 	message.attr.from = host;
@@ -89,7 +88,7 @@ function announce_handler(self, data, state)
 		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";
+		return { status = "executing", actions = {"next", "complete", default = "complete"}, form = announce_layout }, "executing";
 	end
 
 	return true;
@@ -97,5 +96,5 @@ 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);
+module:provides("adhoc", announce_desc);