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

refactor(Core/Chat): PSendSysMessage to fmt (#19449)

Browse Source 
* refactor(Core/Chat): PSendSysMessage to `fmt`
This commit is contained in:
Kitzunu
2024-07-23 23:48:46 +02:00
committed by GitHub
parent e79c89aeb1
commit 3fbded8f6b
52 changed files with 801 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/server/scripts/Commands/cs_ban.cpp
View File

@@ -131,17 +131,17 @@ public:
if (atoi(durationStr) > 0)
{
if (!sWorld->getBoolConfig(CONFIG_SHOW_BAN_IN_WORLD))
handler->PSendSysMessage(LANG_BAN_YOUBANNED, name.c_str(), secsToTimeString(TimeStringToSecs(durationStr), true).c_str(), reasonStr);
handler->PSendSysMessage(LANG_BAN_YOUBANNED, name, secsToTimeString(TimeStringToSecs(durationStr), true), reasonStr);
}
else
{
if (!sWorld->getBoolConfig(CONFIG_SHOW_BAN_IN_WORLD))
handler->PSendSysMessage(LANG_BAN_YOUPERMBANNED, name.c_str(), reasonStr);
handler->PSendSysMessage(LANG_BAN_YOUPERMBANNED, name, reasonStr);
}
break;
case BAN_NOTFOUND:
{
handler->SendErrorMessage(LANG_BAN_NOTFOUND, "character", name.c_str());
handler->SendErrorMessage(LANG_BAN_NOTFOUND, "character", name);
return false;
}
default:
@@ -185,7 +185,7 @@ public:
case BAN_ACCOUNT:
if (!Utf8ToUpperOnlyLatin(nameOrIP))
{
handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, nameOrIP.c_str());
handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, nameOrIP);
return false;
}
break;
@@ -224,12 +224,12 @@ public:
if (atoi(durationStr) > 0)
{
if (!sWorld->getBoolConfig(CONFIG_SHOW_BAN_IN_WORLD))
handler->PSendSysMessage(LANG_BAN_YOUBANNED, nameOrIP.c_str(), secsToTimeString(TimeStringToSecs(durationStr), true).c_str(), reasonStr);
handler->PSendSysMessage(LANG_BAN_YOUBANNED, nameOrIP, secsToTimeString(TimeStringToSecs(durationStr), true), reasonStr);
}
else
{
if (!sWorld->getBoolConfig(CONFIG_SHOW_BAN_IN_WORLD))
handler->PSendSysMessage(LANG_BAN_YOUPERMBANNED, nameOrIP.c_str(), reasonStr);
handler->PSendSysMessage(LANG_BAN_YOUPERMBANNED, nameOrIP, reasonStr);
}
break;
case BAN_SYNTAX_ERROR:
@@ -238,13 +238,13 @@ public:
switch (mode)
{
default:
handler->SendErrorMessage(LANG_BAN_NOTFOUND, "account", nameOrIP.c_str());
handler->SendErrorMessage(LANG_BAN_NOTFOUND, "account", nameOrIP);
break;
case BAN_CHARACTER:
handler->SendErrorMessage(LANG_BAN_NOTFOUND, "character", nameOrIP.c_str());
handler->SendErrorMessage(LANG_BAN_NOTFOUND, "character", nameOrIP);
break;
case BAN_IP:
handler->SendErrorMessage(LANG_BAN_NOTFOUND, "ip", nameOrIP.c_str());
handler->SendErrorMessage(LANG_BAN_NOTFOUND, "ip", nameOrIP);
break;
}
return false;
@@ -270,14 +270,14 @@ public:
std::string accountName = nameStr;
if (!Utf8ToUpperOnlyLatin(accountName))
{
handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, accountName);
return false;
}
uint32 accountId = AccountMgr::GetId(accountName);
if (!accountId)
{
handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName.c_str());
handler->PSendSysMessage(LANG_ACCOUNT_NOT_EXIST, accountName);
return true;
}
@@ -305,7 +305,7 @@ public:
bool permanent = (fields[1].Get<uint64>() == uint64(0));
std::string banTime = permanent ? handler->GetAcoreString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[1].Get<uint64>(), true);
handler->PSendSysMessage(LANG_BANINFO_HISTORYENTRY,
fields[0].Get<std::string>().c_str(), banTime.c_str(), active ? handler->GetAcoreString(LANG_YES) : handler->GetAcoreString(LANG_NO), fields[4].Get<std::string>().c_str(), fields[5].Get<std::string>().c_str());
fields[0].Get<std::string>(), banTime, active ? handler->GetAcoreString(LANG_YES) : handler->GetAcoreString(LANG_NO), fields[4].Get<std::string>(), fields[5].Get<std::string>());
} while (result->NextRow());
return true;
@@ -338,11 +338,11 @@ public:
PreparedQueryResult result = CharacterDatabase.Query(stmt);
if (!result)
{
handler->PSendSysMessage(LANG_CHAR_NOT_BANNED, name.c_str());
handler->PSendSysMessage(LANG_CHAR_NOT_BANNED, name);
return true;
}
handler->PSendSysMessage(LANG_BANINFO_BANHISTORY, name.c_str());
handler->PSendSysMessage(LANG_BANINFO_BANHISTORY, name);
do
{
Field* fields = result->Fetch();
@@ -353,7 +353,7 @@ public:
bool permanent = (fields[1].Get<uint32>() == uint32(0));
std::string banTime = permanent ? handler->GetAcoreString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[1].Get<uint64>(), true);
handler->PSendSysMessage(LANG_BANINFO_HISTORYENTRY,
fields[0].Get<std::string>().c_str(), banTime.c_str(), active ? handler->GetAcoreString(LANG_YES) : handler->GetAcoreString(LANG_NO), fields[4].Get<std::string>().c_str(), fields[5].Get<std::string>().c_str());
fields[0].Get<std::string>(), banTime, active ? handler->GetAcoreString(LANG_YES) : handler->GetAcoreString(LANG_NO), fields[4].Get<std::string>(), fields[5].Get<std::string>());
} while (result->NextRow());
return true;
@@ -391,8 +391,8 @@ public:
Field* fields = result->Fetch();
bool permanent = fields[6].Get<uint64>() == 1;
handler->PSendSysMessage(LANG_BANINFO_IPENTRY,
fields[0].Get<std::string>().c_str(), fields[1].Get<std::string>().c_str(), permanent ? handler->GetAcoreString(LANG_BANINFO_NEVER) : fields[2].Get<std::string>().c_str(),
permanent ? handler->GetAcoreString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[3].Get<uint64>(), true).c_str(), fields[4].Get<std::string>().c_str(), fields[5].Get<std::string>().c_str());
fields[0].Get<std::string>(), fields[1].Get<std::string>(), permanent ? handler->GetAcoreString(LANG_BANINFO_NEVER) : fields[2].Get<std::string>(),
permanent ? handler->GetAcoreString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[3].Get<uint64>(), true), fields[4].Get<std::string>(), fields[5].Get<std::string>());
return true;
}
@@ -444,7 +444,7 @@ public:
if (banResult)
{
Field* fields2 = banResult->Fetch();
handler->PSendSysMessage("%s", fields2[0].Get<std::string>().c_str());
handler->PSendSysMessage("%s", fields2[0].Get<std::string>());
}
} while (result->NextRow());
}
@@ -481,16 +481,16 @@ public:
if (fields2[0].Get<uint32>() == fields2[1].Get<uint32>())
{
handler->PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d| permanent |%-15.15s|%-15.15s|",
accountName.c_str(), tmBan.tm_year % 100, tmBan.tm_mon + 1, tmBan.tm_mday, tmBan.tm_hour, tmBan.tm_min,
fields2[2].Get<std::string>().c_str(), fields2[3].Get<std::string>().c_str());
accountName, tmBan.tm_year % 100, tmBan.tm_mon + 1, tmBan.tm_mday, tmBan.tm_hour, tmBan.tm_min,
fields2[2].Get<std::string>(), fields2[3].Get<std::string>());
}
else
{
tm tmUnban = Acore::Time::TimeBreakdown(fields2[1].Get<uint32>());
handler->PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d|%02d-%02d-%02d %02d:%02d|%-15.15s|%-15.15s|",
accountName.c_str(), tmBan.tm_year % 100, tmBan.tm_mon + 1, tmBan.tm_mday, tmBan.tm_hour, tmBan.tm_min,
accountName, tmBan.tm_year % 100, tmBan.tm_mon + 1, tmBan.tm_mday, tmBan.tm_hour, tmBan.tm_min,
tmUnban.tm_year % 100, tmUnban.tm_mon + 1, tmUnban.tm_mday, tmUnban.tm_hour, tmUnban.tm_min,
fields2[2].Get<std::string>().c_str(), fields2[3].Get<std::string>().c_str());
fields2[2].Get<std::string>(), fields2[3].Get<std::string>());
}
} while (banInfo->NextRow());
}
@@ -534,7 +534,7 @@ public:
PreparedQueryResult banResult = CharacterDatabase.Query(stmt2);
if (banResult)
handler->PSendSysMessage("%s", (*banResult)[0].Get<std::string>().c_str());
handler->PSendSysMessage("%s", (*banResult)[0].Get<std::string>());
} while (result->NextRow());
}
// Console wide output
@@ -565,16 +565,16 @@ public:
if (banFields[0].Get<uint32>() == banFields[1].Get<uint32>())
{
handler->PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d| permanent |%-15.15s|%-15.15s|",
char_name.c_str(), tmBan.tm_year % 100, tmBan.tm_mon + 1, tmBan.tm_mday, tmBan.tm_hour, tmBan.tm_min,
banFields[2].Get<std::string>().c_str(), banFields[3].Get<std::string>().c_str());
char_name, tmBan.tm_year % 100, tmBan.tm_mon + 1, tmBan.tm_mday, tmBan.tm_hour, tmBan.tm_min,
banFields[2].Get<std::string>(), banFields[3].Get<std::string>());
}
else
{
tm tmUnban = Acore::Time::TimeBreakdown(banFields[1].Get<uint32>());
handler->PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d|%02d-%02d-%02d %02d:%02d|%-15.15s|%-15.15s|",
char_name.c_str(), tmBan.tm_year % 100, tmBan.tm_mon + 1, tmBan.tm_mday, tmBan.tm_hour, tmBan.tm_min,
char_name, tmBan.tm_year % 100, tmBan.tm_mon + 1, tmBan.tm_mday, tmBan.tm_hour, tmBan.tm_min,
tmUnban.tm_year % 100, tmUnban.tm_mon + 1, tmUnban.tm_mday, tmUnban.tm_hour, tmUnban.tm_min,
banFields[2].Get<std::string>().c_str(), banFields[3].Get<std::string>().c_str());
banFields[2].Get<std::string>(), banFields[3].Get<std::string>());
}
} while (banInfo->NextRow());
}
@@ -621,7 +621,7 @@ public:
do
{
Field* fields = result->Fetch();
handler->PSendSysMessage("%s", fields[0].Get<std::string>().c_str());
handler->PSendSysMessage("%s", fields[0].Get<std::string>());
} while (result->NextRow());
}
// Console wide output
@@ -638,16 +638,16 @@ public:
if (fields[1].Get<uint32>() == fields[2].Get<uint32>())
{
handler->PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d| permanent |%-15.15s|%-15.15s|",
fields[0].Get<std::string>().c_str(), tmBan.tm_year % 100, tmBan.tm_mon + 1, tmBan.tm_mday, tmBan.tm_hour, tmBan.tm_min,
fields[3].Get<std::string>().c_str(), fields[4].Get<std::string>().c_str());
fields[0].Get<std::string>(), tmBan.tm_year % 100, tmBan.tm_mon + 1, tmBan.tm_mday, tmBan.tm_hour, tmBan.tm_min,
fields[3].Get<std::string>(), fields[4].Get<std::string>());
}
else
{
tm tmUnban = Acore::Time::TimeBreakdown(fields[2].Get<uint32>());
handler->PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d|%02d-%02d-%02d %02d:%02d|%-15.15s|%-15.15s|",
fields[0].Get<std::string>().c_str(), tmBan.tm_year % 100, tmBan.tm_mon + 1, tmBan.tm_mday, tmBan.tm_hour, tmBan.tm_min,
fields[0].Get<std::string>(), tmBan.tm_year % 100, tmBan.tm_mon + 1, tmBan.tm_mday, tmBan.tm_hour, tmBan.tm_min,
tmUnban.tm_year % 100, tmUnban.tm_mon + 1, tmUnban.tm_mday, tmUnban.tm_hour, tmUnban.tm_min,
fields[3].Get<std::string>().c_str(), fields[4].Get<std::string>().c_str());
fields[3].Get<std::string>(), fields[4].Get<std::string>());
}
} while (result->NextRow());
@@ -714,7 +714,7 @@ public:
case BAN_ACCOUNT:
if (!Utf8ToUpperOnlyLatin(nameOrIP))
{
handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, nameOrIP.c_str());
handler->SendErrorMessage(LANG_ACCOUNT_NOT_EXIST, nameOrIP);
return false;
}
break;
@@ -735,21 +735,21 @@ public:
{
case BAN_ACCOUNT:
if (sBan->RemoveBanAccount(nameOrIP))
handler->PSendSysMessage(LANG_UNBAN_UNBANNED, nameOrIP.c_str());
handler->PSendSysMessage(LANG_UNBAN_UNBANNED, nameOrIP);
else
handler->PSendSysMessage(LANG_UNBAN_ERROR, nameOrIP.c_str());
handler->PSendSysMessage(LANG_UNBAN_ERROR, nameOrIP);
break;
case BAN_CHARACTER:
if (sBan->RemoveBanAccountByPlayerName(nameOrIP))
handler->PSendSysMessage(LANG_UNBAN_UNBANNED, nameOrIP.c_str());
handler->PSendSysMessage(LANG_UNBAN_UNBANNED, nameOrIP);
else
handler->PSendSysMessage(LANG_UNBAN_ERROR, nameOrIP.c_str());
handler->PSendSysMessage(LANG_UNBAN_ERROR, nameOrIP);
break;
case BAN_IP:
if (sBan->RemoveBanIP(nameOrIP))
handler->PSendSysMessage(LANG_UNBAN_UNBANNED, nameOrIP.c_str());
handler->PSendSysMessage(LANG_UNBAN_UNBANNED, nameOrIP);
else
handler->PSendSysMessage(LANG_UNBAN_ERROR, nameOrIP.c_str());
handler->PSendSysMessage(LANG_UNBAN_ERROR, nameOrIP);
break;
default:
break;