iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make CClient::PutClient() handle multi-prefix

Browse Source
This commit is contained in:
J-P Nurmi
2015-09-12 19:24:29 +02:00
parent f7802209ae
commit dce6d4f0ea
2 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Client.cpp
View File

@@ -764,7 +764,20 @@ bool CClient::PutClient(const CMessage& Message)
if (Msg.GetType() == CMessage::Type::Numeric) {
unsigned int uCode = static_cast<CNumericMessage&>(Msg).GetCode();
if (uCode == 353) { // RPL_NAMES
if (uCode == 352) { // RPL_WHOREPLY
if (!m_bNamesx && pIRCSock->HasNamesx()) {
// The server has NAMESX, but the client doesn't, so we need to remove extra prefixes
CString sNick = Msg.GetParam(6);
if (sNick.size() > 1 && pIRCSock->IsPermChar(sNick[1])) {
CString sNewNick = sNick;
size_t pos = sNick.find_first_not_of(pIRCSock->GetPerms());
if (pos >= 2 && pos != CString::npos) {
sNewNick = sNick[0] + sNick.substr(pos);
}
Msg.SetParam(6, sNewNick);
}
}
} else if (uCode == 353) { // RPL_NAMES
if ((!m_bNamesx && pIRCSock->HasNamesx()) || (!m_bUHNames && pIRCSock->HasUHNames())) {
// The server has either UHNAMES or NAMESX, but the client is missing either or both
CString sNicks = Msg.GetParam(3);