From 1df4adebec99520e8cdfa5e20e3caed9bb49f36e Mon Sep 17 00:00:00 2001 From: Mordred Date: Sat, 27 Oct 2018 00:05:10 +0200 Subject: [PATCH] Fixed charlist, logging in works again --- src/common/Util/Util.cpp | 4 ++-- src/servers/sapphire_lobby/RestConnector.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/Util/Util.cpp b/src/common/Util/Util.cpp index 498fec78..b8db0b7c 100644 --- a/src/common/Util/Util.cpp +++ b/src/common/Util/Util.cpp @@ -19,8 +19,8 @@ std::string Core::Util::binaryToHexString( uint8_t* pBinData, uint16_t size ) } std::string Core::Util::toLowerCopy( const std::string& inStr ) { - std::string out; - std::transform( inStr.begin(), inStr.end(), out.begin(), ::tolower ); + std::string out = inStr; + std::transform( inStr.begin(), inStr.end(), out.begin(), [](unsigned char c) -> unsigned char { return ::tolower(c); }); return out; } diff --git a/src/servers/sapphire_lobby/RestConnector.cpp b/src/servers/sapphire_lobby/RestConnector.cpp index 4f8ac0a9..d17fe938 100644 --- a/src/servers/sapphire_lobby/RestConnector.cpp +++ b/src/servers/sapphire_lobby/RestConnector.cpp @@ -228,12 +228,12 @@ CharList Core::Network::RestConnector::getCharList( char* sId ) for( auto& child : json["charArray"] ) { - g_log.debug( child["contentId"] ); + g_log.info( child["contentId"] ); //std::string, uint32_t, uint64_t, std::string - list.push_back( { child["name"].get< std::string >(), - child["charId"].get< uint32_t >(), - child["contentId"].get< uint64_t >(), - child["infoJson"].get< std::string >() + list.push_back( { child["name"], + std::stoi( std::string( child["charId"] ) ), + std::stoll( std::string( child["contentId"] ) ), + child["infoJson"] } ); }