Changeset

7861:58dbe5afeb4a

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 24 Jan 2017 21:24:03 +0100
parents 7859:9eb13c14eaab (current diff) 7860:49ff363f3a3d (diff)
children 7868:11fcdef5022f
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_watchregistrations.lua	Tue Jan 24 19:27:17 2017 +0100
+++ b/plugins/mod_watchregistrations.lua	Tue Jan 24 21:24:03 2017 +0100
@@ -11,13 +11,14 @@
 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;