From 3dcb83778fcee90814c893303a470fe3c2e6863d Mon Sep 17 00:00:00 2001 From: 12pm <30786226+12pm@users.noreply.github.com> Date: Mon, 11 Mar 2019 14:48:45 +0100 Subject: [PATCH] Make name more descriptive --- src/engine/server/name_ban.cpp | 2 +- src/engine/server/name_ban.h | 7 +++---- src/engine/server/server.cpp | 16 ++++++++-------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/engine/server/name_ban.cpp b/src/engine/server/name_ban.cpp index cde8f52a5..cb914ccf1 100644 --- a/src/engine/server/name_ban.cpp +++ b/src/engine/server/name_ban.cpp @@ -15,7 +15,7 @@ CNameBan *IsNameBanned(const char *pName, CNameBan *pNameBans, int NumNameBans) { CNameBan *pBan = &pNameBans[i]; int Distance = str_utf32_dist_buffer(aSkeleton, SkeletonLength, pBan->m_aSkeleton, pBan->m_SkeletonLength, aBuffer, sizeof(aBuffer) / sizeof(aBuffer[0])); - if(Distance <= pBan->m_Distance || (pBan->m_Exact == 1 && str_utf8_find_nocase(pName, pBan->m_aName))) + if(Distance <= pBan->m_Distance || (pBan->m_IsSubstring == 1 && str_utf8_find_nocase(pName, pBan->m_aName))) { pResult = pBan; } diff --git a/src/engine/server/name_ban.h b/src/engine/server/name_ban.h index d7f704971..8dfa96d65 100644 --- a/src/engine/server/name_ban.h +++ b/src/engine/server/name_ban.h @@ -14,20 +14,19 @@ class CNameBan { public: CNameBan() {} - CNameBan(const char *pName, int Distance, int Exact, const char *pReason = "") : - m_Distance(Distance) + CNameBan(const char *pName, int Distance, int IsSubstring, const char *pReason = "") : + m_Distance(Distance), m_IsSubstring(IsSubstring) { str_copy(m_aName, pName, sizeof(m_aName)); m_SkeletonLength = str_utf8_to_skeleton(m_aName, m_aSkeleton, sizeof(m_aSkeleton) / sizeof(m_aSkeleton[0])); str_copy(m_aReason, pReason, sizeof(m_aReason)); - m_Exact = Exact; } char m_aName[MAX_NAME_LENGTH]; char m_aReason[MAX_NAMEBAN_REASON_LENGTH]; int m_aSkeleton[MAX_NAME_SKELETON_LENGTH]; int m_SkeletonLength; int m_Distance; - int m_Exact; + int m_IsSubstring; }; CNameBan *IsNameBanned(const char *pName, CNameBan *pNameBans, int NumNameBans); diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 911a363c6..38bb582ed 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -2391,23 +2391,23 @@ void CServer::ConNameBan(IConsole::IResult *pResult, void *pUser) const char *pName = pResult->GetString(0); const char *pReason = pResult->NumArguments() > 3 ? pResult->GetString(3) : ""; int Distance = pResult->NumArguments() > 1 ? pResult->GetInteger(1) : str_length(pName) / 3; - int Exact = pResult->NumArguments() > 2 ? pResult->GetInteger(2) : 0; + int IsSubstring = pResult->NumArguments() > 2 ? pResult->GetInteger(2) : 0; for(int i = 0; i < pThis->m_aNameBans.size(); i++) { CNameBan *pBan = &pThis->m_aNameBans[i]; if(str_comp(pBan->m_aName, pName) == 0) { - str_format(aBuf, sizeof(aBuf), "changed name='%s' distance=%d old_distance=%d exact=%d old_exact=%d reason='%s' old_reason='%s'", pName, Distance, pBan->m_Distance, Exact, pBan->m_Exact, pReason, pBan->m_aReason); + str_format(aBuf, sizeof(aBuf), "changed name='%s' distance=%d old_distance=%d is_substring=%d old_is_substring=%d reason='%s' old_reason='%s'", pName, Distance, pBan->m_Distance, IsSubstring, pBan->m_IsSubstring, pReason, pBan->m_aReason); pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "name_ban", aBuf); pBan->m_Distance = Distance; - pBan->m_Exact = Exact; + pBan->m_IsSubstring = IsSubstring; return; } } - pThis->m_aNameBans.add(CNameBan(pName, Distance, Exact, pReason)); - str_format(aBuf, sizeof(aBuf), "added name='%s' distance=%d exact=%d reason='%s'", pName, Distance, Exact, pReason); + pThis->m_aNameBans.add(CNameBan(pName, Distance, IsSubstring, pReason)); + str_format(aBuf, sizeof(aBuf), "added name='%s' distance=%d is_substring=%d reason='%s'", pName, Distance, IsSubstring, pReason); pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "name_ban", aBuf); } @@ -2422,7 +2422,7 @@ void CServer::ConNameUnban(IConsole::IResult *pResult, void *pUser) if(str_comp(pBan->m_aName, pName) == 0) { char aBuf[64]; - str_format(aBuf, sizeof(aBuf), "removed name='%s' distance=%d exact=%d reason='%s'", pBan->m_aName, pBan->m_Distance, pBan->m_Exact, pBan->m_aReason); + str_format(aBuf, sizeof(aBuf), "removed name='%s' distance=%d is_substring=%d reason='%s'", pBan->m_aName, pBan->m_Distance, pBan->m_IsSubstring, pBan->m_aReason); pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "name_ban", aBuf); pThis->m_aNameBans.remove_index(i); } @@ -2437,7 +2437,7 @@ void CServer::ConNameBans(IConsole::IResult *pResult, void *pUser) { CNameBan *pBan = &pThis->m_aNameBans[i]; char aBuf[64]; - str_format(aBuf, sizeof(aBuf), "name='%s' distance=%d exact=%d reason='%s'", pBan->m_aName, pBan->m_Distance, pBan->m_Exact, pBan->m_aReason); + str_format(aBuf, sizeof(aBuf), "name='%s' distance=%d is_substring=%d reason='%s'", pBan->m_aName, pBan->m_Distance, pBan->m_IsSubstring, pBan->m_aReason); pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "name_ban", aBuf); } } @@ -2832,7 +2832,7 @@ void CServer::RegisterCommands() Console()->Register("auth_remove", "s[ident]", CFGFLAG_SERVER|CFGFLAG_NONTEEHISTORIC, ConAuthRemove, this, "Remove a rcon key"); Console()->Register("auth_list", "", CFGFLAG_SERVER, ConAuthList, this, "List all rcon keys"); - Console()->Register("name_ban", "s[name] ?i[distance] ?i[exact] ?r[reason]", CFGFLAG_SERVER, ConNameBan, this, "Ban a certain nick name"); + Console()->Register("name_ban", "s[name] ?i[distance] ?i[is_substring] ?r[reason]", CFGFLAG_SERVER, ConNameBan, this, "Ban a certain nick name"); Console()->Register("name_unban", "s[name]", CFGFLAG_SERVER, ConNameUnban, this, "Unban a certain nick name"); Console()->Register("name_bans", "", CFGFLAG_SERVER, ConNameBans, this, "List all name bans");