nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-17 19:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core/ChatHandler): Cleanup retriving session and checking fo… (#19585)

Browse Source 
* refactor(Core/ChatHandler): Cleanup retriving session and checking for valid session

* redundant

* make it clear what a "valid" session is

* HasValidSession -> HasSession

* Differentiate from "valid" which in this case would mean the player is in world which isnt checked here
This commit is contained in:
Kitzunu
2024-08-10 17:46:13 +02:00
committed by GitHub
parent e4df159f5c
commit b81bcfbfea
2 changed files with 49 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/server/game/Chat/Chat.cpp
View File

@@ -101,12 +101,6 @@ bool ChatHandler::HasLowerSecurityAccount(WorldSession* target, uint32 target_ac
void ChatHandler::SendNotification(std::string_view str)
{
if (!m_session)
{
LOG_ERROR("chat.chat", "ChatHandler::SendNotification sent without a session. Skipped.");
return;
}
std::vector<std::string_view> lines = Acore::Tokenize(str, '\n', true);
for (std::string_view line : lines)
{
@@ -123,16 +117,11 @@ void ChatHandler::SendGMText(std::string_view str)
if (AccountMgr::IsPlayerAccount(m_session->GetSecurity()))
return;
// Player should be in world
Player* player = m_session->GetPlayer();
if (!player || !player->IsInWorld())
return;
for (std::string_view line : lines)
{
WorldPacket data;
ChatHandler::BuildChatPacket(data, CHAT_MSG_SYSTEM, LANG_UNIVERSAL, nullptr, nullptr, line);
player->SendDirectMessage(&data);
m_session->SendPacket(&data);
}
}
@@ -140,15 +129,11 @@ void ChatHandler::SendWorldText(std::string_view str)
{
std::vector<std::string_view> lines = Acore::Tokenize(str, '\n', true);
Player* player = m_session->GetPlayer();
if (!player || !player->IsInWorld())
return;
for (std::string_view line : lines)
{
WorldPacket data;
ChatHandler::BuildChatPacket(data, CHAT_MSG_SYSTEM, LANG_UNIVERSAL, nullptr, nullptr, line);
player->SendDirectMessage(&data);
m_session->SendPacket(&data);
}
}
@@ -157,9 +142,6 @@ void ChatHandler::SendWorldTextOptional(std::string_view str, uint32 flag)
std::vector<std::string_view> lines = Acore::Tokenize(str, '\n', true);
Player* player = m_session->GetPlayer();
if (!player || !player->IsInWorld())
return;
if (sWorld->getBoolConfig(CONFIG_PLAYER_SETTINGS_ENABLED))
if (player->GetPlayerSetting(AzerothcorePSSource, SETTING_ANNOUNCER_FLAGS).HasFlag(flag))
return;
@@ -174,12 +156,6 @@ void ChatHandler::SendWorldTextOptional(std::string_view str, uint32 flag)
void ChatHandler::SendSysMessage(std::string_view str, bool escapeCharacters)
{
if (!m_session)
{
LOG_ERROR("chat.chat", "ChatHandler::SendSysMessage sent without a session. Skipped.");
return;
}
std::string msg{ str };
// Replace every "|" with "||" in msg
@@ -454,6 +430,23 @@ Player* ChatHandler::getSelectedPlayerOrSelf() const
return targetPlayer;
}
bool ChatHandler::HasSession()
{
if (!m_session)
return false;
return true;
}
void ChatHandler::DoForAllValidSessions(std::function<void(Player*)> exec)
{
SessionMap::const_iterator itr;
for (itr = sWorld->GetAllSessions().begin(); itr != sWorld->GetAllSessions().end(); ++itr)
if (Player* player = itr->second->GetPlayer())
if (player->IsInWorld())
exec(player);
}
char* ChatHandler::extractKeyFromLink(char* text, char const* linkType, char** something1)
{
// skip empty