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

Incorporate CIRCSock::ForwardRaw353() into CClient::PutClient()

Browse Source
This commit is contained in:
J-P Nurmi
2015-09-12 18:55:41 +02:00
parent 69f1138052
commit f4c22aff6c
4 changed files with 47 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/IRCSock.cpp
View File

@@ -871,10 +871,7 @@ bool CIRCSock::OnNumericMessage(CNumericMessage& Message) {
}
}
ForwardRaw353(Message);
// We forwarded it already, so return
return true;
break;
}
case 366: { // end of names list
// :irc.server.com 366 nick #chan :End of /NAMES list.
@@ -1337,49 +1334,6 @@ CString CIRCSock::GetISupport(const CString& sKey, const CString& sDefault) cons
}
}
void CIRCSock::ForwardRaw353(const CMessage& Message) const {
const vector<CClient*>& vClients = m_pNetwork->GetClients();
for (CClient* pClient : vClients) {
ForwardRaw353(Message, pClient);
}
}
void CIRCSock::ForwardRaw353(const CMessage& Message, CClient* pClient) const {
if ((!m_bNamesx || pClient->HasNamesx()) && (!m_bUHNames || pClient->HasUHNames())) {
// Client and server have both the same UHNames and Namesx stuff enabled
m_pNetwork->PutUser(Message, pClient);
} else {
CString sNicks = Message.GetParam(3);
VCString vsNicks;
sNicks.Split(" ", vsNicks, false);
// This loop runs once for every nick on the channel
for (CString& sNick : vsNicks) {
if (sNick.empty())
break;
if (m_bNamesx && !pClient->HasNamesx() && IsPermChar(sNick[0])) {
// Server has, client doesn't have NAMESX, so we just use the first perm char
size_t pos = sNick.find_first_not_of(GetPerms());
if (pos >= 2 && pos != CString::npos) {
sNick = sNick[0] + sNick.substr(pos);
}
}
if (m_bUHNames && !pClient->HasUHNames()) {
// Server has, client hasnt UHNAMES,
// so we strip away ident and host.
sNick = sNick.Token(0, false, "!");
}
}
CMessage NamesMsg(Message);
NamesMsg.SetParam(3, sNicks);
m_pNetwork->PutUser(NamesMsg, pClient);
}
}
void CIRCSock::SendAltNick(const CString& sBadNick) {
const CString& sLastNick = m_Nick.GetNick();