Merge branch 'main' of https://github.com/shdwmtr/millennium

shdwmtr · Jan 4, 2025 · a94d074 · a94d074
2 parents f56c52b + aa4f054
commit a94d074
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/core/ffi/javascript.cc b/src/core/ffi/javascript.cc
@@ -146,10 +146,10 @@ PyObject* JavaScript::EvaluateFromSocket(std::string script)
         std::string type = response.json["type"];
 
         if      (type == "string") return PyUnicode_FromString(response.json["value"].get<std::string>().c_str());
-        else if (type == "bool")   return PyBool_FromLong(response.json["value"]);
-        else if (type == "int")    return PyLong_FromLong(response.json["value"]);
+        else if (type == "boolean")   return PyBool_FromLong(response.json["value"]);
+        else if (type == "number")    return PyLong_FromLong(response.json["value"]);
         else
-            return PyUnicode_FromString("Js function returned unaccepted type. accepted types [string, bool, int]");
+            return PyUnicode_FromString(fmt::format("Js function returned unaccepted type '{}'. Accepted types [string, boolean, number]", type).c_str());
 
     }
     catch (nlohmann::detail::exception& ex)