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

Merge CChan+PrivAction, CChan+PrivCTCP, CChan+PrivNotice

Browse Source 
OnUserAction(), OnUserCTCP(), and OnUserNotice() don't separate private
private and channel messages. A module could even redirect a message by
modifying its target, so technically, if they were two distinct types,
the type of a message could change on the way.

The original reason for the separation was that at some point during
CMessage development, GetChan() didn't exist in CPrivXxx, but only in
CChanXxx message types. To achieve cleaner implementation, the getter
was later promoted to CMessage and made return nullptr for non-channel
specific messages. From this point of view, the separation is also no
longer necessary since the CPrivXxx and CChanXxx types are API-wise
identical with each other.
This commit is contained in:
J-P Nurmi
2015-08-16 17:11:19 +02:00
parent 8f655ac179
commit 3976651c35
5 changed files with 64 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/IRCSock.cpp
View File

@@ -917,22 +917,22 @@ bool CIRCSock::OnCTCPReply(CNick& Nick, CString& sMessage) {
}
bool CIRCSock::OnPrivCTCP(CMessage& Message) {
CPrivCTCP& PrivCTCP = static_cast<CPrivCTCP&>(Message);
CCTCPMessage& CTCP = static_cast<CCTCPMessage&>(Message);
bool bResult = false;
IRCSOCKMODULECALL(OnPrivCTCPMessage(PrivCTCP), &bResult);
IRCSOCKMODULECALL(OnPrivCTCPMessage(CTCP), &bResult);
if (bResult) return true;
if (PrivCTCP.GetText().StartsWith("ACTION ")) {
if (CTCP.GetText().StartsWith("ACTION ")) {
bResult = false;
CPrivAction& PrivAction = static_cast<CPrivAction&>(Message);
IRCSOCKMODULECALL(OnPrivActionMessage(PrivAction), &bResult);
CActionMessage& Action = static_cast<CActionMessage&>(Message);
IRCSOCKMODULECALL(OnPrivActionMessage(Action), &bResult);
if (bResult) return true;
if (!m_pNetwork->IsUserOnline() || !m_pNetwork->GetUser()->AutoClearQueryBuffer()) {
const CNick& Nick = PrivAction.GetNick();
const CNick& Nick = Action.GetNick();
CQuery* pQuery = m_pNetwork->AddQuery(Nick.GetNick());
if (pQuery) {
pQuery->AddBuffer(":" + _NAMEDFMT(Nick.GetNickMask()) + " PRIVMSG {target} :\001ACTION {text}\001", PrivAction.GetText(), &PrivAction.GetTime(), PrivAction.GetTags());
pQuery->AddBuffer(":" + _NAMEDFMT(Nick.GetNickMask()) + " PRIVMSG {target} :\001ACTION {text}\001", Action.GetText(), &Action.GetTime(), Action.GetTags());
}
}
}
@@ -988,14 +988,14 @@ bool CIRCSock::OnGeneralCTCP(CMessage& Message) {
}
bool CIRCSock::OnPrivNotice(CMessage& Message) {
CPrivNotice& PrivNotice = static_cast<CPrivNotice&>(Message);
CNoticeMessage& Notice = static_cast<CNoticeMessage&>(Message);
bool bResult = false;
IRCSOCKMODULECALL(OnPrivNoticeMessage(PrivNotice), &bResult);
IRCSOCKMODULECALL(OnPrivNoticeMessage(Notice), &bResult);
if (bResult) return true;
if (!m_pNetwork->IsUserOnline()) {
// If the user is detached, add to the buffer
m_pNetwork->AddNoticeBuffer(":" + _NAMEDFMT(PrivNotice.GetNick().GetNickMask()) + " NOTICE {target} :{text}", PrivNotice.GetText());
m_pNetwork->AddNoticeBuffer(":" + _NAMEDFMT(Notice.GetNick().GetNickMask()) + " NOTICE {target} :{text}", Notice.GetText());
}
return false;
@@ -1039,24 +1039,24 @@ static void FixupChanNick(CNick& Nick, CChan* pChan) {
}
bool CIRCSock::OnChanCTCP(CMessage& Message) {
CChanCTCP& ChanCTCP = static_cast<CChanCTCP&>(Message);
CChan* pChan = m_pNetwork->FindChan(ChanCTCP.GetParam(0));
CCTCPMessage& CTCP = static_cast<CCTCPMessage&>(Message);
CChan* pChan = m_pNetwork->FindChan(CTCP.GetParam(0));
if (pChan) {
FixupChanNick(Message.GetNick(), pChan);
bool bResult = false;
ChanCTCP.SetChan(pChan);
IRCSOCKMODULECALL(OnChanCTCPMessage(ChanCTCP), &bResult);
CTCP.SetChan(pChan);
IRCSOCKMODULECALL(OnChanCTCPMessage(CTCP), &bResult);
if (bResult) return true;
// Record a /me
if (ChanCTCP.GetText().StartsWith("ACTION ")) {
if (CTCP.GetText().StartsWith("ACTION ")) {
bResult = false;
CChanAction& ChanAction = static_cast<CChanAction&>(Message);
IRCSOCKMODULECALL(OnChanActionMessage(ChanAction), &bResult);
CActionMessage& Action = static_cast<CActionMessage&>(Message);
IRCSOCKMODULECALL(OnChanActionMessage(Action), &bResult);
if (bResult) return true;
if (!pChan->AutoClearChanBuffer() || !m_pNetwork->IsUserOnline() || pChan->IsDetached()) {
pChan->AddBuffer(":" + _NAMEDFMT(Message.GetNick().GetNickMask()) + " PRIVMSG " + _NAMEDFMT(pChan->GetName()) + " :\001ACTION {text}\001", ChanAction.GetText(), &ChanAction.GetTime(), ChanAction.GetTags());
pChan->AddBuffer(":" + _NAMEDFMT(Message.GetNick().GetNickMask()) + " PRIVMSG " + _NAMEDFMT(pChan->GetName()) + " :\001ACTION {text}\001", Action.GetText(), &Action.GetTime(), Action.GetTags());
}
}
}
@@ -1068,18 +1068,18 @@ bool CIRCSock::OnChanCTCP(CMessage& Message) {
}
bool CIRCSock::OnChanNotice(CMessage& Message) {
CChanNotice& ChanNotice = static_cast<CChanNotice&>(Message);
CChan* pChan = m_pNetwork->FindChan(ChanNotice.GetParam(0));
CNoticeMessage& Notice = static_cast<CNoticeMessage&>(Message);
CChan* pChan = m_pNetwork->FindChan(Notice.GetParam(0));
if (pChan) {
FixupChanNick(Message.GetNick(), pChan);
bool bResult = false;
ChanNotice.SetChan(pChan);
IRCSOCKMODULECALL(OnChanNoticeMessage(ChanNotice), &bResult);
Notice.SetChan(pChan);
IRCSOCKMODULECALL(OnChanNoticeMessage(Notice), &bResult);
if (bResult) return true;
if (!pChan->AutoClearChanBuffer() || !m_pNetwork->IsUserOnline() || pChan->IsDetached()) {
pChan->AddBuffer(":" + _NAMEDFMT(ChanNotice.GetNick().GetNickMask()) + " NOTICE " + _NAMEDFMT(pChan->GetName()) + " :{text}", ChanNotice.GetText(), &ChanNotice.GetTime(), ChanNotice.GetTags());
pChan->AddBuffer(":" + _NAMEDFMT(Notice.GetNick().GetNickMask()) + " NOTICE " + _NAMEDFMT(pChan->GetName()) + " :{text}", Notice.GetText(), &Notice.GetTime(), Notice.GetTags());
}
}