diff --git a/src/bank_f.cpp b/src/bank_f.cpp index de8cb40..446234e 100644 --- a/src/bank_f.cpp +++ b/src/bank_f.cpp @@ -1,35 +1,9 @@ #include "bank_f.h" -#define JSON(V) callback(HttpResponse::newHttpJsonResponse(JsonReturn(V))); +#define JSON(V) callback(HttpResponse::newHttpJsonResponse(V)); #define INLINE __attribute__((always_inline)) inline -#define GEN_BODY \ - const auto temp_req = req->getJsonObject(); \ - const auto body = temp_req ? *temp_req : Json::Value(); #define PASS_HEADER req->getHeader("Password") -template -INLINE Json::Value JsonReturn(T &&val) -{ - Json::Value res; - if constexpr (std::is_same_v) - { - res["value"] = (int)val; //becuase of json lib interpreting 67 as 'A' for example - } - else if constexpr (std::is_same_v) - { - res["value"] = (Json::Int64)val; - } - else if constexpr (std::is_same_v) - { - res["value"] = (Json::Int64)val; - } - else - { - res["value"] = val; - } - return res; -} - BankF::BankF(Bank *b) : bank(*b) {} void BankF::Help(req_args) const @@ -114,7 +88,7 @@ void BankF::GetLog(req_args, const std::string &name) } else { - auto resp = HttpResponse::newHttpJsonResponse(JsonReturn("Logs are Disabled")); + auto resp = HttpResponse::newHttpJsonResponse("Logs are Disabled"); resp->setExpiredTime(0); //cached forever callback(resp); }