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

Added bForce to KeepNick() to be used when your original nick quits or changes nicks.. no need to wait for pending

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@374 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
prozacx
2005-05-27 23:19:39 +00:00
parent 47e9cbd68a
commit 34321ba4d7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRCSock.cpp
+4 -4
View File
@@ -386,7 +386,7 @@ void CIRCSock::ReadLine(const CString& sData) {
if (sNick.CaseCmp(GetNick()) == 0) {
SetNick(sNewNick);
} else if (sNick.CaseCmp(m_pUser->GetNick()) == 0) {
KeepNick();
KeepNick(true);
}
VOIDMODULECALL(OnNick(sNickMask, sNewNick, vFoundChans));
@@ -421,7 +421,7 @@ void CIRCSock::ReadLine(const CString& sData) {
}
if (Nick.GetNick().CaseCmp(m_pUser->GetNick()) == 0) {
KeepNick();
KeepNick(true);
}
VOIDMODULECALL(OnQuit(Nick, sMessage, vFoundChans));
@@ -602,11 +602,11 @@ void CIRCSock::ReadLine(const CString& sData) {
PutUser(sLine);
}
void CIRCSock::KeepNick() {
void CIRCSock::KeepNick(bool bForce) {
const CString& sConfNick = m_pUser->GetNick();
CString sAwayNick = CNick::Concat(sConfNick, m_pUser->GetAwaySuffix(), GetMaxNickLen());
if (m_bAuthed && m_bKeepNick && !IsOrigNickPending() && m_pUser->GetKeepNick() && GetNick().CaseCmp(sConfNick) != 0 && GetNick().CaseCmp(sAwayNick) != 0) {
if (m_bAuthed && m_bKeepNick && (!IsOrigNickPending() || bForce) && m_pUser->GetKeepNick() && GetNick().CaseCmp(sConfNick) != 0 && GetNick().CaseCmp(sAwayNick) != 0) {
PutServ("NICK " + sConfNick);
SetOrigNickPending(true);
}
IRCSock.h
+1 -1
View File
@@ -40,7 +40,7 @@ public:
virtual void SockError(int iErrno);
virtual void Timeout();
void KeepNick();
void KeepNick(bool bForce = false);
bool IsUserAttached() { return (m_pUserSock != NULL); }
void UserConnected(CUserSock* pUserSock);
void UserDisconnected();