diff options
| author | Kim Alvefur <zash@zash.se> | 2017-01-24 21:24:03 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-01-24 21:24:03 +0100 |
| commit | a845ca47015583bf7b41f20362fd210c037639f3 (patch) | |
| tree | cf044930d3acbcf06fd592cc90f3b19d609f9f22 | |
| parent | 45334397e8ae6def260f86a681a509275c67c395 (diff) | |
| parent | b70b967a61926bccde4c55bf1e05045025bf44b7 (diff) | |
| download | prosody-a845ca47015583bf7b41f20362fd210c037639f3.tar.gz prosody-a845ca47015583bf7b41f20362fd210c037639f3.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_watchregistrations.lua | 3 |
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; |