diff options
Diffstat (limited to 'bot/src')
| -rw-r--r-- | bot/src/commands/command.cpp | 4 | ||||
| -rw-r--r-- | bot/src/commands/lua.cpp | 9 | ||||
| -rw-r--r-- | bot/src/commands/lua.hpp | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/bot/src/commands/command.cpp b/bot/src/commands/command.cpp index 48bca09..1658554 100644 --- a/bot/src/commands/command.cpp +++ b/bot/src/commands/command.cpp @@ -55,9 +55,7 @@ namespace bot { this->luaState->open_libraries(sol::lib::base, sol::lib::string, sol::lib::math); - lua::library::add_bot_library(this->luaState); - lua::library::add_time_library(this->luaState); - lua::library::add_json_library(this->luaState); + lua::library::add_base_libraries(this->luaState); } void CommandLoader::load_lua_directory(const std::string &folder_path) { diff --git a/bot/src/commands/lua.cpp b/bot/src/commands/lua.cpp index 3fda65b..e362a37 100644 --- a/bot/src/commands/lua.cpp +++ b/bot/src/commands/lua.cpp @@ -160,6 +160,12 @@ namespace bot::command::lua { return lua_to_json(o).dump(); }); } + + void add_base_libraries(std::shared_ptr<sol::state> state) { + add_bot_library(state); + add_time_library(state); + add_json_library(state); + } } std::string parse_lua_response(const sol::table &r, sol::object &res) { @@ -186,8 +192,7 @@ namespace bot::command::lua { std::shared_ptr<sol::state> state = std::make_shared<sol::state>(); state->open_libraries(sol::lib::base, sol::lib::table, sol::lib::string); - library::add_bot_library(state); - library::add_time_library(state); + library::add_base_libraries(state); sol::load_result s = state->load("return " + script); if (!s.valid()) { diff --git a/bot/src/commands/lua.hpp b/bot/src/commands/lua.hpp index f6bb7c1..87159cc 100644 --- a/bot/src/commands/lua.hpp +++ b/bot/src/commands/lua.hpp @@ -19,6 +19,8 @@ namespace bot::command::lua { void add_bot_library(std::shared_ptr<sol::state> state); void add_time_library(std::shared_ptr<sol::state> state); void add_json_library(std::shared_ptr<sol::state> state); + + void add_base_libraries(std::shared_ptr<sol::state> state); } command::Response run_safe_lua_script(const Request &request, |
