# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1245783356 -18000
# Node ID ce3eb5f71899827775e9dec328fdae62d23d18b0
# Parent  1c547fb4e570301dc3d34a596e9b30e547a8231b
mod_announce: Use usermanager.is_admin to verify admin status

diff -r 1c547fb4e570 -r ce3eb5f71899 plugins/mod_announce.lua
--- a/plugins/mod_announce.lua	Tue Jun 23 23:54:57 2009 +0500
+++ b/plugins/mod_announce.lua	Tue Jun 23 23:55:56 2009 +0500
@@ -1,5 +1,6 @@
 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,7 +11,7 @@
 		return; -- Not an announcement
 	end
 	
-	if not admins:contains(jid.bare(origin.full_jid)) then
+	if not is_admin(origin.full_jid) then
 		-- Not an admin? Not allowed!
 		module:log("warn", "Non-admin %s tried to send server announcement", tostring(jid.bare(origin.full_jid)));
 		origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));