iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-01 11:02:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

CIRCSock::OnPartMessage() handler

Browse Source
This commit is contained in:
J-P Nurmi
2015-09-05 01:52:24 +02:00
parent a2110da245
commit 9f9304a253
2 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/IRCSock.cpp
View File

@@ -525,30 +525,7 @@ void CIRCSock::ReadLine(const CString& sData) {
}
} else if (Message.GetType() == CMessage::Type::Part) {
CPartMessage& PartMsg = static_cast<CPartMessage&>(Message);
CString sChan = PartMsg.GetParam(0);
CChan* pChan = m_pNetwork->FindChan(sChan);
bool bDetached = false;
if (pChan) {
pChan->RemNick(Nick.GetNick());
PartMsg.SetChan(pChan);
IRCSOCKMODULECALL(OnPartMessage(PartMsg), NOTHING);
if (pChan->IsDetached())
bDetached = true;
}
if (Nick.NickEquals(GetNick())) {
m_pNetwork->DelChan(sChan);
}
/*
* We use this boolean because
* m_pNetwork->DelChan() will delete this channel
* and thus we would dereference an
* already-freed pointer!
*/
if (bDetached) {
if (OnPartMessage(PartMsg)) {
return;
}
} else if (Message.GetType() == CMessage::Type::Mode) {
@@ -1070,6 +1047,34 @@ bool CIRCSock::OnNickMessage(CNickMessage& Message) {
return !bIsVisible;
}
bool CIRCSock::OnPartMessage(CPartMessage& Message) {
const CNick& Nick = Message.GetNick();
CString sChan = Message.GetTarget();
CChan* pChan = m_pNetwork->FindChan(sChan);
bool bDetached = false;
if (pChan) {
pChan->RemNick(Nick.GetNick());
Message.SetChan(pChan);
IRCSOCKMODULECALL(OnPartMessage(Message), NOTHING);
if (pChan->IsDetached())
bDetached = true;
}
if (Nick.NickEquals(GetNick())) {
m_pNetwork->DelChan(sChan);
}
/*
* We use this boolean because
* m_pNetwork->DelChan() will delete this channel
* and thus we would dereference an
* already-freed pointer!
*/
return bDetached;
}
bool CIRCSock::OnQuitMessage(CQuitMessage& Message) {
const CNick& Nick = Message.GetNick();
bool bIsVisible = false;