From fe420af86f9e386fb80e87ffe6729651b6250f58 Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Tue, 19 Jul 2005 18:31:26 +0000 Subject: [PATCH] Properly check alerts based on numchannels criteria src/opserv.c (opserv_add_user_alert): Channel alerts also include ones with non-zero min_channels. Allow an alert to be both channel-based and nick-based. git-archimport-id: srvx@srvx.net--2005-srvx/srvx--devo--1.3--patch-25 --- ChangeLog | 15 +++++++++++++++ src/opserv.c | 9 +++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e273b96..c016eb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,21 @@ # arch-tag: automatic-ChangeLog--srvx@srvx.net--2005-srvx/srvx--devo--1.3 # +2005-07-19 18:31:26 GMT Michael Poole patch-25 + + Summary: + Properly check alerts based on numchannels criteria + Revision: + srvx--devo--1.3--patch-25 + + src/opserv.c (opserv_add_user_alert): Channel alerts also include ones + with non-zero min_channels. Allow an alert to be both channel-based + and nick-based. + + modified files: + ChangeLog src/opserv.c + + 2005-07-19 18:18:48 GMT Michael Poole patch-24 Summary: diff --git a/src/opserv.c b/src/opserv.c index 77448b7..d3fbb7d 100644 --- a/src/opserv.c +++ b/src/opserv.c @@ -2562,9 +2562,14 @@ opserv_add_user_alert(struct userNode *req, const char *name, opserv_alert_react alert->discrim->reason = strdup(name); alert->reaction = reaction; dict_insert(opserv_user_alerts, name_dup, alert); - if (alert->discrim->channel) + /* Stick the alert into the appropriate additional alert dict(s). + * For channel alerts, we only use channels and min_channels; + * max_channels would have to be checked on /part, which we do not + * yet do, and which seems of questionable value. + */ + if (alert->discrim->channel || alert->discrim->min_channels) dict_insert(opserv_channel_alerts, name_dup, alert); - else if (alert->discrim->mask_nick) + if (alert->discrim->mask_nick) dict_insert(opserv_nick_based_alerts, name_dup, alert); return alert; } -- 2.20.1