diff -up znc-infobot-0.202/infobot.cpp.znc1 znc-infobot-0.202/infobot.cpp --- znc-infobot-0.202/infobot.cpp.znc1 2012-11-28 10:48:03.703592940 -0500 +++ znc-infobot-0.202/infobot.cpp 2012-11-28 11:06:55.221609919 -0500 @@ -14,6 +14,7 @@ #include "znc.h" #include "Chan.h" #include "Modules.h" +#include "IRCNetwork.h" #include "User.h" #include <pcre.h> @@ -25,9 +26,9 @@ using namespace pcrecpp; -typedef map<const CString, VCString> TEnabledChanMap; -typedef map<const CString, bool> TColorsEnabledMap; -typedef map<const CString, char> TTriggerCharMap; +typedef std::map<const CString, VCString> TEnabledChanMap; +typedef std::map<const CString, bool> TColorsEnabledMap; +typedef std::map<const CString, char> TTriggerCharMap; class CInfoBotModule : public CModule { @@ -1203,8 +1204,8 @@ void CInfoBotModule::SendMessage(const C sText.Replace("%CLO%", ""); } - m_pUser->PutIRC("PRIVMSG " + sSendTo + " :" + sText); - m_pUser->PutUser(":" + m_pUser->GetIRCNick().GetNickMask() + " PRIVMSG " + sSendTo + " :" + sText); + m_pNetwork->PutIRC("PRIVMSG " + sSendTo + " :" + sText); + m_pNetwork->PutUser(":" + m_pNetwork->GetIRCNick().GetNickMask() + " PRIVMSG " + sSendTo + " :" + sText); } void CInfoBotModule::OnModCommand(const CString& sCommand) @@ -1484,7 +1485,7 @@ CInfoBotModule::EModRet CInfoBotModule:: { if(!sTarget.empty() && !isalnum(sTarget[0])) { - CheckLineForTrigger(sMessage, sTarget.AsLower(), m_pUser->GetIRCNick().GetNick()); + CheckLineForTrigger(sMessage, sTarget.AsLower(), m_pNetwork->GetIRCNick().GetNick()); } return CONTINUE; }