more python work. Not safe to run yet

[irc/evilnet/x3.git] / src / opserv.c

diff --git a/src/opserv.c b/src/opserv.c
index 6a1d5209800bcb526f5fe7349e460c0a6913cd5a..197610a38e6a495a3bbd1516e4ac9d6f53cf1881 100644 (file)
--- a/src/opserv.c
+++ b/src/opserv.c
@@ -76,6 +76,7 @@
 #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"
@@ -164,6 +165,7 @@ static const struct message_entry msgtab[] = {
     { "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." },
@@ -314,7 +316,8 @@ static const struct message_entry msgtab[] = {
     { "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 */
@@ -574,6 +577,7 @@ struct opserv_user_alert {
     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 */
@@ -1624,7 +1628,7 @@ static MODCMD_FUNC(cmd_svsjoin)
        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);
@@ -1818,28 +1822,29 @@ static MODCMD_FUNC(cmd_kickbanall)
 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;
 }
@@ -2421,6 +2426,7 @@ static MODCMD_FUNC(cmd_stats_alerts) {
     dict_iterator_t it;
     struct opserv_user_alert *alert;
     const char *reaction;
+    char t_buffer[INTERVALLEN];
     char *m = NULL;
 
     if(argc > 1) 
@@ -2448,6 +2454,10 @@ static MODCMD_FUNC(cmd_stats_alerts) {
         }
         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;
@@ -4652,7 +4662,7 @@ add_gag_helper(const char *key, void *data, UNUSED_ARG(void *extra))
 }
 
 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;
@@ -4666,6 +4676,7 @@ opserv_add_user_alert(struct userNode *req, const char *name, opserv_alert_react
     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);
@@ -4717,6 +4728,8 @@ static int
 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;
@@ -4727,6 +4740,10 @@ add_user_alert(const char *key, void *data, UNUSED_ARG(void *extra))
     }
     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"))
@@ -4753,7 +4770,7 @@ add_user_alert(const char *key, void *data, UNUSED_ARG(void *extra))
         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;
@@ -5023,6 +5040,7 @@ opserv_saxdb_write(struct saxdb_context *ctx)
             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;
@@ -6492,6 +6510,8 @@ alert_check_user(const char *key, void *data, void *extra)
     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) {
@@ -6715,7 +6735,7 @@ static MODCMD_FUNC(cmd_addalert)
         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;
     }