From 4c698aa6224d35ebfcc4216dca217a4c46fd899c Mon Sep 17 00:00:00 2001 From: psychon Date: Sun, 11 Apr 2010 11:43:09 +0000 Subject: [PATCH] partyline: Fix desync with {add,del}fixchan Again, thanks to r33d for the patch. git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1904 726aef4b-f618-498e-8847-2d620e286838 --- modules/partyline.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/partyline.cpp b/modules/partyline.cpp index 64c45469..703c9a55 100644 --- a/modules/partyline.cpp +++ b/modules/partyline.cpp @@ -326,12 +326,13 @@ public: pUser->PutUser(":" + pUser->GetIRCNick().GetNickMask() + sCmd + pChannel->GetName() + " " + pUser->GetIRCNick().GetNick() + sMsg); PutChan(ssNicks, ":?" + pUser->GetUserName() + "!" + pUser->GetIdent() + "@" + sHost - + sCmd + pChannel->GetName() + " ?" + pUser->GetUserName() + sMsg, false); + + sCmd + pChannel->GetName() + " ?" + pUser->GetUserName() + sMsg, + false, true, pUser); } else { pUser->PutUser(":" + pUser->GetIRCNick().GetNickMask() + sCmd + pChannel->GetName() + sMsg); PutChan(ssNicks, ":?" + pUser->GetUserName() + "!" + pUser->GetIdent() + "@" + sHost - + sCmd + pChannel->GetName() + sMsg, false); + + sCmd + pChannel->GetName() + sMsg, false, true, pUser); } if (ssNicks.empty()) { @@ -380,7 +381,7 @@ public: } pUser->PutUser(":" + pUser->GetIRCNick().GetNickMask() + " JOIN " + pChannel->GetName()); - PutChan(ssNicks, ":?" + sNick + "!" + pUser->GetIdent() + "@" + sHost + " JOIN " + pChannel->GetName(), false); + PutChan(ssNicks, ":?" + sNick + "!" + pUser->GetIdent() + "@" + sHost + " JOIN " + pChannel->GetName(), false, true, pUser); if (!pChannel->GetTopic().empty()) { pUser->PutUser(":" + GetIRCServer(pUser) + " 332 " + pUser->GetIRCNick().GetNickMask() + " " + pChannel->GetName() + " :" + pChannel->GetTopic()); @@ -388,7 +389,7 @@ public: SendNickList(pUser, ssNicks, pChannel->GetName()); if (pUser->IsAdmin()) { - PutChan(ssNicks, ":*" + GetModName() + "!znc@znc.in MODE " + pChannel->GetName() + " +o ?" + pUser->GetUserName(), false); + PutChan(ssNicks, ":*" + GetModName() + "!znc@znc.in MODE " + pChannel->GetName() + " +o ?" + pUser->GetUserName(), false, true, pUser); } } }