mod_tls: Simplify and use new ssl config merging in certmanager

[prosody.git] / plugins / mod_watchregistrations.lua

diff --git a/plugins/mod_watchregistrations.lua b/plugins/mod_watchregistrations.lua
index ee51566b9eb6937dd5379d39fe61b13bd62ff0e0..b7be5daf8e8a945aa29de64e82b57d762a089a7f 100644 (file)
--- a/plugins/mod_watchregistrations.lua
+++ b/plugins/mod_watchregistrations.lua
@@ -1,15 +1,16 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
 
 local host = module:get_host();
+local jid_prep = require "util.jid".prep;
 
-local registration_watchers = module:get_option("registration_watchers", module:get_option("admins", {}));
+local registration_watchers = module:get_option_set("registration_watchers", module:get_option("admins", {})) / jid_prep;
 local registration_notification = module:get_option("registration_notification", "User $username just registered on $host from $ip");
 
 local st = require "util.stanza";
@@ -18,12 +19,12 @@ module:hook("user-registered", function (user)
        module:log("debug", "Notifying of new registration");
        local message = st.message{ type = "chat", from = host }
                :tag("body")
-                       :text(registration_alert:gsub("%$(%w+)", function (v)
+                       :text(registration_notification:gsub("%$(%w+)", function (v)
                                return user[v] or user.session and user.session[v] or nil;
                        end));
-       for _, jid in ipairs(registration_watchers) do
+       for jid in registration_watchers do
                module:log("debug", "Notifying %s", jid);
                message.attr.to = jid;
-               core_route_stanza(hosts[host], message);
+               module:send(message);
        end
 end);