HUD: Reject and warn on invalid stat types (#11548)

[dragonfireclient.git] / src / script / common / c_internal.cpp

diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp
index 6df1f8b7b39f44b51cc014c893c7b18ad8f4f118..66f6a9b9865bccfed13035bdf3d6b0fcf17358f5 100644 (file)
--- a/src/script/common/c_internal.cpp
+++ b/src/script/common/c_internal.cpp
@@ -18,10 +18,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "common/c_internal.h"
+#include "util/numeric.h"
 #include "debug.h"
 #include "log.h"
 #include "porting.h"
 #include "settings.h"
+#include <algorithm> // std::find
 
 std::string script_get_backtrace(lua_State *L)
 {
@@ -135,44 +137,68 @@ void script_run_callbacks_f(lua_State *L, int nargs,
        lua_remove(L, error_handler);
 }
 
-static void script_log(lua_State *L, const std::string &message,
-       std::ostream &log_to, bool do_error, int stack_depth)
+static void script_log_add_source(lua_State *L, std::string &message, int stack_depth)
 {
        lua_Debug ar;
 
-       log_to << message << " ";
        if (lua_getstack(L, stack_depth, &ar)) {
                FATAL_ERROR_IF(!lua_getinfo(L, "Sl", &ar), "lua_getinfo() failed");
-               log_to << "(at " << ar.short_src << ":" << ar.currentline << ")";
+               message.append(" (at " + std::string(ar.short_src) + ":"
+                       + std::to_string(ar.currentline) + ")");
        } else {
-               log_to << "(at ?:?)";
+               message.append(" (at ?:?)");
        }
-       log_to << std::endl;
+}
 
-       if (do_error)
-               script_error(L, LUA_ERRRUN, NULL, NULL);
-       else
-               infostream << script_get_backtrace(L) << std::endl;
+bool script_log_unique(lua_State *L, std::string message, std::ostream &log_to,
+       int stack_depth)
+{
+       thread_local std::vector<u64> logged_messages;
+
+       script_log_add_source(L, message, stack_depth);
+       u64 hash = murmur_hash_64_ua(message.data(), message.length(), 0xBADBABE);
+
+       if (std::find(logged_messages.begin(), logged_messages.end(), hash)
+                       == logged_messages.end()) {
+
+               logged_messages.emplace_back(hash);
+               log_to << message << std::endl;
+               return true;
+       }
+       return false;
 }
 
-void log_deprecated(lua_State *L, const std::string &message, int stack_depth)
+DeprecatedHandlingMode get_deprecated_handling_mode()
 {
        static thread_local bool configured = false;
-       static thread_local bool do_log = false;
-       static thread_local bool do_error = false;
+       static thread_local DeprecatedHandlingMode ret = DeprecatedHandlingMode::Ignore;
 
        // Only read settings on first call
        if (!configured) {
                std::string value = g_settings->get("deprecated_lua_api_handling");
                if (value == "log") {
-                       do_log = true;
+                       ret = DeprecatedHandlingMode::Log;
                } else if (value == "error") {
-                       do_log = true;
-                       do_error = true;
+                       ret = DeprecatedHandlingMode::Error;
                }
                configured = true;
        }
 
-       if (do_log)
-               script_log(L, message, warningstream, do_error, stack_depth);
+       return ret;
 }
+
+void log_deprecated(lua_State *L, std::string message, int stack_depth)
+{
+       DeprecatedHandlingMode mode = get_deprecated_handling_mode();
+       if (mode == DeprecatedHandlingMode::Ignore)
+               return;
+
+       script_log_add_source(L, message, stack_depth);
+       warningstream << message << std::endl;
+
+       if (mode == DeprecatedHandlingMode::Error)
+               script_error(L, LUA_ERRRUN, NULL, NULL);
+       else
+               infostream << script_get_backtrace(L) << std::endl;
+}
+