diff --git a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp index 8b43f6d8..d955e5eb 100755 --- a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp +++ b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp @@ -161,7 +161,7 @@ void ClientConnection::validateClient(const std::string &id, const std::string & StationId user_id; StationId parent_id; - std::unordered_map childAccounts; + std::unordered_map childAccounts; if (!authURL.empty()) { // create the object @@ -184,8 +184,8 @@ void ClientConnection::validateClient(const std::string &id, const std::string & childAccounts = api.getStringMap("subAccounts"); if (!ConfigLoginServer::getUseOldSuidGenerator()) { - user_id = static_cast(api.getNullableValue("user_id")); - parent_id = static_cast(api.getNullableValue("parent_id")); + user_id = static_cast(api.getNullableValue("user_id")); + parent_id = static_cast(api.getNullableValue("parent_id")); } else { if (parentAccount.length() > MAX_ACCOUNT_NAME_LENGTH) { parentAccount.resize(MAX_ACCOUNT_NAME_LENGTH); diff --git a/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h b/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h index 6bbebe23..3ca8cd55 100755 --- a/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h +++ b/engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h @@ -35,8 +35,8 @@ class CharacterNameLocator : public ObjectLocator DB::BindableLong character_station_id; DB::BindableString<127> character_name; DB::BindableString<127> character_full_name; - DB::BindableInt64 character_create_time; - DB::BindableInt64 character_last_login_time; + DB::BindableLong character_create_time; + DB::BindableLong character_last_login_time; }; class CharacterNameQuery : public DB::Query @@ -66,8 +66,8 @@ class CharacterNameLocator : public ObjectLocator std::vector m_stationIds; std::vector m_characterNames; std::vector m_characterFullNames; - std::vector m_characterCreateTime; - std::vector m_characterLastLoginTime; + std::vector m_characterCreateTime; + std::vector m_characterLastLoginTime; }; // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/core/NameManager.cpp b/engine/server/library/serverGame/src/shared/core/NameManager.cpp index 3f6525cd..3724892f 100755 --- a/engine/server/library/serverGame/src/shared/core/NameManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/NameManager.cpp @@ -224,15 +224,15 @@ void NameManager::addPlayer(const NetworkId &id, uint32 stationId, const std::st std::vector stationIds; std::vector characterNames; std::vector characterFullNames; - std::vector characterCreateTimes; - std::vector characterLastLoginTimes; + std::vector characterCreateTimes; + std::vector characterLastLoginTimes; ids.push_back(id); stationIds.push_back(static_cast(stationId)); characterNames.push_back(normalizedName); characterFullNames.push_back(fullName); - characterCreateTimes.push_back(static_cast(createTime)); - characterLastLoginTimes.push_back(static_cast(lastLoginTime)); + characterCreateTimes.push_back(static_cast(createTime)); + characterLastLoginTimes.push_back(static_cast(lastLoginTime)); ServerMessageForwarding::beginBroadcast(); @@ -316,24 +316,24 @@ const std::string & NameManager::getPlayerFullName(const NetworkId &id) const // ---------------------------------------------------------------------- -int64 NameManager::getPlayerCreateTime(const NetworkId &id) const +int NameManager::getPlayerCreateTime(const NetworkId &id) const { IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->find(id); if (i==m_idToCharacterDataMap->end()) return -1; else - return static_cast(i->second.createTime); + return static_cast(i->second.createTime); } // ---------------------------------------------------------------------- -int64 NameManager::getPlayerLastLoginTime(const NetworkId &id) const +int NameManager::getPlayerLastLoginTime(const NetworkId &id) const { IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->find(id); if (i==m_idToCharacterDataMap->end()) return -1; else - return static_cast(i->second.lastLoginTime); + return static_cast(i->second.lastLoginTime); } // ---------------------------------------------------------------------- @@ -464,7 +464,7 @@ void NameManager::releasePlayerName(const NetworkId &id) // ---------------------------------------------------------------------- -void NameManager::addPlayers(const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes) +void NameManager::addPlayers(const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes) { DEBUG_FATAL(ids.size() != stationIds.size(),("Programmer bug: Vectors ids and stationIds must be the same size.\n")); DEBUG_FATAL(ids.size() != names.size(),("Programmer bug: Vectors ids and names must be the same size.\n")); @@ -486,8 +486,8 @@ void NameManager::sendAllNamesToServer (std::vector const & servers) con std::vector stationIds; std::vector characterNames; std::vector characterFullNames; - std::vector characterCreateTimes; - std::vector characterLastLoginTimes; + std::vector characterCreateTimes; + std::vector characterLastLoginTimes; for (IdToCharacterDataMapType::const_iterator i=m_idToCharacterDataMap->begin(); i!=m_idToCharacterDataMap->end(); ++i) { @@ -495,8 +495,8 @@ void NameManager::sendAllNamesToServer (std::vector const & servers) con stationIds.push_back(static_cast(i->second.stationId)); characterNames.push_back(i->second.characterName); characterFullNames.push_back(i->second.characterFullName); - characterCreateTimes.push_back(static_cast(i->second.createTime)); - characterLastLoginTimes.push_back(static_cast(i->second.lastLoginTime)); + characterCreateTimes.push_back(static_cast(i->second.createTime)); + characterLastLoginTimes.push_back(static_cast(i->second.lastLoginTime)); } ServerMessageForwarding::begin(servers); diff --git a/engine/server/library/serverGame/src/shared/core/NameManager.h b/engine/server/library/serverGame/src/shared/core/NameManager.h index 7f39e125..6d440b16 100755 --- a/engine/server/library/serverGame/src/shared/core/NameManager.h +++ b/engine/server/library/serverGame/src/shared/core/NameManager.h @@ -32,8 +32,8 @@ class NameManager public: int getTotalPlayerCount () const; - void addPlayer (const NetworkId &id, StationId stationId, const std::string &name, const std::string &fullName, time_t createTime, time_t lastLoginTime, bool notifyOtherServers); - void addPlayers (const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes); + void addPlayer (const NetworkId &id, uint32 stationId, const std::string &name, const std::string &fullName, time_t createTime, time_t lastLoginTime, bool notifyOtherServers); + void addPlayers (const std::vector &ids, const std::vector &stationIds, const std::vector &names, const std::vector &fullNames, const std::vector &createTimes, const std::vector &lastLoginTimes); void renamePlayer (const NetworkId &id, const Unicode::String &name, const Unicode::String &fullName); std::string debugGetNameList () const; bool isPlayer (NetworkId const & possiblePlayer) const; @@ -41,8 +41,8 @@ class NameManager uint32 getPlayerStationId (const NetworkId &id) const; const std::string & getPlayerName (const NetworkId &id) const; const std::string & getPlayerFullName (const NetworkId &id) const; - int64 getPlayerCreateTime (const NetworkId &id) const; - int64 getPlayerLastLoginTime (const NetworkId &id) const; + int getPlayerCreateTime (const NetworkId &id) const; + int getPlayerLastLoginTime (const NetworkId &id) const; void getPlayerWithLastLoginTimeAfter (time_t time, std::multimap, std::string> > &result) const; void getPlayerWithLastLoginTimeBefore (time_t time, std::multimap, std::string> > &result) const; void getPlayerWithLastLoginTimeBetween (time_t timeLowerRange, time_t timeUpperRange, std::multimap, std::string> > &result) const; diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp index 3bd27763..587764ac 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.cpp @@ -10,7 +10,7 @@ // ====================================================================== -CharacterNamesMessage::CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes) : +CharacterNamesMessage::CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes) : GameNetworkMessage("CharacterNamesMessage"), m_ids(), m_stationIds(), diff --git a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h index a2a2ca19..a693698b 100755 --- a/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h +++ b/engine/server/library/serverNetworkMessages/src/shared/gameGameServer/CharacterNamesMessage.h @@ -21,7 +21,7 @@ class CharacterNamesMessage : public GameNetworkMessage { public: - CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes); + CharacterNamesMessage(const std::vector &ids, const std::vector &stationIds, const std::vector &characterNames, const std::vector &characterFullNames, const std::vector &createTimes, const std::vector &loginTimes); CharacterNamesMessage(Archive::ReadIterator & source); ~CharacterNamesMessage(); @@ -29,16 +29,16 @@ class CharacterNamesMessage : public GameNetworkMessage const std::vector &getStationIds() const; const std::vector &getNames() const; const std::vector &getFullNames() const; - const std::vector &getCreateTimes() const; - const std::vector &getLoginTimes() const; + const std::vector &getCreateTimes() const; + const std::vector &getLoginTimes() const; private: Archive::AutoArray m_ids; Archive::AutoArray m_stationIds; Archive::AutoArray m_names; Archive::AutoArray m_fullNames; - Archive::AutoArray m_createTimes; - Archive::AutoArray m_loginTimes; + Archive::AutoArray m_createTimes; + Archive::AutoArray m_loginTimes; private: //disabled functions: @@ -78,14 +78,14 @@ inline const std::vector & CharacterNamesMessage::getFullNames() co // ---------------------------------------------------------------------- -inline const std::vector & CharacterNamesMessage::getCreateTimes() const +inline const std::vector & CharacterNamesMessage::getCreateTimes() const { return m_createTimes.get(); } // ---------------------------------------------------------------------- -inline const std::vector & CharacterNamesMessage::getLoginTimes() const +inline const std::vector & CharacterNamesMessage::getLoginTimes() const { return m_loginTimes.get(); } diff --git a/external/3rd/library/webAPI/webAPI.cpp b/external/3rd/library/webAPI/webAPI.cpp index faf7d11b..b03ea28c 100644 --- a/external/3rd/library/webAPI/webAPI.cpp +++ b/external/3rd/library/webAPI/webAPI.cpp @@ -72,26 +72,7 @@ std::unordered_map webAPI::getStringMap(const std::string &slo return ret; } -std::unordered_map webAPI::getStringMap64(const std::string &slot) { - std::unordered_map ret = std::unordered_map(); - - if (!responseData.empty() && !slot.empty() && responseData.count(slot) && !responseData[slot].is_null()) { - - nlohmann::json j = responseData[slot]; - - for (nlohmann::json::iterator it = j.begin(); it != j.end(); ++it) { - std::string tmp(it.key()); - int64_t k = strtoll(tmp.c_str(), nullptr, 10); - std::string val = it.value(); - - ret.insert({k, val}); - } - } - - return ret; -} - -bool webAPI::submit(const int32_t &reqType, const int32_t &getPost, const int32_t &respType) { +bool webAPI::submit(const int &reqType, const int &getPost, const int &respType) { if (reqType == DTYPE::JSON) // json request { if (!requestData.empty()) { @@ -112,7 +93,7 @@ bool webAPI::submit(const int32_t &reqType, const int32_t &getPost, const int32_ return false; } -bool webAPI::fetch(const int32_t &getPost, const int32_t &mimeType) // 0 for json 1 for string +bool webAPI::fetch(const int &getPost, const int &mimeType) // 0 for json 1 for string { bool fetchStatus = false; diff --git a/external/3rd/library/webAPI/webAPI.h b/external/3rd/library/webAPI/webAPI.h index 2209b8f5..501c18cb 100644 --- a/external/3rd/library/webAPI/webAPI.h +++ b/external/3rd/library/webAPI/webAPI.h @@ -49,7 +49,7 @@ namespace StellaBellum { // submits the request bool - submit(const int32_t &reqType = DTYPE::JSON, const int32_t &getPost = HTTP::POST, const int32_t &respType = DTYPE::JSON); + submit(const int &reqType = DTYPE::JSON, const int &getPost = HTTP::POST, const int &respType = DTYPE::JSON); // set the endpoint after object creation...or change the target if needed bool setEndpoint(const std::string endpoint); @@ -66,9 +66,6 @@ namespace StellaBellum { // get a vector of strings from a given slot std::unordered_map getStringMap(const std::string &slot); - // get a 64 bit keyed vector of strings from a given slot - std::unordered_map getStringMap64(const std::string &slot); - // set json key and value for request template bool addJsonData(const std::string &key, const T &value) { if (!key.empty() && @@ -107,7 +104,7 @@ namespace StellaBellum { std::string uri; // fetcher - returns raw response direct from remote - bool fetch(const int32_t &getPost = HTTP::POST, const int32_t &mimeType = DTYPE::JSON); + bool fetch(const int &getPost = HTTP::POST, const int &mimeType = DTYPE::JSON); // cURL writeback callback static size_t writeCallback(void *contents, size_t size, size_t nmemb, void *userp);