diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/Chat/Chat.cpp | 24 | ||||
| -rw-r--r-- | src/server/game/Tools/PlayerDump.cpp | 3 |
2 files changed, 10 insertions, 17 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 55a49a13e1d..6cf24b10671 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -33,8 +33,6 @@ #include "StringConvert.h" #include "World.h" #include "WorldSession.h" -#include <boost/algorithm/string/replace.hpp> -#include <sstream> Player* ChatHandler::GetPlayer() const { return m_session ? m_session->GetPlayer() : nullptr; } @@ -112,19 +110,11 @@ bool ChatHandler::HasLowerSecurityAccount(WorldSession* target, uint32 target_ac void ChatHandler::SendSysMessage(std::string_view str, bool escapeCharacters) { - std::string msg{ str }; + std::string msg(str); // Replace every "|" with "||" in msg - if (escapeCharacters && msg.find('|') != std::string::npos) - { - std::vector<std::string_view> tokens = Trinity::Tokenize(msg, '|', true); - std::ostringstream stream; - for (size_t i = 0; i < tokens.size() - 1; ++i) - stream << tokens[i] << "||"; - stream << tokens[tokens.size() - 1]; - - msg = stream.str(); - } + if (escapeCharacters) + StringReplaceAll(&msg, "|"sv, "||"sv); WorldPackets::Chat::Chat packet; for (std::string_view line : Trinity::Tokenize(str, '\n', true)) @@ -606,7 +596,10 @@ LocaleConstant ChatHandler::GetSessionDbLocaleIndex() const std::string ChatHandler::playerLink(std::string const& name) const { - return m_session ? "|cffffffff|Hplayer:" + name + "|h[" + name + "]|h|r" : name; + if (m_session) + return Trinity::StringFormat("|cffffffff|Hplayer:{0}|h[{0}]|h|r", name); + else + return name; } std::string ChatHandler::GetNameLink(Player* chr) const @@ -787,7 +780,8 @@ void AddonChannelCommandHandler::SendSysMessage(std::string_view str, bool escap msg.append(echo, 4); std::string body(str); if (escapeCharacters) - boost::replace_all(body, "|", "||"); + StringReplaceAll(&body, "|"sv, "||"sv); + size_t pos, lastpos; for (lastpos = 0, pos = body.find('\n', lastpos); pos != std::string::npos; lastpos = pos + 1, pos = body.find('\n', lastpos)) { diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index a5547652c60..078ba4a321b 100644 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -25,7 +25,6 @@ #include "Player.h" #include "StringConvert.h" #include "World.h" -#include <boost/algorithm/string/find.hpp> #include <fstream> #include <sstream> @@ -303,7 +302,7 @@ void PlayerDump::InitializeTables() TableField f; f.FieldName = columnName; - f.IsBinaryField = !boost::ifind_first(typeName, "binary").empty() || !boost::ifind_first(typeName, "blob").empty(); + f.IsBinaryField = StringContainsStringI(typeName, "binary"sv) || StringContainsStringI(typeName, "blob"sv); bool toUpperResult = Utf8ToUpperOnlyLatin(columnName); ASSERT(toUpperResult); |