diff --git a/include/znc/Modules.h b/include/znc/Modules.h index 8b9faae6..6ffa9485 100644 --- a/include/znc/Modules.h +++ b/include/znc/Modules.h @@ -481,19 +481,19 @@ public: * @see CIRCSock::GetModeType() for converting uMode into a mode (e.g. * 'o' for op). */ - virtual void OnChanPermission(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange); + virtual void OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange); virtual void OnChanPermission(const CNick& OpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange); /** Called when a nick is opped on a channel */ - virtual void OnOp(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); virtual void OnOp(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange); /** Called when a nick is deopped on a channel */ - virtual void OnDeop(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); virtual void OnDeop(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange); /** Called when a nick is voiced on a channel */ - virtual void OnVoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); virtual void OnVoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange); /** Called when a nick is devoiced on a channel */ - virtual void OnDevoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); virtual void OnDevoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange); /** Called on an individual channel mode change. * @param pOpNick The nick who changes the channel mode, or NULL if set by server. @@ -503,7 +503,7 @@ public: * @param bAdded True if this mode is added ("+"), else false. * @param bNoChange True if this mode was already effective before. */ - virtual void OnMode(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange); + virtual void OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange); virtual void OnMode(const CNick& OpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange); /** Called on any channel mode change. This is called before the more * detailed mode hooks like e.g. OnOp() and OnMode(). @@ -512,7 +512,7 @@ public: * @param sModes The raw mode change, e.g. "+s-io". * @param sArgs All arguments to the mode change from sModes. */ - virtual void OnRawMode(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs); + virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs); virtual void OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs); /** Called on any raw IRC line received from the IRC server. @@ -1087,19 +1087,19 @@ public: bool OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName); bool OnBroadcast(CString& sMessage); - bool OnChanPermission(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange); + bool OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange); bool OnChanPermission(const CNick& OpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange); - bool OnOp(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + bool OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); bool OnOp(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - bool OnDeop(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + bool OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); bool OnDeop(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - bool OnVoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + bool OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); bool OnVoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - bool OnDevoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + bool OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); bool OnDevoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - bool OnRawMode(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs); + bool OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs); bool OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs); - bool OnMode(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange); + bool OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange); bool OnMode(const CNick& OpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange); bool OnRaw(CString& sLine); diff --git a/modules/autoop.cpp b/modules/autoop.cpp index a57bc211..e71ac785 100644 --- a/modules/autoop.cpp +++ b/modules/autoop.cpp @@ -210,7 +210,7 @@ public: return HALTCORE; } - virtual void OnOp(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { + virtual void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { if (Nick.GetNick() == m_pNetwork->GetIRCNick().GetNick()) { const map& msNicks = Channel.GetNicks(); diff --git a/modules/buffextras.cpp b/modules/buffextras.cpp index 3e1ac2a8..7ab81661 100644 --- a/modules/buffextras.cpp +++ b/modules/buffextras.cpp @@ -33,7 +33,7 @@ public: Channel.AddBuffer(":" + GetModNick() + "!" + GetModName() + "@znc.in PRIVMSG " + _NAMEDFMT(Channel.GetName()) + " :{text}", sMessage); } - virtual void OnRawMode(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) { + virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) { const CString sNickMask = pOpNick ? pOpNick->GetNickMask() : "Server"; AddBuffer(Channel, sNickMask + " set mode: " + sModes + " " + sArgs); } diff --git a/modules/chansaver.cpp b/modules/chansaver.cpp index 4979c396..4219b513 100644 --- a/modules/chansaver.cpp +++ b/modules/chansaver.cpp @@ -54,7 +54,7 @@ public: return CONTINUE; } - virtual void OnMode(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) { + virtual void OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) { // This is called when we join (ZNC requests the channel modes // on join) *and* when someone changes the channel keys. // We ignore channel key "*" because of some broken nets. diff --git a/modules/log.cpp b/modules/log.cpp index 260b5770..31e80ec8 100644 --- a/modules/log.cpp +++ b/modules/log.cpp @@ -40,7 +40,7 @@ public: virtual void OnIRCDisconnected(); virtual EModRet OnBroadcast(CString& sMessage); - virtual void OnRawMode(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs); + virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs); virtual void OnKick(const CNick& OpNick, const CString& sKickedNick, CChan& Channel, const CString& sMessage); virtual void OnQuit(const CNick& Nick, const CString& sMessage, const vector& vChans); virtual void OnJoin(const CNick& Nick, CChan& Channel); @@ -195,7 +195,7 @@ CModule::EModRet CLogMod::OnBroadcast(CString& sMessage) return CONTINUE; } -void CLogMod::OnRawMode(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) +void CLogMod::OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) { const CString sNick = pOpNick ? pOpNick->GetNick() : "Server"; PutLog("*** " + sNick + " sets mode: " + sModes + " " + sArgs, Channel); diff --git a/modules/modperl/functions.in b/modules/modperl/functions.in index 8573e71e..b0a4304e 100644 --- a/modules/modperl/functions.in +++ b/modules/modperl/functions.in @@ -13,13 +13,13 @@ EModRet OnIRCConnecting(CIRCSock *pIRCSock) void OnIRCConnectionError(CIRCSock *pIRCSock) EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName) EModRet OnBroadcast(CString& sMessage) -void OnChanPermission(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) -void OnOp(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) -void OnDeop(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) -void OnVoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) -void OnDevoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) -void OnMode(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) -void OnRawMode(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) +void OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) +void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) +void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) +void OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) +void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) +void OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) +void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) EModRet OnRaw(CString& sLine) EModRet OnStatusCommand(CString& sCommand) void OnModCommand(const CString& sCommand) diff --git a/modules/modperl/module.h b/modules/modperl/module.h index 765804c2..c38f2b83 100644 --- a/modules/modperl/module.h +++ b/modules/modperl/module.h @@ -53,13 +53,13 @@ public: virtual void OnIRCConnectionError(CIRCSock *pIRCSock); virtual EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName); virtual EModRet OnBroadcast(CString& sMessage); - virtual void OnChanPermission(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange); - virtual void OnOp(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnDeop(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnVoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnDevoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnMode(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange); - virtual void OnRawMode(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs); + virtual void OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange); + virtual void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange); + virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs); virtual EModRet OnRaw(CString& sLine); virtual EModRet OnStatusCommand(CString& sCommand); virtual void OnModCommand(const CString& sCommand); diff --git a/modules/modperl/startup.pl b/modules/modperl/startup.pl index 14be159e..fa7a8109 100644 --- a/modules/modperl/startup.pl +++ b/modules/modperl/startup.pl @@ -374,6 +374,15 @@ sub OnDeleteNetwork {} sub OnSendToClient {} sub OnSendToIRC {} +# In Perl "undefined" is allowed value, so perl modules may continue using OnMode and not OnMode2 +sub OnChanPermission2 { my $self = shift; $self->OnChanPermission(@_) } +sub OnOp2 { my $self = shift; $self->OnOp(@_) } +sub OnDeop2 { my $self = shift; $self->OnDeop(@_) } +sub OnVoice2 { my $self = shift; $self->OnVoice(@_) } +sub OnDevoice2 { my $self = shift; $self->OnDevoice(@_) } +sub OnMode2 { my $self = shift; $self->OnMode(@_) } +sub OnRawMode2 { my $self = shift; $self->OnRawMode(@_) } + # Functions of CModule will be usable from perl modules. our $AUTOLOAD; diff --git a/modules/modpython/functions.in b/modules/modpython/functions.in index 5fdf3586..050937d8 100644 --- a/modules/modpython/functions.in +++ b/modules/modpython/functions.in @@ -13,13 +13,13 @@ EModRet OnIRCConnecting(CIRCSock *pIRCSock) void OnIRCConnectionError(CIRCSock *pIRCSock) EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName) EModRet OnBroadcast(CString& sMessage) -void OnChanPermission(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) -void OnOp(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) -void OnDeop(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) -void OnVoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) -void OnDevoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) -void OnMode(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) -void OnRawMode(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) +void OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) +void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) +void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) +void OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) +void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) +void OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) +void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) EModRet OnRaw(CString& sLine) EModRet OnStatusCommand(CString& sCommand) void OnModCommand(const CString& sCommand) diff --git a/modules/modpython/module.h b/modules/modpython/module.h index d246512e..10dc07af 100644 --- a/modules/modpython/module.h +++ b/modules/modpython/module.h @@ -69,13 +69,13 @@ public: virtual void OnIRCConnectionError(CIRCSock *pIRCSock); virtual EModRet OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName); virtual EModRet OnBroadcast(CString& sMessage); - virtual void OnChanPermission(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange); - virtual void OnOp(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnDeop(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnVoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnDevoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); - virtual void OnMode(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange); - virtual void OnRawMode(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs); + virtual void OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange); + virtual void OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange); + virtual void OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange); + virtual void OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs); virtual EModRet OnRaw(CString& sLine); virtual EModRet OnStatusCommand(CString& sCommand); virtual void OnModCommand(const CString& sCommand); diff --git a/modules/modpython/znc.py b/modules/modpython/znc.py index b92a9c0d..fc4211a5 100644 --- a/modules/modpython/znc.py +++ b/modules/modpython/znc.py @@ -429,6 +429,29 @@ class Module: def OnGetAvailableMods(self, ssMods, eType): pass + # In python None is allowed value, so python modules may continue using OnMode and not OnMode2 + def OnChanPermission2(self, OpNick, Nick, Channel, uMode, bAdded, bNoChange): + return self.OnChanPermission(OpNick, Nick, Channel, uMode, bAdded, bNoChange) + + def OnOp2(self, OpNick, Nick, Channel, bNoChange): + return self.OnOp(OpNick, Nick, Channel, bNoChange) + + def OnDeop2(self, OpNick, Nick, Channel, bNoChange): + return self.OnDeop(OpNick, Nick, Channel, bNoChange) + + def OnVoice2(self, OpNick, Nick, Channel, bNoChange): + return self.OnVoice(OpNick, Nick, Channel, bNoChange) + + def OnDevoice2(self, OpNick, Nick, Channel, bNoChange): + return self.OnDevoice(OpNick, Nick, Channel, bNoChange) + + def OnMode2(self, OpNick, Channel, uMode, sArg, bAdded, bNoChange): + return self.OnMode(OpNick, Channel, uMode, sArg, bAdded, bNoChange) + + def OnRawMode2(self, OpNick, Channel, sModes, sArgs): + return self.OnRawMode(OpNick, Channel, sModes, sArgs) + + def make_inherit(cl, parent, attr): def make_caller(parent, name, attr): return lambda self, *a: parent.__dict__[name](self.__dict__[attr], *a) diff --git a/modules/q.cpp b/modules/q.cpp index 6d993356..05a1988c 100644 --- a/modules/q.cpp +++ b/modules/q.cpp @@ -243,12 +243,12 @@ public: HandleNeed(Channel, "ov"); } - virtual void OnDeop(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { + virtual void OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { if (m_bRequestPerms && IsSelf(Nick) && (!pOpNick || !IsSelf(*pOpNick))) HandleNeed(Channel, "o"); } - virtual void OnDevoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { + virtual void OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { if (m_bRequestPerms && IsSelf(Nick) && (!pOpNick || !IsSelf(*pOpNick))) HandleNeed(Channel, "v"); } diff --git a/src/Chan.cpp b/src/Chan.cpp index f7946e0a..557f0b17 100644 --- a/src/Chan.cpp +++ b/src/Chan.cpp @@ -263,7 +263,7 @@ void CChan::ModeChange(const CString& sModes, const CNick* pOpNick) { pOpNick = OpNick; } - NETWORKMODULECALL(OnRawMode(pOpNick, *this, sModeArg, sArgs), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING); + NETWORKMODULECALL(OnRawMode2(pOpNick, *this, sModeArg, sArgs), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING); for (unsigned int a = 0; a < sModeArg.size(); a++) { const unsigned char& uMode = sModeArg[a]; @@ -295,19 +295,19 @@ void CChan::ModeChange(const CString& sModes, const CNick* pOpNick) { } } - NETWORKMODULECALL(OnChanPermission(pOpNick, *pNick, *this, uMode, bAdd, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING); + NETWORKMODULECALL(OnChanPermission2(pOpNick, *pNick, *this, uMode, bAdd, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING); if (uMode == CChan::M_Op) { if (bAdd) { - NETWORKMODULECALL(OnOp(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING); + NETWORKMODULECALL(OnOp2(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING); } else { - NETWORKMODULECALL(OnDeop(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING); + NETWORKMODULECALL(OnDeop2(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING); } } else if (uMode == CChan::M_Voice) { if (bAdd) { - NETWORKMODULECALL(OnVoice(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING); + NETWORKMODULECALL(OnVoice2(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING); } else { - NETWORKMODULECALL(OnDevoice(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING); + NETWORKMODULECALL(OnDevoice2(pOpNick, *pNick, *this, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING); } } } @@ -342,7 +342,7 @@ void CChan::ModeChange(const CString& sModes, const CNick* pOpNick) { } else { bNoChange = !HasMode(uMode); } - NETWORKMODULECALL(OnMode(pOpNick, *this, uMode, sArg, bAdd, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING); + NETWORKMODULECALL(OnMode2(pOpNick, *this, uMode, sArg, bAdd, bNoChange), m_pNetwork->GetUser(), m_pNetwork, NULL, NOTHING); if (!bList) { (bAdd) ? AddMode(uMode, sArg) : RemMode(uMode); diff --git a/src/Modules.cpp b/src/Modules.cpp index 053e763b..4a695368 100644 --- a/src/Modules.cpp +++ b/src/Modules.cpp @@ -537,25 +537,25 @@ void CModule::OnIRCConnectionError(CIRCSock *IRCSock) {} CModule::EModRet CModule::OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent, CString& sRealName) { return CONTINUE; } CModule::EModRet CModule::OnBroadcast(CString& sMessage) { return CONTINUE; } -void CModule::OnChanPermission(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) { +void CModule::OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) { if (pOpNick) OnChanPermission(*pOpNick, Nick, Channel, uMode, bAdded, bNoChange); } -void CModule::OnOp(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { +void CModule::OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { if (pOpNick) OnOp(*pOpNick, Nick, Channel, bNoChange); } -void CModule::OnDeop(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { +void CModule::OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { if (pOpNick) OnDeop(*pOpNick, Nick, Channel, bNoChange); } -void CModule::OnVoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { +void CModule::OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { if (pOpNick) OnVoice(*pOpNick, Nick, Channel, bNoChange); } -void CModule::OnDevoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { +void CModule::OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { if (pOpNick) OnDevoice(*pOpNick, Nick, Channel, bNoChange); } -void CModule::OnRawMode(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) { +void CModule::OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) { if (pOpNick) OnRawMode(*pOpNick, Channel, sModes, sArgs); } -void CModule::OnMode(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) { +void CModule::OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) { if (pOpNick) OnMode(*pOpNick, Channel, uMode, sArg, bAdded, bNoChange); } @@ -743,19 +743,19 @@ bool CModules::OnIRCRegistration(CString& sPass, CString& sNick, CString& sIdent bool CModules::OnBroadcast(CString& sMessage) { MODHALTCHK(OnBroadcast(sMessage)); } bool CModules::OnIRCDisconnected() { MODUNLOADCHK(OnIRCDisconnected()); return false; } -bool CModules::OnChanPermission(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) { MODUNLOADCHK(OnChanPermission(pOpNick, Nick, Channel, uMode, bAdded, bNoChange)); return false; } +bool CModules::OnChanPermission2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) { MODUNLOADCHK(OnChanPermission2(pOpNick, Nick, Channel, uMode, bAdded, bNoChange)); return false; } bool CModules::OnChanPermission(const CNick& OpNick, const CNick& Nick, CChan& Channel, unsigned char uMode, bool bAdded, bool bNoChange) { MODUNLOADCHK(OnChanPermission(OpNick, Nick, Channel, uMode, bAdded, bNoChange)); return false; } -bool CModules::OnOp(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnOp(pOpNick, Nick, Channel, bNoChange)); return false; } +bool CModules::OnOp2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnOp2(pOpNick, Nick, Channel, bNoChange)); return false; } bool CModules::OnOp(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnOp(OpNick, Nick, Channel, bNoChange)); return false; } -bool CModules::OnDeop(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnDeop(pOpNick, Nick, Channel, bNoChange)); return false; } +bool CModules::OnDeop2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnDeop2(pOpNick, Nick, Channel, bNoChange)); return false; } bool CModules::OnDeop(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnDeop(OpNick, Nick, Channel, bNoChange)); return false; } -bool CModules::OnVoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnVoice(pOpNick, Nick, Channel, bNoChange)); return false; } +bool CModules::OnVoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnVoice2(pOpNick, Nick, Channel, bNoChange)); return false; } bool CModules::OnVoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnVoice(OpNick, Nick, Channel, bNoChange)); return false; } -bool CModules::OnDevoice(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnDevoice(pOpNick, Nick, Channel, bNoChange)); return false; } +bool CModules::OnDevoice2(const CNick* pOpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnDevoice2(pOpNick, Nick, Channel, bNoChange)); return false; } bool CModules::OnDevoice(const CNick& OpNick, const CNick& Nick, CChan& Channel, bool bNoChange) { MODUNLOADCHK(OnDevoice(OpNick, Nick, Channel, bNoChange)); return false; } -bool CModules::OnRawMode(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) { MODUNLOADCHK(OnRawMode(pOpNick, Channel, sModes, sArgs)); return false; } +bool CModules::OnRawMode2(const CNick* pOpNick, CChan& Channel, const CString& sModes, const CString& sArgs) { MODUNLOADCHK(OnRawMode2(pOpNick, Channel, sModes, sArgs)); return false; } bool CModules::OnRawMode(const CNick& OpNick, CChan& Channel, const CString& sModes, const CString& sArgs) { MODUNLOADCHK(OnRawMode(OpNick, Channel, sModes, sArgs)); return false; } -bool CModules::OnMode(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) { MODUNLOADCHK(OnMode(pOpNick, Channel, uMode, sArg, bAdded, bNoChange)); return false; } +bool CModules::OnMode2(const CNick* pOpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) { MODUNLOADCHK(OnMode2(pOpNick, Channel, uMode, sArg, bAdded, bNoChange)); return false; } bool CModules::OnMode(const CNick& OpNick, CChan& Channel, char uMode, const CString& sArg, bool bAdded, bool bNoChange) { MODUNLOADCHK(OnMode(OpNick, Channel, uMode, sArg, bAdded, bNoChange)); return false; } bool CModules::OnRaw(CString& sLine) { MODHALTCHK(OnRaw(sLine)); }