Fixed some issues with setting op/voice status

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@36 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
prozacx
2005-03-10 03:46:02 +00:00
parent 7819e0a1f5
commit b93ad89590
2 changed files with 31 additions and 7 deletions
+25 -7
View File
@@ -6,6 +6,8 @@
void CChan::Reset() {
m_bWhoDone = false;
m_bIsOn = false;
m_bIsOp = false;
m_bIsVoice = false;
m_uOpCount = 0;
m_uVoiceCount = 0;
m_uModes = 0;
@@ -182,9 +184,17 @@ bool CChan::AddNick(const string& sNick) {
if ((bIsOp) && (!pNick->IsOp())) {
IncOpCount();
pNick->SetOp(true);
if (strcasecmp(pNick->GetNick().c_str(), m_pUser->GetCurNick().c_str()) == 0) {
SetOpped(true);
}
} else if ((bIsVoice) && (!pNick->IsVoice())) {
IncVoiceCount();
pNick->SetVoice(true);
if (strcasecmp(pNick->GetNick().c_str(), m_pUser->GetCurNick().c_str()) == 0) {
SetVoiced(true);
}
}
m_msNicks[pNick->GetNick()] = pNick;
@@ -240,17 +250,21 @@ void CChan::OnOp(const string& sOpNick, const string& sNick, bool bOpped) {
if (pNick) {
bool bNoChange = (pNick->IsOp() == bOpped);
#ifdef _MODULES
CNick* pOpNick = FindNick(sOpNick);
CNick* pOpNick = FindNick(sOpNick);
if (pOpNick) {
if (bOpped) {
m_pUser->GetModules().OnOp(*pOpNick, *pNick, *this, bNoChange);
} else {
m_pUser->GetModules().OnDeop(*pOpNick, *pNick, *this, bNoChange);
if (pOpNick) {
if (bOpped) {
m_pUser->GetModules().OnOp(*pOpNick, *pNick, *this, bNoChange);
} else {
m_pUser->GetModules().OnDeop(*pOpNick, *pNick, *this, bNoChange);
}
}
}
#endif
if (strcasecmp(sNick.c_str(), m_pUser->GetCurNick().c_str()) == 0) {
SetOpped(bOpped);
}
if (bNoChange) {
// If no change, return
return;
@@ -279,6 +293,10 @@ void CChan::OnVoice(const string& sOpNick, const string& sNick, bool bVoiced) {
}
#endif
if (strcasecmp(sNick.c_str(), m_pUser->GetCurNick().c_str()) == 0) {
SetVoiced(bVoiced);
}
if (bNoChange) {
// If no change, return
return;