SeanOMik
/
znc-push
mirror of https://github.com/SeanOMik/znc-push.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix highlight match behaviour 

Documentation states that, in the 'highlight' field, both positive and negative matches terminate the search.
This patch brings znc-push's behaviour in line with said documentation.
This commit is contained in:
Georgiy Tugai 2016-12-14 01:53:30 +10:30 committed by GitHub
parent cf08b9e0f4
commit e5b8fc0964
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
push.cpp
View File

@ -869,9 +869,6 @@ class CPushMod : public CModule
options["highlight"].Split(" ", values, false); options["highlight"].Split(" ", values, false);
values.push_back("%nick%"); values.push_back("%nick%");
bool matched = false;
bool negated = false;
for (VCString::iterator i = values.begin(); i != values.end(); i++) for (VCString::iterator i = values.begin(); i != values.end(); i++)
{ {
CString value = i->AsLower(); CString value = i->AsLower();
@ -902,18 +899,11 @@ class CPushMod : public CModule
if (msg.WildCmp(value)) if (msg.WildCmp(value))
{ {
if (negate_match) return !negate_match;
{
negated = true;
}
else
{
matched = true;
}
} }
} }
return (matched && !negated); return false;
} }
/** /**