diff --git a/authenticator.cpp b/authenticator.cpp index ee355fa..6c37fcb 100644 --- a/authenticator.cpp +++ b/authenticator.cpp @@ -21,7 +21,7 @@ Authenticator::Authenticator(UserDao &userDao) // TODO: make failure counter configurable bool Authenticator::isBanned(std::string ip) { - if(utils::hasKey(loginFails, ip)) + if(loginFails.contains(ip)) { LoginFail &fl = loginFails[ip]; std::lock_guard lock(fl.mutex); diff --git a/utils.h b/utils.h index 4e08569..cbe71c8 100644 --- a/utils.h +++ b/utils.h @@ -20,12 +20,6 @@ std::string strreplace(std::string str, const std::string &search, const std::st std::string html_xss(std::string_view str); std::string getenv(const std::string &key); -template bool hasKey(const std::map &map, const T &key) -{ - auto k = map.find(key); - return k != map.end(); -} - template U getKeyOrEmpty(const std::map &map, const T &key) { auto k = map.find(key); diff --git a/varreplacer.cpp b/varreplacer.cpp index beb2a44..98bc9b0 100644 --- a/varreplacer.cpp +++ b/varreplacer.cpp @@ -60,12 +60,12 @@ std::string Varreplacer::makeReplacement(std::string_view varkeyvalue) std::string_view value; std::tie(key, value) = extractKeyAndValue(varkeyvalue); - if(utils::hasKey(keyValues, key)) + if(keyValues.contains(key)) { std::string replacementContent = keyValues[key]; return replacementContent; } - else if(utils::hasKey(resolverFunctionsMap, key)) + else if(resolverFunctionsMap.contains(key)) { auto resolver = this->resolverFunctionsMap[key];