From edcd7d0f3e309a2a23ae9c607c7b62ff30578770 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 16 Jun 2018 14:18:49 +0100
Subject: [PATCH] [Minor] Add alternative format of metatokens

---
 lualib/lua_meta.lua | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lualib/lua_meta.lua b/lualib/lua_meta.lua
index 96404192d7..0161eb5c92 100644
--- a/lualib/lua_meta.lua
+++ b/lualib/lua_meta.lua
@@ -380,6 +380,23 @@ local function rspamd_gen_metatokens(task)
 end
 
 exports.rspamd_gen_metatokens = rspamd_gen_metatokens
+exports.gen_metatokens = rspamd_gen_metatokens
+
+local function rspamd_gen_metatokens_table(task)
+  local metatokens = {}
+
+  for _,mt in ipairs(metafunctions) do
+    local ct = mt.cb(task)
+    for i,tok in ipairs(ct) do
+      metatokens[mt.desc[i]] = tok
+    end
+  end
+
+  return metatokens
+end
+
+exports.rspamd_gen_metatokens_table = rspamd_gen_metatokens_table
+exports.gen_metatokens_table = rspamd_gen_metatokens_table
 
 local function rspamd_count_metatokens()
   local ipairs = ipairs
@@ -392,5 +409,6 @@ local function rspamd_count_metatokens()
 end
 
 exports.rspamd_count_metatokens = rspamd_count_metatokens
+exports.count_metatokens = rspamd_count_metatokens
 
 return exports
-- 
2.47.3