adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-06 08:52:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle channel CTCP the same way we do for private CTCPs

Browse Source 
This patch doesn't actually change anything for private CTCPs, it's
only the indentation level that changes! (Well, and that this code gets
its own function...)


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1082 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2008-06-03 07:15:52 +00:00
parent e08cb72646
commit 2583b7e9ff
2 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRCSock.cpp
+31 -22
View File
@@ -786,35 +786,41 @@ bool CIRCSock::OnPrivCTCP(CNick& Nick, CString& sMessage) {
return true;
} else {
const MCString& mssCTCPReplies = m_pUser->GetCTCPReplies();
MCString::const_iterator it = mssCTCPReplies.find(sMessage.AsUpper());
CString sQuery = sMessage.Token(0).AsUpper();
bool bHaveReply = false;
CString sReply;
return OnGeneralCTCP(Nick, sMessage);
}
if (it == mssCTCPReplies.end()) {
it = mssCTCPReplies.find(sQuery);
}
return false;
}
if (it != mssCTCPReplies.end()) {
sReply = it->second;
bHaveReply = true;
}
bool CIRCSock::OnGeneralCTCP(CNick& Nick, CString& sMessage) {
const MCString& mssCTCPReplies = m_pUser->GetCTCPReplies();
MCString::const_iterator it = mssCTCPReplies.find(sMessage.AsUpper());
CString sQuery = sMessage.Token(0).AsUpper();
bool bHaveReply = false;
CString sReply;
if (!bHaveReply && !m_pUser->IsUserAttached()) {
if (sQuery == "VERSION") {
sReply = CZNC::GetTag();
} else if (sQuery == "PING") {
sReply = sMessage.Token(1, true);
}
}
if (it == mssCTCPReplies.end()) {
it = mssCTCPReplies.find(sQuery);
}
if (!sReply.empty()) {
PutIRC("NOTICE " + Nick.GetNick() + " :\001" + sQuery + " " + sReply + "\001");
return true;
if (it != mssCTCPReplies.end()) {
sReply = it->second;
bHaveReply = true;
}
if (!bHaveReply && !m_pUser->IsUserAttached()) {
if (sQuery == "VERSION") {
sReply = CZNC::GetTag();
} else if (sQuery == "PING") {
sReply = sMessage.Token(1, true);
}
}
if (!sReply.empty()) {
PutIRC("NOTICE " + Nick.GetNick() + " :\001" + sQuery + " " + sReply + "\001");
return true;
}
return false;
}
@@ -855,6 +861,9 @@ bool CIRCSock::OnChanCTCP(CNick& Nick, const CString& sChan, CString& sMessage)
MODULECALL(OnChanCTCP(Nick, *pChan, sMessage), m_pUser, NULL, return true);
}
if (OnGeneralCTCP(Nick, sMessage))
return true;
return (pChan && pChan->IsDetached());
}