aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_watchregistrations.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-24 21:24:03 +0100
committerKim Alvefur <zash@zash.se>2017-01-24 21:24:03 +0100
commit0c22ed35793dc8b751dea8c89e418986efd8aa08 (patch)
treecf044930d3acbcf06fd592cc90f3b19d609f9f22 /plugins/mod_watchregistrations.lua
parentd020c4eab4880ae5989839ede92ff847d65dd5a8 (diff)
parent2c33b9b47d9f85a81b25cfc5ebebdc1fb5aa6864 (diff)
downloadprosody-0c22ed35793dc8b751dea8c89e418986efd8aa08.tar.gz
prosody-0c22ed35793dc8b751dea8c89e418986efd8aa08.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_watchregistrations.lua')
-rw-r--r--plugins/mod_watchregistrations.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_watchregistrations.lua b/plugins/mod_watchregistrations.lua
index 1e696f30..dc979b9a 100644
--- a/plugins/mod_watchregistrations.lua
+++ b/plugins/mod_watchregistrations.lua
@@ -11,13 +11,14 @@ local host = module:get_host();
local jid_prep = require "util.jid".prep;
local registration_watchers = module:get_option_set("registration_watchers", module:get_option("admins", {})) / jid_prep;
+local registration_from = module:get_option_string("registration_from", host);
local registration_notification = module:get_option_string("registration_notification", "User $username just registered on $host from $ip");
local st = require "util.stanza";
module:hook("user-registered", function (user)
module:log("debug", "Notifying of new registration");
- local message = st.message{ type = "chat", from = host }
+ local message = st.message{ type = "chat", from = registration_from }
:tag("body")
:text(registration_notification:gsub("%$(%w+)", function (v)
return user[v] or user.session and user.session[v] or nil;