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

partyline: RemoveUser should use the clients nickmask

Browse Source
This commit is contained in:
Kyle Fuller
2012-02-07 18:14:23 +00:00
parent 4f1fa01306
commit 89543cefc3
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
modules/partyline.cpp
View File

@@ -306,6 +306,8 @@ public:
return;
}
vector<CClient*> vClients = pUser->GetAllClients();
CString sCmd = " " + sCommand + " ";
CString sMsg = sMessage;
if (!sMsg.empty())
@@ -321,29 +323,22 @@ public:
}
if (bNickAsTarget) {
for (vector<CIRCNetwork*>::const_iterator i = pUser->GetNetworks().begin(); i != pUser->GetNetworks().end(); ++i) {
CIRCNetwork* pNetwork = *i;
pNetwork->PutUser(":" + pNetwork->GetIRCNick().GetNickMask() + sCmd
+ pChannel->GetName() + " " + pNetwork->GetIRCNick().GetNick() + sMsg);
}
for (vector<CClient*>::const_iterator i = pUser->GetUserClients().begin(); i != pUser->GetUserClients().end(); ++i) {
CClient* pClient = *i;
pClient->PutClient(":" + pClient->GetNickMask() + sCmd
+ pChannel->GetName() + " " + pClient->GetNick() + sMsg);
for (vector<CClient*>::const_iterator it = vClients.begin(); it != vClients.end(); ++it) {
CClient* pClient = *it;
pClient->PutClient(":" + pClient->GetNickMask() + sCmd + pChannel->GetName() + sMsg);
}
PutChan(ssNicks, ":" + NICK_PREFIX + pUser->GetUserName() + "!" + pUser->GetIdent() + "@" + sHost
+ sCmd + pChannel->GetName() + " " + NICK_PREFIX + pUser->GetUserName() + sMsg,
false, true, pUser);
} else {
for (vector<CIRCNetwork*>::const_iterator i = pUser->GetNetworks().begin(); i != pUser->GetNetworks().end(); ++i) {
CIRCNetwork* pNetwork = *i;
pNetwork->PutUser(":" + pNetwork->GetIRCNick().GetNickMask() + sCmd
+ pChannel->GetName() + sMsg);
}
for (vector<CClient*>::const_iterator i = pUser->GetUserClients().begin(); i != pUser->GetUserClients().end(); ++i) {
CClient* pClient = *i;
for (vector<CClient*>::const_iterator it = vClients.begin(); it != vClients.end(); ++it) {
CClient* pClient = *it;
pClient->PutClient(":" + pClient->GetNickMask() + sCmd + pChannel->GetName() + sMsg);
}
PutChan(ssNicks, ":" + NICK_PREFIX + pUser->GetUserName() + "!" + pUser->GetIdent() + "@" + sHost
+ sCmd + pChannel->GetName() + sMsg, false, true, pUser);
}