From d7c25bcc5faeb11b84b9d29823cde0dcd6738134 Mon Sep 17 00:00:00 2001 From: Andrew Lewis Date: Wed, 14 Dec 2016 10:41:04 +0200 Subject: [PATCH] [Feature] Support setting SMTP message in multimap --- src/plugins/lua/multimap.lua | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua index 6412e92400..9947fb9175 100644 --- a/src/plugins/lua/multimap.lua +++ b/src/plugins/lua/multimap.lua @@ -442,7 +442,14 @@ local function multimap_callback(task, rule) end if pre_filter then - task:set_pre_result(r['action'], 'Matched map: ' .. r['symbol']) + if r['message_func'] then + r['message'] = r.message_func(task, r['symbol'], opt) + end + if r['message'] then + task:set_pre_result(r['action'], r['message']) + else + task:set_pre_result(r['action'], 'Matched map: ' .. r['symbol']) + end end end end @@ -617,6 +624,9 @@ end local function add_multimap_rule(key, newrule) local ret = false + if newrule['message_func'] then + newrule['message_func'] = assert(load(newrule['message_func']))() + end if newrule['url'] and not newrule['map'] then newrule['map'] = newrule['url'] end -- 2.47.3