X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_announce.lua;h=118ba13d3a56e50243ab1bf8f184526c359afbb3;hb=04cac3474b5d2ef6b40863e683ddb78997d739ee;hp=992410f3c400e4a6fe54cd069b80307cc7ba9913;hpb=d37ec9a822ecf9787aa9836c4f7c59e48baca446;p=prosody.git

diff --git a/plugins/mod_announce.lua b/plugins/mod_announce.lua
index 992410f3..118ba13d 100644
--- a/plugins/mod_announce.lua
+++ b/plugins/mod_announce.lua
@@ -1,5 +1,14 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 local st, jid, set = require "util.stanza", require "util.jid", require "util.set";
 
+local is_admin = require "core.usermanager".is_admin;
 local admins = set.new(config.get(module:get_host(), "core", "admins"));
 
 function handle_announcement(data)
@@ -10,9 +19,9 @@ function handle_announcement(data)
 		return; -- Not an announcement
 	end
 	
-	if not admins:contains(jid.bare(origin.full_jid)) then
+	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(origin.full_jid)));
+		module:log("warn", "Non-admin %s tried to send server announcement", tostring(jid.bare(stanza.attr.from)));
 		origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
 		return;
 	end