#define KEY_WARN "chanwarn"
#define KEY_MAX "max"
#define KEY_TIME "time"
+#define KEY_LAST "last"
#define KEY_MAX_CLIENTS "max_clients"
#define KEY_LIMIT "limit"
#define KEY_EXPIRES "expires"
{ "OSMSG_NO_DEBUG_CHANNEL", "No debug channel has been configured." },
{ "OSMSG_INVITE_DONE", "Invited $b%s$b to $b%s$b." },
{ "OSMSG_ALREADY_THERE", "You are already in $b%s$b." },
+ { "OSMSG_USER_ALREADY_THERE", "%s is already in $b%s$b." },
{ "OSMSG_NOT_THERE", "You not in $b%s$b." },
{ "OSMSG_JOIN_DONE", "I have joined $b%s$b." },
{ "OSMSG_MARK_SET", "Set the MARK." },
{ "OSMSG_ALERTS_LIST", "$bCurrent $O alerts matching '$b%s$b'$b" },
{ "OSMSG_ALERTS_BAR", "----------------------------------------------" },
{ "OSMSG_ALERTS_HEADER", "Name Action (by Oper)" },
- { "OSMSG_ALERTS_DESC", " Criteria: %s" },
+ { "OSMSG_ALERTS_DESC", " $uCriteria$u: %s" },
+ { "OSMSG_ALERTS_LAST", " $uTriggered$u: %s" },
{ "OSMSG_ALERT_IS", "$b%-20s$b %-6s (by %s)" },
{ "OSMSG_ALERT_END", "----------------End of Alerts-----------------" },
/* routing messages */
static dict_t opserv_hostinfo_dict; /* data is struct opserv_hostinfo* */
static dict_t opserv_user_alerts; /* data is struct opserv_user_alert* */
static dict_t opserv_nick_based_alerts; /* data is struct opserv_user_alert* */
+static dict_t opserv_account_based_alerts; /* data is struct opserv_user_alert* */
static dict_t opserv_channel_alerts; /* data is struct opserv_user_alert* */
static struct module *opserv_module;
static struct log_type *OS_LOG;
char *text_discrim, *split_discrim;
discrim_t discrim;
opserv_alert_reaction reaction;
+ int last;
};
/* funny type to make it acceptible to dict_set_free_data, far below */
channel = AddChannel(argv[2], now, NULL, NULL, NULL);
}
if (GetUserMode(channel, target)) {
- reply("OSMSG_ALREADY_THERE", channel->name);
+ reply("OSMSG_USER_ALREADY_THERE", target->nick, channel->name);
return 0;
}
irc_svsjoin(opserv, target, channel);
static MODCMD_FUNC(cmd_svspart)
{
struct userNode *target;
+ struct chanNode *target_channel;
if(!IsChannelName(argv[2])) {
reply("MSG_NOT_CHANNEL_NAME");
return 0;
}
+ if(!(target_channel = GetChannel(argv[2])))
+ {
+ reply("MSG_INVALID_CHANNEL");
+ return 0;
+ }
target = GetUserH(argv[1]);
if (!target) {
reply("MSG_NICK_UNKNOWN", argv[1]);
return 0;
}
- if (!(channel = GetChannel(argv[2]))) {
- reply("OSMSG_NOT_ON_CHANNEL", cmd->parent->bot->nick, channel->name);
- return 0;
- }
-
- if (!GetUserMode(channel, target)) {
- reply("OSMSG_NOT_ON_CHANNEL", cmd->parent->bot->nick, channel->name);
+ if (!GetUserMode(target_channel, target)) {
+ reply("OSMSG_NOT_ON_CHANNEL", cmd->parent->bot->nick, target_channel->name);
return 0;
}
- irc_svspart(opserv, target, channel);
+ irc_svspart(opserv, target, target_channel);
reply("OSMSG_SVSPART_SENT");
return 1;
}
dict_iterator_t it;
struct opserv_user_alert *alert;
const char *reaction;
+ char t_buffer[INTERVALLEN];
char *m = NULL;
if(argc > 1)
}
reply("OSMSG_ALERT_IS", iter_key(it), reaction, alert->owner);
reply("OSMSG_ALERTS_DESC", alert->text_discrim);
+ if (alert->last > 0)
+ reply("OSMSG_ALERTS_LAST", intervalString(t_buffer, now - alert->last, user->handle_info));
+ else
+ reply("OSMSG_ALERTS_LAST", "Never");
}
reply("OSMSG_ALERT_END");
return 1;
}
static struct opserv_user_alert *
-opserv_add_user_alert(struct userNode *req, const char *name, opserv_alert_reaction reaction, const char *text_discrim)
+opserv_add_user_alert(struct userNode *req, const char *name, opserv_alert_reaction reaction, const char *text_discrim, int last)
{
unsigned int wordc;
char *wordv[MAXNUMPARAMS], *discrim_copy;
alert = malloc(sizeof(*alert));
alert->owner = strdup(req->handle_info ? req->handle_info->handle : req->nick);
alert->text_discrim = strdup(text_discrim);
+ alert->last = last;
discrim_copy = strdup(text_discrim); /* save a copy of the discrim */
wordc = split_line(discrim_copy, false, ArrayLength(wordv), wordv);
alert->discrim = opserv_discrim_create(req, opserv, wordc, wordv, 0);
dict_insert(opserv_channel_alerts, name_dup, alert);
if (alert->discrim->mask_nick)
dict_insert(opserv_nick_based_alerts, name_dup, alert);
+ if (alert->discrim->accountmask)
+ dict_insert(opserv_account_based_alerts, name_dup, alert);
return alert;
}
add_user_alert(const char *key, void *data, UNUSED_ARG(void *extra))
{
dict_t alert_dict;
+ char *str;
+ int last = 0;
const char *discrim, *react, *owner;
opserv_alert_reaction reaction;
struct opserv_user_alert *alert;
}
discrim = database_get_data(alert_dict, KEY_DISCRIM, RECDB_QSTRING);
react = database_get_data(alert_dict, KEY_REACTION, RECDB_QSTRING);
+ str = database_get_data(alert_dict, KEY_LAST, RECDB_QSTRING);
+ if (str)
+ last = atoi(str);
+
if (!react || !irccasecmp(react, "notice"))
reaction = REACT_NOTICE;
else if (!irccasecmp(react, "kill"))
log_module(OS_LOG, LOG_ERROR, "Invalid reaction %s for alert %s.", react, key);
return 0;
}
- alert = opserv_add_user_alert(opserv, key, reaction, discrim);
+ alert = opserv_add_user_alert(opserv, key, reaction, discrim, last);
if (!alert) {
log_module(OS_LOG, LOG_ERROR, "Unable to create alert %s from database.", key);
return 0;
saxdb_start_record(ctx, iter_key(it), 0);
saxdb_write_string(ctx, KEY_DISCRIM, alert->text_discrim);
saxdb_write_string(ctx, KEY_OWNER, alert->owner);
+ saxdb_write_int(ctx, KEY_LAST, alert->last);
switch (alert->reaction) {
case REACT_NOTICE: reaction = "notice"; break;
case REACT_KILL: reaction = "kill"; break;
if (alert->discrim->option_log)
log_module(OS_LOG, LOG_INFO, "Alert %s triggered by user %s!%s@%s (%s).", key, user->nick, user->ident, user->hostname, alert->discrim->reason);
+ alert->last = now;
+
/* Return 1 to halt alert matching, such as when killing the user
that triggered the alert. */
switch (alert->reaction) {
return 0;
}
+static void
+opserv_alert_check_account(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle))
+{
+ dict_foreach(opserv_account_based_alerts, alert_check_user, user);
+}
+
static void
opserv_alert_check_nick(struct userNode *user, UNUSED_ARG(const char *old_nick))
{
struct gag_entry *gag;
- dict_foreach(opserv_nick_based_alerts, alert_check_user, user);
+
+ dict_foreach(opserv_nick_based_alerts, alert_check_user, user);
+
/* Gag them if appropriate (and only if). */
user->modes &= ~FLAGS_GAGGED;
for (gag = gagList; gag; gag = gag->next) {
return 0;
}
if (!svccmd_can_invoke(user, opserv_service->bot, subcmd, channel, SVCCMD_NOISY)
- || !opserv_add_user_alert(user, name, reaction, unsplit_string(argv + 3, argc - 3, NULL))) {
+ || !opserv_add_user_alert(user, name, reaction, unsplit_string(argv + 3, argc - 3, NULL), 0)) {
reply("OSMSG_ALERT_ADD_FAILED");
return 0;
}
for (i=1; i<argc; i++) {
dict_remove(opserv_nick_based_alerts, argv[i]);
dict_remove(opserv_channel_alerts, argv[i]);
+ dict_remove(opserv_account_based_alerts, argv[i]);
if (dict_remove(opserv_user_alerts, argv[i]))
reply("OSMSG_REMOVED_ALERT", argv[i]);
else
opserv_channel_alerts = dict_new();
dict_delete(opserv_nick_based_alerts);
opserv_nick_based_alerts = dict_new();
+ dict_delete(opserv_account_based_alerts);
+ opserv_account_based_alerts = dict_new();
dict_delete(opserv_user_alerts);
opserv_user_alerts = dict_new();
dict_set_free_keys(opserv_user_alerts, free);
unreg_del_user_func(opserv_user_cleanup);
dict_delete(opserv_hostinfo_dict);
dict_delete(opserv_nick_based_alerts);
+ dict_delete(opserv_account_based_alerts);
dict_delete(opserv_channel_alerts);
dict_delete(opserv_user_alerts);
for (nn=0; nn<ArrayLength(level_strings); ++nn)
reg_del_channel_func(opserv_channel_delete);
reg_join_func(opserv_join_check);
reg_auth_func(opserv_staff_alert);
+ reg_auth_func(opserv_alert_check_account);
reg_notice_func(opserv, opserv_notice_handler);
opserv_db_init();
projects / irc / evilnet / x3.git / blobdiff