From 89543cefc33b233b11344cf16deb3a042e33a25c Mon Sep 17 00:00:00 2001 From: Kyle Fuller Date: Tue, 7 Feb 2012 18:14:23 +0000 Subject: [PATCH] partyline: RemoveUser should use the clients nickmask --- modules/partyline.cpp | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/modules/partyline.cpp b/modules/partyline.cpp index 6679358d..9be7ddd7 100644 --- a/modules/partyline.cpp +++ b/modules/partyline.cpp @@ -306,6 +306,8 @@ public: return; } + vector vClients = pUser->GetAllClients(); + CString sCmd = " " + sCommand + " "; CString sMsg = sMessage; if (!sMsg.empty()) @@ -321,29 +323,22 @@ public: } if (bNickAsTarget) { - for (vector::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::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::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::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::const_iterator i = pUser->GetUserClients().begin(); i != pUser->GetUserClients().end(); ++i) { - CClient* pClient = *i; + for (vector::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); }