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

Add CIRCNetwork::ExpandString

Browse Source
This commit is contained in:
Kyle Fuller
2011-09-12 16:16:49 +00:00
parent 6686c0de79
commit fa7ec788dd
9 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/watch.cpp
+3 -3
View File
@@ -58,7 +58,7 @@ public:
}
virtual ~CWatchEntry() {}
bool IsMatch(const CNick& Nick, const CString& sText, const CString& sSource, const CUser* pUser) {
bool IsMatch(const CNick& Nick, const CString& sText, const CString& sSource, const CIRCNetwork* pNetwork) {
if (IsDisabled()) {
return false;
}
@@ -85,7 +85,7 @@ public:
return false;
if (!Nick.GetHostMask().AsLower().WildCmp(m_sHostMask.AsLower()))
return false;
return (sText.AsLower().WildCmp(pUser->ExpandString(m_sPattern).AsLower()));
return (sText.AsLower().WildCmp(pNetwork->ExpandString(m_sPattern).AsLower()));
}
bool operator ==(const CWatchEntry& WatchEntry) {
@@ -287,7 +287,7 @@ private:
for (list<CWatchEntry>::iterator it = m_lsWatchers.begin(); it != m_lsWatchers.end(); ++it) {
CWatchEntry& WatchEntry = *it;
if (WatchEntry.IsMatch(Nick, sMessage, sSource, m_pUser)) {
if (WatchEntry.IsMatch(Nick, sMessage, sSource, m_pNetwork)) {
if (m_pNetwork->IsUserAttached()) {
m_pNetwork->PutUser(":" + WatchEntry.GetTarget() + "!watch@znc.in PRIVMSG " +
m_pNetwork->GetCurNick() + " :" + sMessage);