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

implement network_blacklist

This commit is contained in:
Daniel Bugl 2015-07-05 19:39:30 +00:00 committed by Daniel Bugl
parent 78267649c0
commit 18cbe2d61b
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
push.cpp
View File

@ -145,6 +145,7 @@ class CPushMod : public CModule
defaults["last_active"] = "180"; defaults["last_active"] = "180";
defaults["last_notification"] = "300"; defaults["last_notification"] = "300";
defaults["nick_blacklist"] = ""; defaults["nick_blacklist"] = "";
defaults["network_blacklist"] = "";
defaults["replied"] = "yes"; defaults["replied"] = "yes";
defaults["context"] = "*"; defaults["context"] = "*";
@ -755,6 +756,7 @@ class CPushMod : public CModule
expr("last_active", last_active(context)) expr("last_active", last_active(context))
expr("last_notification", last_notification(context)) expr("last_notification", last_notification(context))
expr("nick_blacklist", nick_blacklist(nick)) expr("nick_blacklist", nick_blacklist(nick))
expr("network_blacklist", network_blacklist())
expr("replied", replied(context)) expr("replied", replied(context))
expr("context", context_filter(context)) expr("context", context_filter(context))
@ -974,6 +976,30 @@ class CPushMod : public CModule
return true; return true;
} }
/**
* Check if the network_blacklist condition is met.
*
* @param network Network that the message was received on
* @return True if network is not in the blacklist
*/
bool network_blacklist()
{
VCString blacklist;
options["network_blacklist"].Split(" ", blacklist, false);
CString name = (*m_pNetwork).GetName().AsLower();
for (VCString::iterator i = blacklist.begin(); i != blacklist.end(); i++)
{
if (name.WildCmp((*i).AsLower()))
{
return false;
}
}
return true;
}
/** /**
* Check if the replied condition is met. * Check if the replied condition is met.
* *
@ -1013,6 +1039,7 @@ class CPushMod : public CModule
&& last_active(context) && last_active(context)
&& last_notification(context) && last_notification(context)
&& nick_blacklist(nick) && nick_blacklist(nick)
&& network_blacklist()
&& replied(context) && replied(context)
&& context_filter(context) && context_filter(context)
&& true; && true;
@ -1040,6 +1067,7 @@ class CPushMod : public CModule
&& last_active(context) && last_active(context)
&& last_notification(context) && last_notification(context)
&& nick_blacklist(nick) && nick_blacklist(nick)
&& network_blacklist()
&& replied(context) && replied(context)
&& true; && true;
} }
@ -1565,6 +1593,11 @@ class CPushMod : public CModule
table.SetCell("Condition", "idle"); table.SetCell("Condition", "idle");
table.SetCell("Status", CString(ago) + " seconds"); table.SetCell("Status", CString(ago) + " seconds");
table.AddRow();
table.SetCell("Condition", "network_blacklist");
// network_blacklist() is True if the network is not in a blacklist
table.SetCell("Status", network_blacklist() ? "no" : "yes");
if (token_count > 1) if (token_count > 1)
{ {
CString context = tokens[1]; CString context = tokens[1];