adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-06 18:01:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Partyline: clean up when a force-joined user is deleted

Browse Source 
The old code didn't properly clean up after deleted users :(


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1263 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2008-10-27 19:21:08 +00:00
parent 94f6e2cf79
commit b312a64c9d
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/partyline.cpp
+11 -18
View File
@@ -122,24 +122,10 @@ public:
}
virtual EModRet OnDeleteUser(CUser& User) {
const CString& sNick = User.GetUserName();
CString sHost = User.GetVHost();
CUser* pTmp = m_pUser;
m_pUser = &User;
for (set<CPartylineChannel*>::iterator it = m_ssChannels.begin(); it != m_ssChannels.end(); it++) { // Loop through each chan
const CString& sChannel = (*it)->GetName();
const set<CString>& ssNicks = (*it)->GetNicks();
if (ssNicks.find(User.GetUserName()) != ssNicks.end()) { // If the user is on this chan
User.PutUser(":*" + GetModName() + "!znc@znc.in KICK " + sChannel + " " + sNick + " :User Deleted");
PutChan(ssNicks, ":*" + GetModName() + "!znc@znc.in KICK " + sChannel + " ?" + sNick + " :User Deleted", false);
}
PartUser(&User, *it, true, "User deleted");
}
m_pUser = pTmp;
return CONTINUE;
}
@@ -275,11 +261,16 @@ public:
return HALT;
}
void PartUser(CUser* pUser, CPartylineChannel* pChannel, bool bForce = false) {
void PartUser(CUser* pUser, CPartylineChannel* pChannel, bool bForce = false,
const CString& sMessage = "") {
if (!pChannel || !pChannel->IsInChannel(pUser->GetUserName())) {
return;
}
CString sMsg = sMessage;
if (!sMsg.empty())
sMsg = " :" + sMsg;
if (!pChannel->IsFixedChan(pUser->GetUserName()) || bForce) {
pChannel->DelNick(pUser->GetUserName());
pChannel->DelFixedNick(pUser->GetUserName());
@@ -291,8 +282,10 @@ public:
sHost = pUser->GetIRCNick().GetHost();
}
pUser->PutUser(":" + pUser->GetIRCNick().GetNickMask() + " PART " + pChannel->GetName());
PutChan(ssNicks, ":?" + pUser->GetUserName() + "!" + pUser->GetIdent() + "@" + sHost + " PART " + pChannel->GetName(), false);
pUser->PutUser(":" + pUser->GetIRCNick().GetNickMask() + " PART "
+ pChannel->GetName() + sMsg);
PutChan(ssNicks, ":?" + pUser->GetUserName() + "!" + pUser->GetIdent() + "@" + sHost + " PART "
+ pChannel->GetName() + sMsg, false);
if (ssNicks.empty()) {
delete pChannel;