From 3bbccb94aba824c999c7ed20abbe441ba3d7f5fc Mon Sep 17 00:00:00 2001 From: Er2 Date: Sun, 13 Feb 2022 15:21:44 +0300 Subject: [PATCH] optional quoted args, update lib --- etc/api | 2 +- src/cmds/eval.lua | 4 ++-- src/events/command.lua | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/etc/api b/etc/api index e8a1270..fefafd4 160000 --- a/etc/api +++ b/etc/api @@ -1 +1 @@ -Subproject commit e8a127093213a52b0f8513f72fe7c0566b786158 +Subproject commit fefafd4923e824cb5a7f762c7e65d24cdc1f8d87 diff --git a/src/cmds/eval.lua b/src/cmds/eval.lua index e430daf..60a9655 100644 --- a/src/cmds/eval.lua +++ b/src/cmds/eval.lua @@ -39,11 +39,11 @@ return { api = owner and C.api or nil, } for k,v in pairs(env) do t[k] = v end - local e, err = load(table.concat(msg.args, ' '), 'eval', 't', t) + local e, err = load(C.api.unparseArgs(msg.args), 'eval', 't', t) xpcall(function() if err then error(err) end e = tostring(e() or '...') end, function(err) e = err end) C.api:send(msg, s .. '\n' .. e) end -} \ No newline at end of file +} diff --git a/src/events/command.lua b/src/events/command.lua index 38d9da9..c1d682e 100644 --- a/src/events/command.lua +++ b/src/events/command.lua @@ -15,6 +15,7 @@ api:send(msg, C.locale:get('error', 'adm_cmd', l)) else + if cmd.useQArgs then msg.args = api.parseArgs(api.unparseArgs(msg.args)) end msg.loc = C.locale:get('cmds', msg.cmd, l) local succ, err = pcall(cmd.run, C, msg, owner) if not succ then